diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 51724f47d33..c53e2030e7f 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -100,9 +100,9 @@ module named account_voucherss
         'project/wizard/account_analytic_chart_view.xml',
         'product_view.xml',
         'account_assert_test.xml',
-        'process/statement_process.xml',
-        'process/customer_invoice_process.xml',
-        'process/supplier_invoice_process.xml',
+#        'process/statement_process.xml',
+#        'process/customer_invoice_process.xml',
+#        'process/supplier_invoice_process.xml',
         'sequence_view.xml',
         'company_view.xml',
         'account_installer.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index 3fb74401946..e30912aa187 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -183,7 +183,7 @@ class account_account(osv.osv):
                     temp.append(x)
                 ids2 += self._get_children_and_consol(cr, uid, temp, context)
         return ids2
-        
+
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
         if context is None:
@@ -320,7 +320,7 @@ class account_account(osv.osv):
                 level = obj.level + 1
             res[account.id] = level
         return res
-    
+
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
@@ -477,7 +477,7 @@ class account_account(osv.osv):
     def _check_moves(self, cr, uid, ids, method, context):
         line_obj = self.pool.get('account.move.line')
         account_ids = self.search(cr, uid, [('id', 'child_of', ids)])
-        
+
         if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
             if method == 'write':
                 raise osv.except_osv(_('Error !'), _('You cannot deactivate an account that contains account moves.'))
@@ -511,7 +511,7 @@ class account_account(osv.osv):
             context = {}
         if 'active' in vals and not vals['active']:
             self._check_moves(cr, uid, ids, "write", context)
-        if 'type' in vals.keys(): 
+        if 'type' in vals.keys():
             self._check_allow_type_change(cr, uid, ids, vals['type'], context=context)
         return super(account_account, self).write(cr, uid, ids, vals, context=context)
 
@@ -559,7 +559,7 @@ class account_journal(osv.osv):
     _columns = {
         'name': fields.char('Journal Name', size=64, required=True, translate=True),
         'code': fields.char('Code', size=16),
-        'type': fields.selection([('sale', 'Sale'), ('purchase', 'Purchase'), ('expanse', 'Expanse'), ('cash', 'Cash'), ('bank', 'Bank'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True,
+        'type': fields.selection([('sale', 'Sale'), ('purchase', 'Purchase'), ('expense', 'Expense'), ('cash', 'Cash'), ('bank', 'Bank'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True,
                                  help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
                                  " Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\
                                  " Select 'Cash' to be used at the time of making payment."\
@@ -683,7 +683,7 @@ class account_fiscalyear(osv.osv):
             else:
                 return False
         return ids[0]
-    
+
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
         if args is None:
             args = []
@@ -695,7 +695,7 @@ class account_fiscalyear(osv.osv):
         if not ids:
             ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
         return self.name_get(cr, user, ids, context=context)
-    
+
 account_fiscalyear()
 
 class account_period(osv.osv):
@@ -771,7 +771,7 @@ class account_period(osv.osv):
                     cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
                     cr.execute('update account_period set state=%s where id=%s', (mode, id))
         return True
-    
+
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
         if args is None:
             args = []
@@ -1375,7 +1375,7 @@ class account_tax_code(osv.osv):
                 return False
             level -= 1
         return True
-    
+
 
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
@@ -1383,7 +1383,7 @@ class account_tax_code(osv.osv):
         default = default.copy()
         default.update({'line_ids': []})
         return super(account_tax_code, self).copy(cr, uid, id, default, context)
-    
+
     _constraints = [
         (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
     ]
@@ -1441,6 +1441,7 @@ class account_tax(osv.osv):
         'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'description': fields.char('Tax Code',size=32),
+        'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
         'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
 
     }
@@ -1473,6 +1474,7 @@ class account_tax(osv.osv):
         'applicable_type': lambda *a: 'true',
         'type': lambda *a: 'percent',
         'amount': lambda *a: 0,
+        'price_include': lambda *a: 0,
         'active': lambda *a: 1,
         'type_tax_use': lambda *a: 'all',
         'sequence': lambda *a: 1,
@@ -1565,8 +1567,42 @@ class account_tax(osv.osv):
                 cur_price_unit+=amount2
         return res
 
-    def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+    def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+        """
+        RETURN: {
+                'total': 0.0,                # Total without taxes
+                'total_included: 0.0,        # Total with taxes
+                'taxes': []                  # List of taxes, see compute for the format
+            }
+        """
+        precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+        totalin = totalex = round(price_unit * quantity, precision)
+        tin = []
+        tex = []
+        for tax in taxes:
+            if tax.price_include:
+                tin.append(tax)
+            else:
+                tex.append(tax)
+        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
+        for r in tin:
+            totalex -= r['amount']
+        tex = self._compute(cr, uid, tex, totalex/quantity, quantity, address_id=address_id, product=product, partner=partner)
+        for r in tex:
+            totalin += r['amount']
+        return {
+            'total': totalex,
+            'total_included': totalin,
+            'taxes': tin + tex
+        }
 
+    def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+        logger = netsvc.Logger()
+        logger.notifyChannel("warning", netsvc.LOG_WARNING,
+            "Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
+        return self._compute(cr, uid, taxes, price_unit, quantity, address_id, product, partner)
+
+    def _compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
 
@@ -1583,7 +1619,6 @@ class account_tax(osv.osv):
             else:
                 r['amount'] = round(r['amount'] * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
                 total += r['amount']
-
         return res
 
     def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
@@ -1963,13 +1998,12 @@ class account_add_tmpl_wizard(osv.osv_memory):
         if not tids or not tids[0]['parent_id']:
             return False
         ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]],['code'])
+        res = None
         if not ptids or not ptids[0]['code']:
             raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!'))
             res = acc_obj.search(cr,uid,[('code','=',ptids[0]['code'])])
-        if res:
-            return res[0]
-        else:
-            return False
+
+        return res and res[0] or False
 
     _columns = {
         'cparent_id':fields.many2one('account.account', 'Parent target', help="Creates an account with the selected template under this existing parent.", required=True),
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 77369bdca25..263c711dfff 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -63,6 +63,7 @@
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_user,base.group_extended"/>
                             <newline/>
                             <field name="price_subtotal"/>
+
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                         </page>
@@ -146,7 +147,7 @@
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
-                        <button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change Currency"/>
+                        <button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change"/>
                         <newline/>
                         <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" context="{'default_customer': 0}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
@@ -345,9 +346,9 @@
             <field name="arch" type="xml">
                 <search string="Search Invoice">
                    <group col="10" colspan="4">
-                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
-                        <filter icon="terp-account" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
-                        <filter icon="terp-account" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
+                        <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
+                        <filter icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
                         <field name="number"/>
                         <field name="partner_id"/>
@@ -356,16 +357,16 @@
                         <field name="amount_total"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By...">
-                        <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
+                    <group expand="0" string="Group By...">
+                        <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'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Partner" icon="terp-account" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Salesman" icon="terp-account" domain="[]"  context="{'group_by':'user_id'}"/>
-                        <filter string="State" icon="terp-account" domain="[]"  context="{'group_by':'state'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Salesman" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Invoice Date" icon="terp-account" domain="[]"  context="{'group_by':'date_invoice'}"/>
-                        <filter string="Due Date" icon="terp-account" domain="[]"  context="{'group_by':'date_due'}"/>
+                        <filter string="Invoice Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_invoice'}"/>
+                        <filter string="Due Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_due'}"/>
                     </group>
                </search>
             </field>
@@ -403,7 +404,7 @@
             <field name="view_id" ref="invoice_form"/>
             <field name="act_window_id" ref="action_invoice_tree"/>
         </record>
-        <menuitem name="Invoices" id="menu_finance_invoice" parent="account.menu_finance" sequence="2"/>
+<!--        <menuitem name="Invoices" id="menu_finance_invoice" parent="account.menu_finance" sequence="2"/>-->
 
         <record id="action_invoice_tree1" model="ir.actions.act_window">
             <field name="name">Customer Invoices</field>
@@ -426,10 +427,10 @@
             <field name="view_id" ref="invoice_form"/>
             <field name="act_window_id" ref="action_invoice_tree1"/>
         </record>
-        <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="account.menu_finance_invoice"/>
+        <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
 
         <record id="action_invoice_tree2" model="ir.actions.act_window">
-            <field name="name">Supplier Invoices</field>
+            <field name="name">Vendor Invoices</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
@@ -438,7 +439,7 @@
             <field name="context">{'type':'in_invoice'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
-        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="account.menu_finance_invoice"/>
+        <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
         <record id="action_invoice_tree3" model="ir.actions.act_window">
             <field name="name">Customer Refunds</field>
@@ -464,10 +465,10 @@
             <field name="act_window_id" ref="action_invoice_tree3"/>
         </record>
 
-        <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="account.menu_finance_invoice"/>
+        <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="menu_finance_receivables"/>
 
         <record id="action_invoice_tree4" model="ir.actions.act_window">
-            <field name="name">Supplier Refunds</field>
+            <field name="name">Vendor Refunds</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
@@ -476,7 +477,7 @@
             <field name="context">{'type':'in_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
-        <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="account.menu_finance_invoice"/>
+        <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
         <act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
 
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 4cdcb7787b6..d0ae2ccc58f 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -1,28 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
+    
+    	<menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="1"/>
+        <menuitem id="menu_finance_receivables" name="Receivables" parent="menu_finance" sequence="2"/>
+        <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="3"/>
+        <menuitem id="menu_finance_bank_and_cash" name="Bank And Cash" parent="menu_finance" sequence="4"/>
+<!--        <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
+        	<menuitem id="periodical_processing_journal_entries_validation" name="Journal Entries Validation" parent="menu_finance_periodical_processing"/>
+        	<menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
+<!--        	<menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
+        	<menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
+<!--        	<menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
+        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="10"/>
+        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
+        	<menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
+        	<menuitem id="menu_generic_report" name="Management Reports" parent="menu_finance_reporting"/>
+        	<menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
+        	<menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
+        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13"/>
+        	<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
+        	<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
+        		<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
+        		<menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
+        	<menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration"/>
+				<menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
         <menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="5"/>
-        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="8"/>
-        <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>
-        <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
-        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
+<!--        <menuitem id="menu_finance_configuration1" name="Configuration" parent="menu_finance" sequence="80"/>-->
+<!--        <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>-->
+<!--        <menuitem id="menu_finance_accounting1" name="Financial Accounting" parent="menu_finance_configuration" sequence="80"/>-->
+<!--        <menuitem id="menu_analytic_accounting1" name="Analytic Accounting" parent="menu_finance_configuration" sequence="80"/>-->
 
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="7"/>
-        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="account.menu_finance_reporting" sequence="1"/>
-        <menuitem id="menu_finance_legal_statement" name="Legal Statements" parent="account.menu_finance_reporting" sequence="2"/>
-        <menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/>
+<!--        <menuitem id="menu_finance_reporting11" name="Reporting" parent="account.menu_finance"  sequence="80"/>-->
+        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
+<!--        <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
+<!--        <menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/>-->
 
-        <menuitem id="menu_finance_entries" name="Accounting" parent="account.menu_finance" sequence="1"
+        <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="1"
             groups="group_account_user"/>
-        <menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="account.menu_finance_entries" sequence="15"/>
+        <menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing" sequence="15"/>
 
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance"
-            sequence="3"
-            groups="group_account_user"/>
-        <menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance_periodical_processing" sequence="20"/>
+<!--        <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
+<!--            sequence="3"-->
+<!--            groups="group_account_user"/>-->
+        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing"/>
 
-       <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="account.menu_finance_reporting" sequence="3"/>
+       <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
     </data>
 </openerp>
 
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 36b65d20dca..7350596c4e3 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -530,9 +530,8 @@ class account_move_line(osv.osv):
             date = datetime.now().strftime('%Y-%m-%d')
         part = self.pool.get('res.partner').browse(cr, uid, partner_id)
 
-        if part.property_payment_term and part.property_payment_term.line_ids:
-            payterm = part.property_payment_term.line_ids[0]
-            res = self.pool.get('account.payment.term').compute(cr, uid, payterm.id, 100, date)
+        if part.property_payment_term:
+            res = self.pool.get('account.payment.term').compute(cr, uid, part.property_payment_term.id, 100, date)
             if res:
                 val['date_maturity'] = res[0][0]
         if not account_id:
@@ -540,10 +539,10 @@ class account_move_line(osv.osv):
             id2 =  part.property_account_receivable.id
             if journal:
                 jt = self.pool.get('account.journal').browse(cr, uid, journal).type
-                if jt=='sale':
+                if jt == 'sale':
                     val['account_id'] = self.pool.get('account.fiscal.position').map_account(cr, uid, part and part.property_account_position or False, id2)
 
-                elif jt=='purchase':
+                elif jt == 'purchase':
                     val['account_id'] = self.pool.get('account.fiscal.position').map_account(cr, uid, part and part.property_account_position or False, id1)
                 if val.get('account_id', False):
                     d = self.onchange_account_id(cr, uid, ids, val['account_id'])
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 656d9d2f595..6480178d1ae 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -23,7 +23,7 @@
         <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
 
         <report id="account_move_line_list" model="account.tax.code" name="account.tax.code.entries" rml="account/report/account_tax_code.rml" string="All Entries"/>
-        
+
         <report
             auto="False"
             id="account_vat_declaration"
@@ -32,21 +32,21 @@
             name="account.vat.declaration"
             rml="account/report/tax_report.rml"
             string="Taxes Report"/>
-        
+
         <report id="report_account_voucher_new"
-            string="Print Voucher"
+            string="Voucher"
             model="account.move"
             name="account.move.voucher"
             rml="account/report/voucher_print.rml"
             auto="False"
             header = "False"
             menu="True"/>
-        
+
         <menuitem
             id="menu_tax_report"
             name="Taxes"
             parent="account.menu_finance_generic_reporting" sequence="3"/>
-        
+
 <!--        <wizard
             id="wizard_vat_declaration"
             menu="False"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 64811758701..181b63bc066 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -163,13 +163,13 @@
         </record>
 
         <record id="action_account_form" model="ir.actions.act_window">
-            <field name="name">List of Accounts</field>
+            <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="search_view_id" ref="view_account_search"/>
         </record>
-        <menuitem id="account_account_menu" name="Financial Accounts" parent="account.menu_finance_accounting"/>
+        <menuitem id="account_account_menu" name="Accounts" parent="menu_finance_accounting"/>
         <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
 
         <record id="view_account_tree" model="ir.ui.view">
@@ -197,7 +197,7 @@
             <field name="view_id" ref="view_account_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/>
+<!--        <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/>-->
 
         <!--
     Journal
@@ -283,32 +283,32 @@
                                 <separator string="Journal View" colspan="4"/>
                                 <field name="view_id"/>
                             </group>
-                            
+
                             <group colspan="2" col="2">
                                 <separator string="Sequence" colspan="4"/>
                                 <field name="sequence_id"/>
                                 <field name="invoice_sequence_id"/>
                             </group>
-                            
+
                             <group colspan="2" col="2">
                                 <separator string="Accounts" colspan="4"/>
                                 <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="Validations" colspan="4"/>  
+                                <separator string="Validations" colspan="4"/>
                                 <field name="allow_date" groups="base.group_extended"/>
                             </group>
-                            
+
                             <group colspan="2" col="2">
-                                <separator string="Company" colspan="4"/> 
+                                <separator string="Company" colspan="4"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="user_id" groups="base.group_extended"/>
                                 <field name="currency"/>
                             </group>
                             <group colspan="2" col="2">
-                                <separator string="Other Configuration" colspan="4"/> 
+                                <separator string="Other Configuration" colspan="4"/>
                                 <field name="centralisation"/>
                                 <field name="group_invoice_lines"/>
                                 <field name="update_posted"/>
@@ -326,12 +326,12 @@
             </field>
         </record>
         <record id="action_account_journal_form" model="ir.actions.act_window">
-            <field name="name">Financial Journals</field>
+            <field name="name">Journals</field>
             <field name="res_model">account.journal</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="menu_finance_accounting"/>
+        <menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="account_account_menu"/>
 
         <record id="view_bank_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
@@ -415,12 +415,12 @@
             </field>
         </record>
         <record id="action_bank_statement_tree" model="ir.actions.act_window">
-            <field name="name">Entries by Statements</field>
+            <field name="name">Bank Statements</field>
             <field name="res_model">account.bank.statement</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_entries" sequence="7"/>
+        <menuitem string="Bank Statements" action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_bank_and_cash" sequence="7"/>
 
         <record id="action_bank_statement_draft_tree" model="ir.actions.act_window">
             <field name="name">Draft statements</field>
@@ -517,7 +517,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="account.account_account_menu"/>
+        <menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="menu_low_level"/>
         <!--
     Entries
     -->
@@ -609,7 +609,7 @@
             <field name="view_id" ref="view_tax_code_tree"/>
         </record>
        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_accounting"/>
-        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12"/>
+        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="menu_low_level" sequence="12"/>
 
 
         <!--
@@ -623,6 +623,7 @@
             <field name="arch" type="xml">
                 <tree string="Account Tax">
                     <field name="name"/>
+                    <field name="price_include" groups="base.group_extended"/>
                     <field name="description"/>
                 </tree>
             </field>
@@ -654,6 +655,7 @@
                             <label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
                             <field groups="base.group_extended" name="child_depend"/>
                             <field groups="base.group_extended" name="sequence"/>
+                            <field groups="base.group_extended" name="price_include"/>
                             <field name="type_tax_use"/>
                             <newline/>
                             <field colspan="4" groups="base.group_extended" name="child_ids"/>
@@ -834,8 +836,8 @@
             <field name="arch" type="xml">
                 <search string="Search Entry Lines">
                     <group col='10' colspan='4'>
-                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Entry Lines"/>
-                        <filter icon="terp-account" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>
+                        <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'/>
@@ -977,8 +979,8 @@
             <field name="arch" type="xml">
                 <search string="Search Move">
                     <group col='8' colspan='4'>
-                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
-                        <filter icon="terp-account" string="Posted" domain="[('state','=','posted')]" help="Posted Move Lines"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
+                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Move Lines"/>
                         <separator orientation="vertical"/>
                         <field name="date" select='1'/>
                         <field name="name" select='1'/>
@@ -986,11 +988,11 @@
                         <field name="partner_id" select='1'/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="12" col="10">
-                        <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
-                        <filter string="Type" icon="terp-account" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
-                        <filter string="States" icon="terp-account" domain="[]" context="{'group_by':'state'}"/>
+                    <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>
@@ -1004,8 +1006,19 @@
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
-        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>
-        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
+        
+        <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>
+            <field name="res_model">account.move</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_move_tree"/>
+            <field name="search_view_id" ref="view_account_move_filter"/>
+            <field name="domain">[('to_check','=',True)]</field>
+        </record>
+        <menuitem action="action_move_to_review" id="menu_action_move_to_review" parent="periodical_processing_journal_entries_validation"/>
+<!--        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>-->
+<!--        <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 Entries</field>
@@ -1017,6 +1030,30 @@
         </record>
 
         <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</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"/>
+            <field name="domain">[('journal_id.type', '=', 'sale')]</field>
+        </record>
+
+        <menuitem action="action_account_moves_sale" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables"/>
+        
+        <record id="action_account_moves_purchase" model="ir.actions.act_window">
+            <field name="name">Transaction Journals</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"/>
+            <field name="domain">[('journal_id.type', '=', 'purchase')]</field>
+        </record>
+
+        <menuitem action="action_account_moves_purchase" id="menu_eaction_account_moves_purchase" parent="menu_finance_payables"/>
 
         <record id="action_move_line_search" model="ir.actions.act_window">
             <field name="name">Entry Lines</field>
@@ -1038,7 +1075,30 @@
             <field name="view_mode">form</field>
             <field name="act_window_id" ref="action_move_line_search"/>
         </record>
-        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>
+        <record id="action_move_line_search_view3" model="ir.actions.act_window">
+            <field name="name">Cash 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', '=', 'cash')]</field>
+        </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_view3" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
+        <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"/>-->
 
         <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
     <!--    <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
@@ -1106,20 +1166,20 @@
             <field name="view_mode">form,tree</field>
             <field name="view_id" ref="view_bank_statement_reconcile_form"/>
         </record>
-        <menuitem
-            id="next_id_30"
-            name="Bank Reconciliation"
-            parent="account.menu_finance_periodical_processing"
-            groups="group_account_user"/>
+<!--        <menuitem-->
+<!--            id="next_id_30"-->
+<!--            name="Bank Reconciliation"-->
+<!--            parent="account.menu_finance_periodical_processing"-->
+<!--            groups="group_account_user"/>-->
 
-        <menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>
+<!--        <menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>-->
   <!--        <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/> -->
     <!--     <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" type="wizard"/>   -->
 
 <!--  bank reconsilation  -->
-        <menuitem action="action_account_bank_reconcile_tree"
-            id="menu_action_account_bank_reconcile_check_tree"
-            parent="account.next_id_30" />
+<!--        <menuitem action="action_account_bank_reconcile_tree"-->
+<!--            id="menu_action_account_bank_reconcile_check_tree"-->
+<!--            parent="account.next_id_30" />-->
 
 
         <act_window
@@ -1242,12 +1302,12 @@
             </field>
         </record>
         <record id="action_model_form" model="ir.actions.act_window">
-            <field name="name">Models Definition</field>
+            <field name="name">Define Models</field>
             <field name="res_model">account.model</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_model_form" id="menu_action_model_form" parent="menu_finance_configuration"/>
+        <menuitem action="action_model_form" id="menu_action_model_form" parent="account.menu_finance_recurrent_entries"/>
 
 
         <!--
@@ -1310,7 +1370,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="menu_finance_configuration"/>
+        <menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
 
         <!--
     # Account Subscriptions
@@ -1390,7 +1450,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="account.menu_finance_recurrent_entries"/>
+<!--        <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="account.menu_finance_recurrent_entries"/>-->
 
         <record id="action_subscription_form_running" model="ir.actions.act_window">
             <field name="name">Running Subscriptions</field>
@@ -1493,7 +1553,7 @@
         <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_partner_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
 
         <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
-		
+
 		<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">
@@ -1523,8 +1583,18 @@
         <menuitem
             id="account_template_folder"
             name="Templates"
-            parent="account.menu_finance_accounting"
+            parent="menu_finance_accounting"
             groups="base.group_multi_company"/>
+        <menuitem
+            id="account_template_taxes"
+            name="Taxes"
+            parent="account_template_folder"
+            groups="base.group_multi_company" sequence="2"/>
+        <menuitem
+            id="account_template_accounts"
+            name="Accounts"
+            parent="account_template_folder"
+            groups="base.group_multi_company" sequence="1"/>
 
 
         <record id="view_account_template_form" model="ir.ui.view">
@@ -1575,7 +1645,7 @@
         </record>
 
 
-        <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_folder"/>
+        <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_accounts"/>
 
         <!-- Chart of Accounts Templates -->
 
@@ -1620,7 +1690,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_folder"/>
+        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts"/>
 
         <!-- Account Tax Templates -->
 
@@ -1696,7 +1766,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="account_template_folder" sequence="13"/>
+        <menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="account_template_taxes" sequence="13"/>
 
         <!-- Account Tax Code Templates -->
         <record id="view_tax_code_template_tree" model="ir.ui.view">
@@ -1734,7 +1804,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="account_template_folder" sequence="14"/>
+        <menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="account_template_taxes" sequence="14"/>
 
 
         <!--  Wizard for Multi Charts of Accounts -->
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 8b093fb2310..f71c81b48ca 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -33,7 +33,7 @@
  -->
 
         <!-- automatic reconcile -->
-        <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/>
+<!--        <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/>-->
     <!--    <wizard id="wizard_automatic_reconcile" menu="False" model="account.account" name="account.automatic.reconcile" string="Automatic reconciliation"/>
         <menuitem action="wizard_automatic_reconcile" id="menu_automatic_reconcile" parent="next_id_20" type="wizard"/>-->
 
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 6a5f47dfb24..7d325b771ea 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -7,14 +7,14 @@ 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-04-18 09:39+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
-"tic.com>\n"
+"PO-Revision-Date: 2010-06-04 09:39+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -61,12 +61,12 @@ msgstr "Nom de model no vàlid en la definició de l'acció."
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "La moneda utilitzada per introduir assentaments"
+msgstr "La divisa utilitzada per introduir assentaments"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
 msgid "Select Message"
-msgstr "Selecciona missatge"
+msgstr "Seleccioneu missatge"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -189,7 +189,7 @@ msgstr "Plans comptables"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
 msgid "Move line select"
-msgstr "Selecciona línia moviment"
+msgstr "Seleccioneu línia moviment"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -202,7 +202,7 @@ msgstr "Ref. assentament"
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr "Línia de model d'assentament"
+msgstr "Líniees de model d'assentament"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
@@ -315,7 +315,7 @@ msgstr "Pagaments fora de termini"
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 #: wizard_view:account.vat.declaration,init:0
 msgid "Select period"
-msgstr "Selecciona període"
+msgstr "Seleccioneu període"
 
 #. module: account
 #: field:account.invoice,origin:0
@@ -457,7 +457,7 @@ msgstr "Estat"
 #: model:ir.actions.act_window,name:account.action_invoice_tree13
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree13
 msgid "Unpaid Supplier Refunds"
-msgstr "Factures d'abonament de proveïdor sense pagar"
+msgstr "Factures rectificatives (abonament) de proveïdor sense pagar"
 
 #. module: account
 #: view:account.tax:0
@@ -710,7 +710,7 @@ msgstr "Informació addicional"
 #. module: account
 #: selection:account.invoice,type:0
 msgid "Customer Refund"
-msgstr "Factura d'abonament de client"
+msgstr "Factura rectificativa (abonament) de client"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -909,7 +909,7 @@ msgstr "Diari de desajust"
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "Import canvi"
+msgstr "Import divisa"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
@@ -938,7 +938,7 @@ msgstr "Exercici fiscal per obrir"
 #. module: account
 #: view:account.config.wizard:0
 msgid "Select Chart of Accounts"
-msgstr "Selecciona pla comptable"
+msgstr "Seleccioneu un pla comptable"
 
 #. module: account
 #: field:account.analytic.account,quantity:0
@@ -1242,7 +1242,7 @@ msgstr ""
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr "Moneda de la companyia"
+msgstr "Divisa de la companyia"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
@@ -1353,7 +1353,7 @@ msgstr "Missatge"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Select invoices you want to pay and manages advances"
-msgstr "Selecciona factures que es volen pagar i gestiona avançaments"
+msgstr "Seleccioneu les factures que voleu pagar i gestionar avançaments"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1887,7 +1887,7 @@ msgstr "Data inicial"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr "x Diari factures d'abonament de despeses"
+msgstr "x Diari factures rectificatives (abonament) de despeses"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -1914,7 +1914,7 @@ msgstr "Base imposable"
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr "Compte impostos de factura"
+msgstr "Compte impostos de factures"
 
 #. module: account
 #: view:account.move.line:0
@@ -2026,7 +2026,7 @@ msgstr "Informe analític de diari"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Factures d'abonament de client"
+msgstr "Factures rectificatives (abonament) de client"
 
 #. module: account
 #: rml:account.vat.declaration:0
@@ -2047,7 +2047,7 @@ msgstr "Nom diari-període"
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr "Nom impost del cas"
+msgstr "Nom codi d'impost"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -2057,7 +2057,7 @@ msgid ""
 "manual validation."
 msgstr ""
 "Marqueu aquesta casella si no voleu que els nous assentaments passin per "
-"l'estat 'esborrany' i vagin directament a l'estat 'fixat' sense validar-se "
+"l'estat 'Esborrany' i vagin directament a l'estat 'Fixat' sense validar-los "
 "manualment."
 
 #. module: account
@@ -2144,7 +2144,7 @@ msgstr "Anterior"
 #: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
-msgstr "Moneda"
+msgstr "Divisa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
@@ -2179,7 +2179,8 @@ 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"
 
@@ -2285,7 +2286,7 @@ msgstr "Diari assentaments d'obertura"
 #. module: account
 #: view:account.config.wizard:0
 msgid "Create a Fiscal Year"
-msgstr "Crea un exercici fiscal"
+msgstr "Creeu un exercici fiscal"
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -2320,7 +2321,8 @@ msgstr "2"
 #: wizard_view:account.chart,init:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
 msgstr ""
-"(Si no es selecciona cap any fiscal s'utilitzen tots els anys fiscals oberts)"
+"(Si no es selecciona cap exercici fiscal s'utilitzen tots els exercicis "
+"fiscals oberts)"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
@@ -2467,7 +2469,7 @@ msgstr "Data final"
 #: 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 "Línies de l'extracte"
+msgstr "Apunts"
 
 #. module: account
 #: view:account.tax:0
@@ -2526,7 +2528,7 @@ msgstr "Assentaments conciliats"
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_amount:0
 msgid "The amount in the currency of the journal"
-msgstr "La quantitat en la moneda del diari"
+msgstr "La quantitat en la divisa del diari"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
@@ -2836,7 +2838,7 @@ msgstr "Companyies que es refereixen a l'empresa"
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
-msgstr "Data vigència"
+msgstr "Data"
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -2961,7 +2963,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 "Factures d'abonament de proveïdor esborrany"
+msgstr "Factures rectificatives (abonament) de proveïdor esborrany"
 
 #. module: account
 #: model:process.node,name:account.process_node_accountingstatemententries0
@@ -3048,7 +3050,7 @@ msgstr "Taxa de divises de sortida"
 #: model:ir.actions.act_window,name:account.action_invoice_tree10
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree10
 msgid "Draft Customer Refunds"
-msgstr "Factures d'abonament de client esborrany"
+msgstr "Factures rectificatives (abonament) de client esborrany"
 
 #. module: account
 #: field:account.journal.column,readonly:0
@@ -3606,7 +3608,7 @@ msgstr "Impressió"
 #: model:ir.actions.act_window,name:account.action_invoice_tree4_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4_new
 msgid "New Supplier Refund"
-msgstr "Nova factura d'abonament de proveïdor"
+msgstr "Nova factura rectificativa (abonament) de proveïdor"
 
 #. module: account
 #: view:account.model:0
@@ -3616,7 +3618,7 @@ msgstr "Model d'assentament"
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
 msgid "With Currency"
-msgstr "Amb moneda"
+msgstr "Mostra divisa"
 
 #. module: account
 #: view:account.account:0
@@ -3721,12 +3723,12 @@ msgstr "Codificació extracte"
 #: wizard_view:account.invoice.refund,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_refund
 msgid "Credit Note"
-msgstr "Factura d'abonament"
+msgstr "Factura rectificativa (abonament)"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_fiscalyear
 msgid "Define Fiscal Years and Select Charts of Account"
-msgstr "Defineix exercicis fiscals i selecciona pla comptable"
+msgstr "Definiu els exercicis fiscals i seleccioneu el pla comptable"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,period_id:0
@@ -3736,7 +3738,7 @@ msgstr "Període de desajust"
 #. module: account
 #: selection:account.config.wizard,period:0
 msgid "3 Months"
-msgstr "3 mesos"
+msgstr "Trimestral"
 
 #. module: account
 #: wizard_view:account.move.journal,init:0
@@ -3800,7 +3802,7 @@ msgstr "Data inicial"
 #. module: account
 #: wizard_view:account.general.ledger.report,account_selection:0
 msgid "Select Chart"
-msgstr "Selecciona pla comptable"
+msgstr "Seleccioneu un pla comptable"
 
 #. module: account
 #: selection:account.chart,init,target_move:0
@@ -3867,7 +3869,7 @@ msgstr "Seqüència de l'assentament"
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Closed"
-msgstr "Tancat"
+msgstr "Tancament"
 
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
@@ -4022,7 +4024,7 @@ msgstr "Propietats de comptabilitat del client"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Select entries"
-msgstr "Selecciona les entrades"
+msgstr "Seleccioneu les entrades"
 
 #. module: account
 #: selection:account.chart,init,target_move:0
@@ -4048,7 +4050,7 @@ msgstr "Compte a pagar"
 #: field:account.account,currency_id:0
 #: field:account.account.template,currency_id:0
 msgid "Secondary Currency"
-msgstr "Moneda secundària"
+msgstr "Divisa secundària"
 
 #. module: account
 #: field:account.account,credit:0
@@ -4083,7 +4085,7 @@ msgstr ""
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Compte impostos de devolucions"
+msgstr "Compte impostos de reintegraments"
 
 #. module: account
 #: field:account.tax.code,child_ids:0
@@ -4186,7 +4188,7 @@ msgstr "Seqüències de diaris separades"
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_currency:0
 msgid "The currency of the journal"
-msgstr "La moneda del diari"
+msgstr "La divisa del diari"
 
 #. module: account
 #: view:account.journal.column:0
@@ -4429,7 +4431,7 @@ msgstr "Fixat"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr "Factures d'abonament"
+msgstr "Factures rectificatives (abonament)"
 
 #. module: account
 #: field:account.config.wizard,date2:0
@@ -4621,7 +4623,7 @@ msgstr "Per data"
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr "Factures d'abonament de proveïdor"
+msgstr "Factures rectificatives (abonament) de proveïdor"
 
 #. module: account
 #: help:account.model.line,date:0
@@ -4951,7 +4953,7 @@ msgstr "Confirmat"
 #. module: account
 #: wizard_view:account.account.balance.report,account_selection:0
 msgid "Select parent account"
-msgstr "Selecciona compte pare"
+msgstr "Seleccioneu el compte pare"
 
 #. module: account
 #: field:account.account.template,parent_id:0
@@ -5126,7 +5128,7 @@ msgstr "Compte d'ingressos en plantilla producte"
 #: help:account.account.template,currency_id:0
 msgid "Force all moves for this account to have this secondary currency."
 msgstr ""
-"Força a tots els moviments d'aquest compte que tinguin aquesta moneda "
+"Força a tots els moviments d'aquest compte que tinguin aquesta divisa "
 "secundària."
 
 #. module: account
@@ -5140,7 +5142,7 @@ msgstr "_Cancel·la"
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Select Date-Period"
-msgstr "Selecciona data-període"
+msgstr "Seleccioneu data-període"
 
 #. module: account
 #: rml:account.analytic.account.inverted.balance:0
@@ -5169,7 +5171,7 @@ msgstr "Grup de l'impost"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
 msgid "New Customer Refund"
-msgstr "Nova factura d'abonament de client"
+msgstr "Nova factura rectificativa (abonament) de client"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -5343,7 +5345,7 @@ msgstr "Filtrat per data"
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Choose Journal and Payment Date"
-msgstr "Selecciona diari i data de pagament"
+msgstr "Seleccioneu diari i data de pagament"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5367,7 +5369,7 @@ msgstr "Pagat"
 #: model:ir.actions.act_window,name:account.action_invoice_tree11
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree11
 msgid "Unpaid Customer Refunds"
-msgstr "Factures d'abonament de client sense pagar"
+msgstr "Factures rectificatives (abonament) de client sense pagar"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -5524,7 +5526,7 @@ msgstr "Fi del període"
 #: view:account.move:0
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr "Assentament de compte"
+msgstr "Assentament comptable"
 
 #. module: account
 #: rml:account.general.journal:0
@@ -5555,7 +5557,7 @@ msgstr "Saldo pendent"
 #. module: account
 #: rml:account.invoice:0
 msgid "Refund"
-msgstr "Factura d'abonament"
+msgstr "Factura rectificativa (abonament)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -5792,7 +5794,7 @@ msgstr ""
 #: field:account.tax.code,code:0
 #: field:account.tax.code.template,code:0
 msgid "Case Code"
-msgstr "Codi cas"
+msgstr "Codi"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -5916,7 +5918,7 @@ msgstr "Deixeu-lo buit per a tots els exercicis fiscals oberts"
 #: rml:account.invoice:0
 #: selection:account.invoice,type:0
 msgid "Supplier Refund"
-msgstr "Factura d'abonament de proveïdor"
+msgstr "Factura rectificativa (abonament) de proveïdor"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
@@ -6072,3 +6074,6 @@ msgstr ""
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Calcula les dates de l'assentament"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.assistent"
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 4f9893960bf..d2659e92d1c 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.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-04-16 09:47+0000\n"
+"PO-Revision-Date: 2010-06-03 20:09+0000\n"
 "Last-Translator: Ferdinand @ ChriCar <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-04-21 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-04 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -272,10 +272,6 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
-"zeigt die Ansicht des Journalberichtes. Open ERP wird gezeigt welche Felder "
-"sichtbar sein sollen, welche erforderlich sind oder keine Schreibrechte habe "
-"und in der Reihenfolge der Auftragsnummern. Sie können einen eigenen View "
-"für eine schnellere Buchungsbearbeitung herstellen."
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -2176,7 +2172,8 @@ 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"
 
@@ -3314,7 +3311,9 @@ msgstr "Buchen OP Ausgleich"
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(Rechnungen müssen ausgeglichen werden)"
+msgstr ""
+"(Rechnungen dürfen nicht ausgeglichen sein, wenn diese wieder geöffnet "
+"werden sollen)"
 
 #. module: account
 #: view:account.invoice:0
@@ -5314,7 +5313,7 @@ msgstr "Benutze Buchungsvorlage"
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,end:0
 msgid "No"
-msgstr "Nummer"
+msgstr "Nein"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move
@@ -6062,3 +6061,6 @@ msgstr "Aktivieren, wenn Benutzer das Konto ausgleichen dürfen."
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Berechne eingegebene Daten"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index d5cb2f7dc84..b37100f9c97 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-05-13 14:03+0000\n"
-"Last-Translator: Carlo - didotech.com <Unknown>\n"
+"PO-Revision-Date: 2010-06-04 16:42+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-05-14 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -3047,7 +3047,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.line,uos_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unità di misura"
 
 #. module: account
 #: field:account.chart.template,property_account_receivable:0
@@ -3107,7 +3107,7 @@ msgstr "Imposta come bozza"
 #: help:account.invoice,origin:0
 #: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
-msgstr ""
+msgstr "Riferimento al documento che ha prodotto questa fattura."
 
 #. module: account
 #: selection:account.account,type:0
@@ -3608,7 +3608,7 @@ msgstr "Manuale"
 #. module: account
 #: view:account.invoice:0
 msgid "Compute Taxes"
-msgstr ""
+msgstr "Calcola tasse"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,code_digits:0
@@ -4596,7 +4596,7 @@ msgstr ""
 #. module: account
 #: field:account.tax,price_include:0
 msgid "Tax Included in Price"
-msgstr ""
+msgstr "Tassa compresa nel prezzo"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index f298c31854d..5df4bb0be72 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -7,30 +7,30 @@ 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-04-24 15:00+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-02 08:19+0000\n"
+"Last-Translator: jan@synkronized.be <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-04-17 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-06-03 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
-msgstr ""
+msgstr "Interne naam"
 
 #. module: account
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr ""
+msgstr "Belasting code"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree9
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree9
 msgid "Unpaid Supplier Invoices"
-msgstr ""
+msgstr "Onbetaalde inkoopfacturen"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
@@ -50,12 +50,12 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr ""
+msgstr "Activa"
 
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de actie-definitie."
 
 #. module: account
 #: help:account.journal,currency:0
@@ -65,7 +65,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account_use_models,init_form:0
 msgid "Select Message"
-msgstr ""
+msgstr "Kies bericht"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -82,19 +82,19 @@ msgstr ""
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
 msgid "Reconciliation result"
-msgstr ""
+msgstr "Afletterresultaat"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr ""
+msgstr "Niet afgeletterde boekingen"
 
 #. module: account
 #: 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 ""
+msgstr "Basiscode"
 
 #. module: account
 #: view:account.account:0
@@ -2132,7 +2132,8 @@ 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 ""
 
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index c1632caa35b..1ed4700b0e0 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.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-05-06 09:55+0000\n"
+"PO-Revision-Date: 2010-05-30 15:07+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-05-07 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-05-31 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -117,7 +117,7 @@ msgstr "Nadrzędne"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr ""
+msgstr "Dokument dziennika"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -136,7 +136,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 "Skasuj uzgodnienie"
 
 #. module: account
 #: constraint:account.period:0
@@ -156,7 +156,7 @@ msgstr "Zapisy"
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr ""
+msgstr "Centralizacja Winien"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
@@ -647,7 +647,7 @@ msgstr "Warunki płatności dla partnera"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr ""
+msgstr "Uzgodnienie zapisów"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
@@ -867,7 +867,7 @@ msgstr "Konta analityczne"
 #: model:ir.actions.wizard,name:account.wizard_print_journal
 #: model:ir.ui.menu,name:account.menu_print_journal
 msgid "Print Journal"
-msgstr "Drukuj dziennik"
+msgstr "Drukuj zapisy dzienników"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -1339,7 +1339,7 @@ msgstr "Zamknij rok podatkowy"
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "Centralizacja przeciwnej strony"
 
 #. module: account
 #: view:wizard.company.setup:0
@@ -1546,7 +1546,7 @@ msgstr "Dodatnie"
 #: model:ir.actions.wizard,name:account.wizard_general_journal
 #: model:ir.ui.menu,name:account.menu_general_journal
 msgid "Print General Journal"
-msgstr ""
+msgstr "Drukuj stany dzienników"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -1786,7 +1786,7 @@ msgstr "Uzgodnienie zapisów z faktur i płatności"
 #: model:ir.actions.wizard,name:account.wizard_central_journal
 #: model:ir.ui.menu,name:account.menu_central_journal
 msgid "Print Central Journal"
-msgstr ""
+msgstr "Drukuj konta dzienników"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,period_length:0
@@ -1877,7 +1877,7 @@ msgstr "Data początkowa"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr ""
+msgstr "x Dziennik korekt wydatków"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -2010,7 +2010,7 @@ msgstr "          Data początkowa"
 #. module: account
 #: wizard_view:account.analytic.account.journal.report,init:0
 msgid "Analytic Journal Report"
-msgstr ""
+msgstr "Raport dzenników analitycznych"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -2119,7 +2119,7 @@ msgstr "dni"
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Past"
-msgstr "Poprzednio"
+msgstr "Przeszłość"
 
 #. module: account
 #: field:account.analytic.account,company_currency_id:0
@@ -2168,7 +2168,8 @@ 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"
 
@@ -2846,7 +2847,7 @@ msgstr "Widok dziennika"
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Credit Centralisation"
-msgstr ""
+msgstr "Centralizacja Ma"
 
 #. module: account
 #: rml:account.overdue:0
@@ -2886,7 +2887,7 @@ msgstr "Nowa Faktura Klienta"
 #: wizard_button:account.move.line.reconcile,addendum,reconcile:0
 #: wizard_button:account.move.line.reconcile,init_full,reconcile:0
 msgid "Reconcile"
-msgstr "Uzgodnij"
+msgstr "Uzgodnienie"
 
 #. module: account
 #: rml:account.overdue:0
@@ -3004,7 +3005,7 @@ msgstr "Uzgodnienie"
 #. module: account
 #: field:account.move.line,centralisation:0
 msgid "Centralisation"
-msgstr ""
+msgstr "Centralizacja"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -3235,7 +3236,7 @@ msgstr "Uwagi"
 msgid ""
 "The account moves of the invoice have been reconciled with account moves of "
 "the payment(s)."
-msgstr "Zapisy konta dla faktury zostały uzgodnione ze zapisami płatności."
+msgstr "Zapisy konta dla faktury zostały uzgodnione z zapisami płatności."
 
 #. module: account
 #: rml:account.invoice:0
@@ -3308,7 +3309,7 @@ msgstr "Uzgodnij zapisy"
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr ""
+msgstr "(Faktura musi mieć skasowane uzgodnienia, jeśli chcesz ją otworzyć)"
 
 #. module: account
 #: view:account.invoice:0
@@ -3536,7 +3537,7 @@ msgstr "Zapłać i uzgodnij"
 #: rml:account.central.journal:0
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr "Dziennik główny"
+msgstr "Konta dziennika"
 
 #. module: account
 #: rml:account.third_party_ledger:0
@@ -3922,7 +3923,7 @@ msgstr "Wprowadź ręcznie zestawienie"
 #: 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 "Dzienniki finansowe"
+msgstr "Dzienniki księgowe"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -5504,7 +5505,7 @@ msgstr "Zapis na koncie"
 #: rml:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr ""
+msgstr "Stany dzienników"
 
 #. module: account
 #: field:account.account,balance:0
@@ -5653,7 +5654,7 @@ msgstr "Do"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 msgid "Entries of Open Analytic Journals"
-msgstr ""
+msgstr "Zapisy otwartych dzienników analitycznych"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -5686,7 +5687,7 @@ msgstr "Rok podatkowy do zamknięcia"
 #: 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 "Pociątek okresu"
+msgstr "Początek okresu"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
@@ -5875,7 +5876,7 @@ msgstr "Rok podatkowy"
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Future"
-msgstr "Przyszłe"
+msgstr "Przyszłość"
 
 #. module: account
 #: help:account.account.balance.report,checktype,fiscalyear:0
@@ -5909,7 +5910,7 @@ msgstr "Zapis"
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
 msgid "Paid invoice when reconciled."
-msgstr ""
+msgstr "Faktura zapłacona przy uzgadnianiu"
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 93b325d879e..1f1aaf4dbb8 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-05-06 05:39+0000\n"
+"PO-Revision-Date: 2010-05-29 11:45+0000\n"
 "Last-Translator: digitalsatori <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-05-07 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-05-30 03:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -72,7 +72,7 @@ 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
@@ -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
@@ -875,7 +875,7 @@ msgstr "必须的"
 #: 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
@@ -1575,7 +1575,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
@@ -2138,7 +2138,8 @@ 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 "逾期付款信息"
 
@@ -3848,7 +3849,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
@@ -4171,7 +4172,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
@@ -5365,7 +5366,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
@@ -5625,7 +5626,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
@@ -5657,7 +5658,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
@@ -5829,7 +5830,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
@@ -5851,7 +5852,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
@@ -5950,6 +5951,9 @@ msgstr "计算日期"
 #~ msgid "For Value percent enter % ratio between 0-1."
 #~ msgstr "值是一个百分比在0-1之间"
 
+#~ msgid "account.config.wizard"
+#~ msgstr "科目.设置.向导"
+
 #~ msgid "For Tax Type percent enter % ratio between 0-1."
 #~ msgstr "税类型是百分比在0-1之间"
 
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 4af3b43d54c..5ef80d40560 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -333,6 +333,7 @@ class account_invoice(osv.osv):
                 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):
@@ -951,23 +952,8 @@ class account_invoice(osv.osv):
         return taxes.values()
 
     def _log_event(self, cr, uid, ids, factor=1.0, name='Open Invoice'):
-        invs = self.read(cr, uid, ids, ['type','partner_id','amount_untaxed'])
-        for inv in invs:
-            part=inv['partner_id'] and inv['partner_id'][0]
-            pc = pr = 0.0
-            cr.execute('select sum(quantity*price_unit) from account_invoice_line where invoice_id=%s', (inv['id'],))
-            total = inv['amount_untaxed']
-            if inv['type'] in ('in_invoice','in_refund'):
-                partnertype='supplier'
-                eventtype = 'purchase'
-                pc = total*factor
-            else:
-                partnertype = 'customer'
-                eventtype = 'sale'
-                pr = total*factor
-            if self.pool.get('res.partner.event.type').check(cr, uid, 'invoice_open'):
-                self.pool.get('res.partner.event').create(cr, uid, {'name':'Invoice: '+name, 'som':False, 'description':name+' '+str(inv['id']), 'document':name, 'partner_id':part, 'date':time.strftime('%Y-%m-%d %H:%M:%S'), 'canal_id':False, 'user_id':uid, 'partner_type':partnertype, 'probability':1.0, 'planned_revenue':pr, 'planned_cost':pc, 'type':eventtype})
-        return len(invs)
+        #TODO: implement messages system
+        return True
 
     def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
@@ -1146,17 +1132,17 @@ account_invoice()
 class account_invoice_line(osv.osv):
     def _amount_line(self, cr, uid, ids, prop, unknow_none,unknow_dict):
         res = {}
-        cur_obj=self.pool.get('res.currency')
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids):
+            price = line.price_unit * (1-(line.discount or 0.0)/100.0)
+            taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity)
+            res[line.id] = taxes['total']
             if line.invoice_id:
-                res[line.id] = line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0)
                 cur = line.invoice_id.currency_id
                 res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
-            else:
-                res[line.id] = round(line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0),self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
         return res
 
-
     def _price_unit_default(self, cr, uid, context=None):
         if context is None:
             context = {}
@@ -1170,7 +1156,7 @@ class account_invoice_line(osv.osv):
                     taxes = l[2].get('invoice_line_tax_id')
                     if len(taxes[0]) >= 3 and taxes[0][2]:
                         taxes = tax_obj.browse(cr, uid, taxes[0][2])
-                        for tax in tax_obj.compute(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False)):
+                        for tax in tax_obj.compute_all(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False))['taxes']:
                             t = t - tax['amount']
             return t
         return 0
@@ -1185,7 +1171,8 @@ class account_invoice_line(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
         'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Account')),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',store=True, type="float", digits_compute= dp.get_precision('Account')),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', type="float",
+            digits_compute= dp.get_precision('Account'), store=True),
         'quantity': fields.float('Quantity', required=True),
         'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Account')),
         'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
@@ -1354,10 +1341,10 @@ class account_invoice_line(osv.osv):
                 continue
             res.append(mres)
             tax_code_found= False
-            for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id,
+            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id,
                     (line.price_unit * (1.0 - (line['discount'] or 0.0) / 100.0)),
                     line.quantity, inv.address_invoice_id.id, line.product_id,
-                    inv.partner_id):
+                    inv.partner_id)['taxes']:
 
                 if inv.type in ('out_invoice', 'in_invoice'):
                     tax_code_id = tax['base_code_id']
@@ -1460,7 +1447,7 @@ class account_invoice_tax(osv.osv):
         company_currency = inv.company_id.currency_id.id
 
         for line in inv.invoice_line:
-            for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
+            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id)['taxes']:
                 val={}
                 val['invoice_id'] = inv.id
                 val['name'] = tax['name']
@@ -1522,11 +1509,7 @@ account_invoice_tax()
 class res_partner(osv.osv):
     """ Inherits partner and adds invoice information in the partner form """
     _inherit = 'res.partner'
-
     _columns = {
-                'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
-                }
-
+        'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
+    }
 res_partner()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 286d0f1d79e..72004afa944 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -57,7 +57,7 @@
         <menuitem
             action="action_account_fiscal_position_form"
             id="menu_action_account_fiscal_position_form"
-            parent="account.menu_finance_accounting" sequence="20"/>
+            parent="next_id_27" sequence="20"/>
 
         <!--
         Partners Extension
@@ -74,13 +74,13 @@
                 <page string="Accounting" position="inside">
                     <group col="2" colspan="2">
                         <separator string="Customer Accounting Properties" colspan="2"/>
-                        <field name="property_account_receivable" />
+                        <field name="property_account_receivable" groups="account.group_account_user" />
                         <field name="property_account_position" widget="selection"/>
                         <field name="property_payment_term" widget="selection"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Supplier Accounting Properties" colspan="2"/>
-                        <field name="property_account_payable"/>
+                        <field name="property_account_payable" groups="account.group_account_user"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Customer Credit" colspan="2"/>
@@ -132,11 +132,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Project">
-                        <field name="contract_ids" colspan="4" nolabel="1" />
-                    </page>
-                </notebook>
+                <xpath expr="//notebook[last()]" position="after">
+	                <notebook colspan="4">
+	                    <page string="Project">
+	                        <field name="contract_ids" colspan="4" nolabel="1" />
+	                    </page>
+	                </notebook>
+                </xpath>
             </field>
         </record>
         
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index b4a7b67a05a..03037963ded 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -25,8 +25,8 @@
             <field name="arch" type="xml">
             	<search string="Analytic Account">
             		<group col="8" colspan="4">
-	            		<filter icon="gtk-execute" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
-	            		<filter icon="gtk-execute" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
+	            		<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"/>
 						<field name="name" select="1"/>
 						<field name="code" select="1"/>
@@ -101,7 +101,7 @@
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
         </record>
         <!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
-        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="account.menu_analytic_accounting"/>
+        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic"/>
 
 		<record id="act_account_renew_view" model="ir.actions.act_window">
             <field name="name">Accounts to Renew</field>
@@ -114,7 +114,7 @@
         </record>
 
         <record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
-            <field name="name">Analytic Chart of Accounts</field>
+            <field name="name">Chart of Analytic Accounts</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
             <field name="domain">[('parent_id','=',False)]</field>
@@ -122,10 +122,10 @@
              <field name="view_mode">form,graph</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
         </record>
-        <menuitem
-            action="action_account_analytic_account_tree2"
-            id="account_analytic_def_chart"
-            parent="account_analytic_def_account"/>
+<!--        <menuitem-->
+<!--            action="action_account_analytic_account_tree2"-->
+<!--            id="account_analytic_def_chart"-->
+<!--            parent="account_analytic_def_account"/>-->
 <!--        <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>-->
 
 <!--		<wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
@@ -206,14 +206,14 @@
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="view_id" ref="view_account_analytic_line_tree"/>
         </record>
-       <wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries by Line"/>
-        <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/>
+<!--       <wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries by Line"/>-->
+<!--        <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/>-->
           <!-- Entries by Line -->
 
-         <menuitem  icon="STOCK_JUSTIFY_FILL"
-          action="action_project_account_analytic_line_form"
-          id="account_entries_analytic_entries"
-          parent="next_id_41"/>
+<!--         <menuitem  icon="STOCK_JUSTIFY_FILL"-->
+<!--          action="action_project_account_analytic_line_form"-->
+<!--          id="account_entries_analytic_entries"-->
+<!--          parent="next_id_41"/>-->
 
         <record id="action_account_tree1" model="ir.actions.act_window">
             <field name="name">Analytic Entries</field>
@@ -293,31 +293,49 @@
             </field>
         </record>
         <record id="action_account_analytic_journal_form" model="ir.actions.act_window">
-            <field name="name">Analytic Journal Definition</field>
+            <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>
         </record>
-        <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="account.menu_analytic_accounting"/>
+        <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic"/>
 
         #
         # Open journal entries
         #
 
         <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
-            <field name="name">Entries of Open Analytic Journals</field>
+            <field name="name">Analytic Journal Items</field>
             <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>
-        <record id="ir_open_account_journal_analytic" model="ir.values">
-            <field eval="'tree_but_open'" name="key2"/>
-            <field eval="'account.analytic.journal'" name="model"/>
-            <field name="name">Open Analytic Journal</field>
-            <field eval="'ir.actions.act_window,%d'%action_account_analytic_journal_open_form" name="value"/>
-            <field eval="True" name="object"/>
+        <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">
+            <field name="name">Check Register</field>
+            <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_bank_and_cash"/>-->
+        <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
+            <field name="name">Checks Register</field>
+            <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_bank_and_cash"/>-->
+        
+<!--        <record id="ir_open_account_journal_analytic" model="ir.values">-->
+<!--            <field eval="'tree_but_open'" name="key2"/>-->
+<!--            <field eval="'account.analytic.journal'" name="model"/>-->
+<!--            <field name="name">Open Analytic Journal</field>-->
+<!--            <field eval="'ir.actions.act_window,%d'%action_account_analytic_journal_open_form" name="value"/>-->
+<!--            <field eval="True" name="object"/>-->
+<!--        </record>-->
 
         #
         # Reporting
@@ -331,13 +349,13 @@
         <menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
 
 
-        <record id="action_account_analytic_journal_tree2" model="ir.actions.act_window">
-            <field name="name">Analytic Entries by Journal</field>
-            <field name="res_model">account.analytic.journal</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="view_account_analytic_journal_tree"/>
-        </record>
-        <menuitem action="action_account_analytic_journal_tree2" id="account_analytic_journal_entries" parent="account.next_id_41"/>
+<!--        <record id="action_account_analytic_journal_tree2" model="ir.actions.act_window">-->
+<!--            <field name="name">Analytic Entries by Journal</field>-->
+<!--            <field name="res_model">account.analytic.journal</field>-->
+<!--            <field name="view_type">tree</field>-->
+<!--            <field name="view_id" ref="view_account_analytic_journal_tree"/>-->
+<!--        </record>-->
+<!--        <menuitem action="action_account_analytic_journal_tree2" id="account_analytic_journal_entries" parent="account.next_id_41"/>-->
 
         #
         # Statistics
@@ -396,8 +414,8 @@
             <field name="arch" type="xml">
                 <search string="Analytic Entries Stats">
                 	<group col="8" colspan="4">
-	                	<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
-		               	<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
+	                	<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
+		               	<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
 		               	<separator orientation="vertical"/>
 	                    <field name="name" select="1"/>
 	               		<field name="month" select="1"/>
diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml
index 137fa0c69ae..bd9101a3382 100644
--- a/addons/account/report/account_account_report_view.xml
+++ b/addons/account/report/account_account_report_view.xml
@@ -45,10 +45,10 @@
         <field name="arch" type="xml">
             <search string="Accounts Analysis">
                <group>
-               <filter icon="terp-account"
+               <filter icon="terp-go-today"
 	                    	string="At Date"
 	                    	domain="[('currency_mode','=', 'current')]"/>
-	                <filter icon="terp-account"
+	                <filter icon="terp-stock_format-default"
 	                    	string="Average Rate"
 	                    	domain="[('currency_mode','=','average')]"/>
 	            <separator orientation="vertical"/>
@@ -56,15 +56,15 @@
             	<field name="code"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'name'}"/>
-                    <filter string="Code"  icon="terp-account" context="{'group_by':'code'}"/>
-                    <filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Account" name="Account" icon="terp-folder-orange" context="{'group_by':'name'}"/>
+                    <filter string="Code"  icon="terp-stock_format-scientific" context="{'group_by':'code'}"/>
+                    <filter string="Company"  icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Currencies Rate" icon="terp-account" context="{'group_by':'currency_mode'}"/>
-                    <filter string="Internal Type" icon="terp-account" context="{'group_by':'type'}"/>
-                    <filter string="Account Type" icon="terp-account" context="{'group_by':'user_type'}"/>
-                    <filter string="Parent Account" icon="terp-account" context="{'group_by':'parent_account_id'}"/>
+                    <filter string="Currencies Rate" icon="terp-dolar" context="{'group_by':'currency_mode'}"/>
+                    <filter string="Internal Type" icon="terp-go-home" context="{'group_by':'type'}"/>
+                    <filter string="Account Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}"/>
+                    <filter string="Parent Account" icon="terp-folder-orange" context="{'group_by':'parent_account_id'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 82a063256c1..1564859540a 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -35,14 +35,14 @@
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
               <group col="10" colspan="12">
-	            	<filter icon="gtk-media-rewind" string="  365 Days  "
+	            	<filter icon="terp-go-year" string="  365 Days  "
 		                    domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Analytic Entries of last 365 days"/>
-	                <filter icon="gtk-media-rewind" string="   30 Days   "
+	                <filter icon="terp-go-month" string="   30 Days   "
 	                		name="month"
 	                		domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                		help="Analytic Entries of last 30 days"/>
-	                <filter icon="gtk-media-rewind"
+	                <filter icon="terp-go-week"
 	                        string="    7 Days    "
 	                        separator="1"
 	                        domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
@@ -50,25 +50,25 @@
 	                <separator orientation="vertical"/>
 	                <field name="product_id" />
 	                <field name="user_id" widget="selection">
-	                <filter icon="terp-account" domain="[('user_id','=',uid)]" help="My Entries"/>
+	                <filter icon="terp-gtk-jump-to-ltr" domain="[('user_id','=',uid)]" help="My Entries"/>
 	                </field>
 	            </group>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="User" name="User" icon="terp-account" context="{'group_by':'user_id'}"/>
-                    <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
-                    <filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                <group expand="0" string="Group By...">
+                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Currency" icon="terp-dolar" context="{'group_by':'currency_id'}"/>
+                    <filter string="Company"  icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Account"  icon="terp-account" context="{'group_by':'account_id'}"/>
-                    <filter string="General Account" icon="terp-account" context="{'group_by':'general_account_id'}"/>
-                    <filter string="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+                    <filter string="Account"  icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
+                    <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
+                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
-                    <filter string="Product UOM" icon="terp-account" context="{'group_by':'product_uom_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="Product UOM" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                    <filter string="Day" icon="terp-go-month" 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>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index f853b809867..290e6950569 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -36,26 +36,26 @@
         <field name="arch" type="xml">
             <search string="Analytic Accounts Analysis">
             	<group>
-	                <filter icon="gtk-media-rewind" string="  365 Days  "
+	                <filter icon="terp-go-year" string="  365 Days  "
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Accounts of last 365 days"/>
-                    <filter icon="gtk-media-rewind" string="   30 Days   "
+                    <filter icon="terp-go-month" string="   30 Days   "
                             name="This Month"
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Accounts of last 30 days"/>
-                    <filter icon="gtk-media-rewind"
+                    <filter icon="terp-go-week"
                             string="    7 Days    "
                             separator="1"
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Accounts during last 7 days"/>
 	                <separator orientation="vertical"/>
-	                <filter icon="terp-account"
+	                <filter icon="terp-document-new"
                     		string="Draft"
                     		domain="[('state','=','draft')]"/>
-                    <filter icon="terp-account"
+                    <filter icon="terp-camera_test"
                     		string="Open"
                     		domain="[('state','=','open')]"/>
-                    <filter icon="terp-account"
+                    <filter icon="terp-gtk-media-pause"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
                     <separator orientation="vertical"/>
@@ -63,28 +63,28 @@
 	                <field name="product_id" />
 	                <field name="partner_id"/>
 	                <field name="user_id" widget="selection">
-	                    <filter icon="terp-account"
+	                    <filter icon="terp-folder-orange"
 	                        	string="My Accounts"
 	                        	help="My Account"
 	                        	domain="[('user_id','=',uid)]"/>
 	                </field>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                	<filter string="User" name="User" icon="terp-account" context="{'group_by':'user_id'}"/>
-                    <filter string="Associated Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
+                <group expand="0" string="Group By..." colspan="10" col="12">
+                	<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Associated Partner" icon="terp-personal+" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-					<filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Analytic Account" icon="terp-account" context="{'group_by':'parent_id'}"/>
-                    <filter string="Analytic Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+					<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'parent_id'}"/>
+                    <filter string="Analytic Journal" icon="terp-folder-green" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
-                    <filter string="Account Type" icon="terp-account" context="{'group_by':'type'}"/>
-                    <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="Account Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                    <filter string="Day" icon="terp-go-month" 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>
                 <newline/>
                 <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index e4731e2c994..78683b5120b 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -22,9 +22,15 @@
 import xml
 import copy
 from operator import itemgetter
-import time
 import datetime
 from report import report_sxw
+import xml.dom.minidom
+import os, time
+import osv
+import re
+import tools
+import pooler
+import sys
 
 class account_balance(report_sxw.rml_parse):
         _name = 'report.account.account.balance'
@@ -44,6 +50,10 @@ class account_balance(report_sxw.rml_parse):
             })
             self.context = context
 
+        def _add_header(self, node, header=1):
+            if header==0:
+                self.rml_header = "" 
+            return True
         def get_fiscalyear(self, form):
             res=[]
             if form.has_key('fiscalyear'):
@@ -56,16 +66,14 @@ class account_balance(report_sxw.rml_parse):
 
         def get_periods(self, form):
             result=''
-            if form.has_key('periods') and form['periods'][0][2]:
-                period_ids = form['periods'][0][2]
-                self.cr.execute("select name from account_period where id =ANY(%s)" ,(period_ids))
-                res = self.cr.fetchall()
-                len_res = len(res)
-                for r in res:
-                    if (r == res[len_res-1]):
-                        result+=r[0]+". "
+            if form.has_key('periods') and form['periods']:
+                period_ids = form['periods']
+                per_ids = self.pool.get('account.period').browse(self.cr,self.uid,form['periods'])
+                for r in per_ids:
+                    if r == per_ids[len(per_ids)-1]:
+                        result+=r.name+". "
                     else:
-                        result+=r[0]+", "
+                        result+=r.name+", "
             else:
                 fy_obj = self.pool.get('account.fiscalyear').browse(self.cr,self.uid,form['fiscalyear'])
                 res = fy_obj.period_ids
@@ -172,5 +180,8 @@ class account_balance(report_sxw.rml_parse):
         def _sum_debit(self):
             return self.sum_debit
 
-report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=False)
+
+            
+
+report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=0)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index fb8eb53c418..af4cee7a7ba 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -66,6 +66,27 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+        <blockTableStyle id="Table3a">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -95,6 +116,8 @@
     <paraStyle name="P9b" fontName="Helvetica" fontSize="9" leftIndent="0.0" alignment="LEFT"/>
     <paraStyle name="P9b" fontName="Helvetica" fontSize="8" leftIndent="-5.0" alignment="LEFT"/>
     <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P12b" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -141,14 +164,46 @@
 <para style="P2">
 <font color="white"> </font>
 </para>
-<blockTable colWidths="527.00" style="Table4" repeatRows="1">
+
+    <blockTable colWidths="78.0,108.0,108.0,108.0,138" style="Table3a">
       <tr>
         <td>
-  		  <para style="P9a">[[ get_fiscalyear(data['form']) or removeParentNode('para') ]]:</para>
-          <para style="P9b"><i> [[ get_periods(data['form']) or removeParentNode('para') ]]</i></para>
+          <para style="terp_tblheader_General_Centre">Fiscal Year</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">End Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Start Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Display Account</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Periods</para>
         </td>
       </tr>
-</blockTable>
+    </blockTable>
+    <blockTable colWidths="78.0,108.0,108.0,108.0,138" style="Table3a">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_fiscalyear(data['form']) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ data['form']['date_from'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ data['form']['date_to'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_mouvement' and 'With movements') or 'With balance is not equal to 0']]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8"> [[data['form']['periods'] and get_periods(data['form']) or '']]</para>
+        </td>
+      </tr>
+    </blockTable>
+
 
 <para style="P2">
 <font color="white"> </font>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 5d1b99b578e..0c3a77db2a7 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -50,25 +50,25 @@
         <field name="arch" type="xml">
             <search string="Entries Analysis">
             	<group colspan="10" col="12">
-	            	<filter icon="gtk-media-rewind" string="  365 Days  "
+	            	<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="Entries of last 365 days"/>
-	                <filter icon="gtk-media-rewind" string="   30 Days   "
+	                <filter icon="terp-go-month" string="   30 Days   "
 	                		name="This Month"
 	                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                		help="Entries of last 30 days"/>
-	                <filter icon="gtk-media-rewind"
+	                <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="Entries during last 7 days"/>
 	                <separator orientation="vertical"/>
                     <filter string="Draft"
-                    		icon="terp-account"
+                    		icon="terp-document-new"
                     		domain="[('state','=','draft')]"
                     		help = "Draft entries"/>
                     <filter string="Posted"
-                            icon="terp-account"
+                            icon="terp-camera_test"
                             domain="[('state','=','posted')]"
                             help = "Posted entries"/>
                     <separator orientation="vertical"/>
@@ -78,24 +78,24 @@
                     <field name="analytic_account_id"/>
 					</group>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
-                    <filter string="Journal" name="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="Journal" name="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
-                    <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
-                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Account" name="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Analytic Account" name="Analytic Account" icon="terp-account" context="{'group_by':'analytic_account_id'}"/>
-                    <filter string="State of Move Line" icon="terp-account" context="{'group_by':'state_2'}"/>
-                    <filter string="Period" icon="terp-account" context="{'group_by':'period_id'}"/>
-                    <filter string="Period of Move Line" icon="terp-account" context="{'group_by':'period_id2'}"/>
+                    <filter string="Analytic Account" name="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}"/>
+                    <filter string="State of Move Line" icon="terp-stock_effects-object-colorize" context="{'group_by':'state_2'}"/>
+                    <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
+                    <filter string="Period of Move Line" icon="terp-go-month" context="{'group_by':'period_id2'}"/>
                     <newline/>
-                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                    <filter string="Day" icon="terp-go-month" 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>
                  <newline/>
                  <group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index cd1477e79cf..1fb90a86bec 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -36,10 +36,12 @@ class account_invoice_report(osv.osv):
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'product_qty':fields.float('Qty', readonly=True),
+        'uom_name': fields.char('Default UoM', size=128, readonly=True),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')],readonly=True),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position',readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
+        'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Journal',readonly=True),
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
@@ -47,6 +49,7 @@ class account_invoice_report(osv.osv):
         'price_total':fields.float('Total Price', readonly=True),
         'price_average':fields.float('Average Price', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
+        'reconciled':fields.integer('# reconciled lines', readonly=True),
         'type': fields.selection([
             ('out_invoice','Customer Invoice'),
             ('in_invoice','Supplier Invoice'),
@@ -60,7 +63,7 @@ class account_invoice_report(osv.osv):
             ('open','Open'),
             ('paid','Done'),
             ('cancel','Cancelled')
-            ], 'Order State', readonly=True),
+            ], 'Invoice State', readonly=True),
         'date_due': fields.date('Due Date', readonly=True),
         'address_contact_id': fields.many2one('res.partner.address', 'Contact Address Name', readonly=True),
         'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
@@ -81,46 +84,66 @@ class account_invoice_report(osv.osv):
                      to_char(s.date_invoice, 'MM') as month,
                      to_char(s.date_invoice, 'YYYY-MM-DD') as day,
                      l.product_id as product_id,
-                     sum(l.quantity * u.factor) as product_qty,
+                     sum(case when s.type in ('out_refund','in_invoice') then
+                             l.quantity * u.factor * -1
+                         else
+                             l.quantity * u.factor
+                         end) as product_qty,
                      s.partner_id as partner_id,
+                     s.reconciled::integer,
                      s.payment_term as payment_term,
                      s.period_id as period_id,
+                     u.name as uom_name,
                      s.currency_id as currency_id,
                      s.journal_id as journal_id,
                      s.fiscal_position as fiscal_position,
                      s.user_id as user_id,
                      s.company_id as company_id,
-                     sum(l.quantity*l.price_unit) as price_total,
-                     (sum(l.quantity*l.price_unit)/sum(l.quantity * u.factor))::decimal(16,2) as price_average,
+                     sum(case when s.type in ('out_refund','in_invoice') then
+                             l.quantity*l.price_unit * -1
+                         else
+                             l.quantity*l.price_unit
+                         end) as price_total,
+                     sum(case when s.type in ('out_refund','in_invoice') then
+                             l.quantity*l.price_unit * -1
+                         else
+                             l.quantity*l.price_unit
+                         end) / sum(l.quantity * u.factor)::decimal(16,2) as price_average,
                      count(*) as nbr,
                      s.type as type,
                      s.state,
+                     pt.categ_id,
                      s.date_due as date_due,
                      s.address_contact_id as address_contact_id,
                      s.address_invoice_id as address_invoice_id,
                      s.account_id as account_id,
                      s.partner_bank as partner_bank,
-                     s.residual as residual,
+                     sum(case when s.type in ('out_refund','in_invoice') then
+                             s.residual * -1
+                         else
+                             s.residual
+                         end) as residual,
                      case when s.state != 'paid' then null else
-                            extract(epoch from avg(am.date_created-l.create_date))/(24*60*60)::decimal(16,2)
+                     extract(epoch from avg(am.date_created-l.create_date))/(24*60*60)::decimal(16,2)
                      end as delay_to_pay
-                 from
-                 account_invoice_line l
-                 left join
-                     account_invoice s on (s.id=l.invoice_id)
-                     left join product_uom u on (u.id=l.uos_id),
+                 from account_invoice_line l
+                 left join account_invoice s on (s.id=l.invoice_id)
+                 left join product_template pt on (pt.id=l.product_id)
+                 left join product_uom u on (u.id=l.uos_id),
                  account_move_line am left join account_invoice i on (i.move_id=am.move_id)
-                 where
-                        am.account_id=i.account_id
+                 where am.account_id=i.account_id
                  group by
                      s.type,
                      s.date_invoice,
                      s.partner_id,
                      l.product_id,
+                     u.name,
                      l.uos_id,
+                     s.reconciled,
                      s.user_id,
                      s.state,
                      s.residual,
+                     pt.categ_id,
                      s.company_id,
                      s.payment_term,
                      s.period_id,
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 94f181cd587..542b695e7dd 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -16,10 +16,10 @@
                 <field name="company_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
-                <field name="product_qty" invisible="1"/>
+                <field name="uom_name" invisible="not context.get('set_visible',False)"/>
+                <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
-                <field name="price_average" avg="Average Price"/>
-                <field name="price_total" sum="Total Price"/>
+                <field name="product_qty"/>
                 <field name="state" invisible="1"/>
                 <field name="period_id" invisible="1"/>
                 <field name="currency_id" invisible="1"/>
@@ -27,8 +27,11 @@
                 <field name="date_due" invisible="1"/>
                 <field name="address_contact_id" invisible="1"/>
                 <field name="address_invoice_id" invisible="1"/>
-                <field name="account_id" invisible="1"/>
                 <field name="partner_bank" invisible="1"/>
+                <field name="account_id" invisible="1"/>
+                <field name="reconciled"  sum="# Reconciled"/>
+                <field name="price_average" avg="Average Price"/>
+                <field name="price_total" sum="Total Price"/>
                 <field name="residual"  sum="Total Residual"/>
                 <field name="delay_to_pay"  avg="Avg. Delay To Pay"/>
             </tree>
@@ -54,86 +57,78 @@
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
               <group col="10" colspan="12">
-	            	<filter icon="gtk-media-rewind" string="  365 Days  "
+	            	<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="Invoices of last 365 days"/>
-	                <filter icon="gtk-media-rewind" string="   30 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="Invoices of last 30 days"/>
-	                <filter icon="gtk-media-rewind"
+	                <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="Invoices during last 7 days"/>
 	                <separator orientation="vertical"/>
-                    <filter string="Draft"
-                    		icon="terp-account"
-                    		domain="[('state','=','draft')]"
-                    		help = "Draft Invoices"/>
+                    <filter string="Current"
+	                		icon="terp-check"
+                    		domain="[('state','in',('draft','open'))]"
+                    		help = "Draft and Open Invoices"/>
                    	<filter string="Pro-forma"
-                   			icon="terp-account"
+                   			icon="terp-check"
                    			domain="[('state','=','proforma'),('state','=','proforma2')]"
                    			help = "Pro-forma Invoices"/>
                    	<filter string="Current"
-	                		icon="terp-account"
 	                		domain="[('state', '=' ,'open')]"
 	                		help = "open Invoices"/>
 	                <filter string="Done"
-                            icon="terp-account"
+                            icon="terp-dialog-close"
                             domain="[('state','=','paid')]"
                             help = "Done Invoices"/>
-  					<separator orientation="vertical"/>
-  					<field name="partner_id"/>
+                  <separator orientation="vertical"/>
+                  <field name="partner_id"/>
                     <field name="user_id" widget="selection">
-                    <filter icon="terp-account"
+                    <filter icon="terp-dolar"
                     		string="My Invoices"
                     		help="My Invoices"
                     		domain="[('user_id','=',uid)]"/>
                     </field>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
 				<newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Salesman" name='User' icon="terp-account" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Salesman" name='User' icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
-                    <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
-                    <filter string="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
-                    <filter string="Bank Account" icon="terp-account" context="{'group_by':'partner_bank'}"/>
+                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                    <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
-                    <filter string="Force Period" icon="terp-account" context="{'group_by':'period_id'}"/>
+                    <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
+                    <filter string="Force Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <newline/>
-                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                    <filter string="Day" icon="terp-go-month" 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>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
-
-                    <field name="date" string="Date Invoiced"/>
+                    <field name="product_id"/>
+                    <field name="account_id"/>
                     <separator orientation="vertical"/>
                     <field name="type"/>
-                    <field name="currency_id" widget="selection"/>
-                    <field name="partner_bank" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="address_contact_id"/>
-                    <field name="account_id"/>
-                    <newline/>
-                    <field name="date_due"/>
-                    <separator orientation="vertical"/>
                     <field name="journal_id" widget="selection"/>
-                    <field name="period_id" widget="selection"/>
+                    <separator orientation="vertical"/>
                     <field name="state"/>
                     <separator orientation="vertical"/>
-                	<field name="address_invoice_id"/>
-                	<field name="product_id"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <newline/>
+                    <field name="date" string="Date Invoiced"/>
+                    <field name="date_due"/>
                 </group>
             </search>
         </field>
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index 9b1688730aa..190ff856c8a 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -153,8 +153,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-					<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
-					<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
+					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
+					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
 					<separator orientation="vertical"/>
 					<field name="name" select="1"/>
 					<field name="month" select="1"/>
@@ -221,8 +221,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-					<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
-					<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
+					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
+					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
 					<separator orientation="vertical"/>
 					<field name="name" select="1"/>
 					<field name="month" select="1"/>
diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py
index ecc7c237631..1b38b930b2b 100644
--- a/addons/account/report/rml_parse.py
+++ b/addons/account/report/rml_parse.py
@@ -153,14 +153,11 @@ class rml_parse(report_sxw.rml_parse):
             return Stringer
 
     def _add_header(self, node, header=1):
-        if self.name == 'account.account.balance.landscape':
-            if header==2:
-                rml_head =  self.rml_header2
-            else:
-                rml_head =  self.rml_header
-            rml_head =  rml_head.replace('<pageGraphics>','''<pageGraphics> <image x="10" y="26cm" height="770.0" width="1120.0" >[[company.logo]] </image> ''')
+        if header==2:
+            rml_head =  self.rml_header2
         else:
-            return super(rml_parse, self)._add_header(node, header)
+            rml_head =  self.rml_header
+        rml_head =  rml_head.replace('<pageGraphics>','''<pageGraphics> <image x="10" y="26cm" height="770.0" width="1120.0" >[[company.logo]] </image> ''')
         return True
 
     # def _add_header(self, node):
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index 9711fc9b941..76b10e8745c 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -43,7 +43,7 @@
  	   		name="Automatic reconciliation"
  	   		action="action_account_automatic_reconcile"
  			id="menu_automatic_reconcile"
- 			parent="next_id_20"/>
+ 			parent="periodical_processing_reconciliation"/>
 
         <record id="account_automatic_reconcile_view1" model="ir.ui.view">
              <field name="name">Automatic reconcile unreconcile</field>
diff --git a/addons/account/wizard/account_central_journal_view.xml b/addons/account/wizard/account_central_journal_view.xml
index ec3f0eabb5d..dfe704c7051 100644
--- a/addons/account/wizard/account_central_journal_view.xml
+++ b/addons/account/wizard/account_central_journal_view.xml
@@ -31,7 +31,7 @@
         </record>
 
 		<menuitem
-	        name="Print Central Journal"
+	        name="Central Journals"
 	        parent="account.menu_generic_report"
 	        action="action_account_central_journal"
 	        id="menu_account_central_journal"
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 4a246f4034f..5dca78673c5 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -30,15 +30,6 @@
             <field name="target">new</field>
     	</record>
 
-<!--    	<record model="ir.values" id="account_change_currency">
-            <field name="model_id" ref="account.model_account_invoice" />
-            <field name="object" eval="1" />
-            <field name="name">Change Currency</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_change_currency'))"/>
-            <field name="key">action</field>
-            <field name="model">account.invoice</field>
-        </record>-->
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index e8db5193275..20547cde235 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -31,7 +31,7 @@
         </record>
 
 		<record id="action_account_fiscalyear_close" model="ir.actions.act_window">
-            <field name="name">Generate Fiscal Year Opening Entries</field>
+            <field name="name">Generate Opening Entries</field>
             <field name="res_model">account.fiscalyear.close</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/wizard/account_general_journal_view.xml b/addons/account/wizard/account_general_journal_view.xml
index 425efbaf847..fc39300d390 100644
--- a/addons/account/wizard/account_general_journal_view.xml
+++ b/addons/account/wizard/account_general_journal_view.xml
@@ -31,7 +31,7 @@
         </record>
 
 		<menuitem
-	        name="Print General Journal"
+	        name="General Journals"
 	        parent="account.menu_generic_report"
 	        action="action_account_general_journal"
 	        id="menu_account_general_journal"
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 5e84847577d..c1e4eb9b888 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -37,10 +37,6 @@
            <field name="target">new</field>
         </record>
 
-    <!--    <act_window id="action_account_invoice_refund"
-    		key2 = "client_action_multi"   name="Credit Note"
-    		res_model="account.invoice.refund"  src_model="account.invoice"
-    		view_mode="form" target="new"  view_type="form" /> -->
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 7a25932bb98..c3a9e4ad75a 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -32,10 +32,10 @@
            <field name="target">new</field>
         </record>
 
-        <menuitem icon="STOCK_JUSTIFY_FILL"
-        	action="action_account_move_journal_line_form"
-        	id="menu_action_move_journal_line_form"
-        	parent="account.menu_finance_entries" sequence="5" />
+<!--        <menuitem icon="STOCK_JUSTIFY_FILL"-->
+<!--        	action="action_account_move_journal_line_form"-->
+<!--        	id="menu_action_move_journal_line_form"-->
+<!--        	parent="account.menu_finance_entries" sequence="5" />-->
 
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index dbd25408fe1..795ae925ef9 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -32,7 +32,7 @@
         </record>
 
         <menuitem action="action_account_reconcile_select"
-        	id="menu_reconcile_select" parent="account.next_id_20" />
+        	id="menu_reconcile_select" parent="periodical_processing_reconciliation" />
 
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index 7d10c02f010..50449b36d2f 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -32,7 +32,7 @@
         </record>
 
         <menuitem action="action_account_unreconcile_select"
-        	id="menu_unreconcile_select" parent="account.next_id_20" />
+        	id="menu_unreconcile_select" parent="periodical_processing_reconciliation" />
 
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index c5269939e0c..421d3a319e4 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -29,9 +29,9 @@
            <field name="target">new</field>
         </record>
 
-        <menuitem action="action_account_open_closed_fiscalyear"
-        	id="menu_wizard_open_closed_fy"  sequence="2"
-        	parent="account.menu_account_end_year_treatments" />
+<!--        <menuitem action="action_account_open_closed_fiscalyear"-->
+<!--        	id="menu_wizard_open_closed_fy"  sequence="2"-->
+<!--        	parent="account.menu_account_end_year_treatments" />-->
 
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_pay_invoice.py b/addons/account/wizard/account_pay_invoice.py
index 0b71055409f..a3a57536a67 100644
--- a/addons/account/wizard/account_pay_invoice.py
+++ b/addons/account/wizard/account_pay_invoice.py
@@ -58,7 +58,7 @@ class account_invoice_pay(osv.osv_memory):
         'amount': fields.float('Amount paid', required=True, digits_compute = dp.get_precision('Account')),
         'name': fields.char('Entry Name', size=64, required=True),
         'date': fields.date('Date payment', required=True),
-        'journal_id': fields.many2one('account.journal', 'Journal/Payment Mode', required=True),
+        'journal_id': fields.many2one('account.journal', 'Journal/Payment Mode', required=True, domain=[('type','=','cash')]),
         'period_id': fields.many2one('account.period', 'Period', required=True),
         }
 
@@ -188,4 +188,4 @@ class account_invoice_pay(osv.osv_memory):
 
 account_invoice_pay()
 
-# 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/account/wizard/account_pay_invoice_view.xml b/addons/account/wizard/account_pay_invoice_view.xml
index aebdce1434c..0bae948100e 100644
--- a/addons/account/wizard/account_pay_invoice_view.xml
+++ b/addons/account/wizard/account_pay_invoice_view.xml
@@ -37,14 +37,6 @@
     	</record>
 
 
-<!-- 		<act_window name="Pay Invoice"
-				res_model="account.invoice.pay"
-				src_model="account.invoice"
-				view_mode="form"
-				target="new"
-				key2="client_action_multi"
-			id="action_view_account_invoice_pay"/> -->
-
 		<record id="view_account_invoice_pay_writeoff" model="ir.ui.view">
             <field name="name">account.invoice.pay.writeoff.form</field>
             <field name="model">account.invoice.pay.writeoff</field>
@@ -70,4 +62,4 @@
 
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/wizard/account_print_journal_view.xml b/addons/account/wizard/account_print_journal_view.xml
index 078db421b19..69a5b5dee39 100644
--- a/addons/account/wizard/account_print_journal_view.xml
+++ b/addons/account/wizard/account_print_journal_view.xml
@@ -33,7 +33,7 @@
         </record>
 
 		<menuitem
-	        name="Print Journal"
+	        name="Journals"
 	        parent="account.menu_generic_report"
 	        action="action_account_print_journal"
 	        id="menu_account_print_journal"
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index 252865f322e..cfe91171621 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -32,7 +32,7 @@
            	<field name="target">new</field>
         </record>
 
-        <menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="account.menu_finance_periodical_processing" />
+<!--        <menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="account.menu_finance_periodical_processing" />-->
 
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index fec632c2e59..a5720e3a0b4 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -39,8 +39,8 @@
             <field name="model">account.move.line</field>
 		</record>
 
-		<menuitem action="action_view_account_use_model" name="Create Entries From Models"
-					parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>
+<!--		<menuitem action="action_view_account_use_model" name="Create Entries From Models"-->
+<!--					parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>-->
 
 		<record id="view_account_use_model_open_entry" model="ir.ui.view">
             <field name="name">account.use.model.open.entry.form</field>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 27ca48662bc..8e006bf171f 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -34,7 +34,7 @@
 
         <menuitem
 	        name="Validate Ledger Postings"
-	        parent="account.menu_finance_periodical_processing"
+	        parent="periodical_processing_journal_entries_validation"
 	        action="action_validate_account_move"
 	        id="menu_validate_account_moves"
 	       />
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 528922d8763..fa53ac97a17 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -31,7 +31,7 @@
         </record>
 
 		<menuitem
-	        name="Print Taxes Report"
+	        name="Taxes Report"
 	        parent="menu_tax_report"
 	        action="action_account_vat_declaration"
 	        id="menu_account_vat_declaration"
diff --git a/addons/account_analytic_analysis/i18n/pt.po b/addons/account_analytic_analysis/i18n/pt.po
index fdd81c9e070..36f79ba1a7a 100644
--- a/addons/account_analytic_analysis/i18n/pt.po
+++ b/addons/account_analytic_analysis/i18n/pt.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-11-28 23:14+0000\n"
-"Last-Translator: Paulino <Unknown>\n"
+"PO-Revision-Date: 2010-06-01 10:22+0000\n"
+"Last-Translator: cmsa <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-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -38,12 +38,12 @@ msgstr "Data da última factura"
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
-"Processado usando a formula: Preço máximo da factura - Montante facturado"
+"Processado usando a fórmula: Preço Máximo da Factura - Montante Facturado"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Quantity - Hours Tot."
-msgstr "Processado usando a formula: Quantidade máxima - Horas totais."
+msgstr "Processado usando a fórmula: Quantidade Máxima - Horas Totais."
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
@@ -54,32 +54,32 @@ msgstr "Todas as contas de contabilidade analítica"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
 msgid "My Current Accounts"
-msgstr "Minhas contas correntes"
+msgstr "As minhas contas correntes"
 
 #. module: account_analytic_analysis
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
+msgstr "XML inválido para a arquitectura de vista!"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
-msgstr "Data da última factura criada por esta conta analítica."
+msgstr "Data da última factura criada para esta conta analítica."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theorical Revenue"
-msgstr "Rendimento teórico"
+msgstr "Rendimento Teórico"
 
 #. module: account_analytic_analysis
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo invalido na definição da acção"
+msgstr "Nome de modelo inválido na definição da acção."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
-msgstr "Processado usando a formula: Rendimento teórico - Custo total"
+msgstr "Processado usando a fórmula: Rendimento Teórico - Custo Total"
 
 #. module: account_analytic_analysis
 #: constraint:ir.model:0
@@ -113,7 +113,7 @@ msgstr "Conta analíticas correntes"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
 msgid "Date of the latest work done on this account."
-msgstr "Data do ultimo trabalho feito nesta conta"
+msgstr "Data do último trabalho feito nesta conta"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -121,8 +121,8 @@ msgid ""
 "If invoice from the costs, this is the date of the latest work or cost that "
 "have been invoiced."
 msgstr ""
-"Se facturado dos custos, esta é a data do ultimo trabalho ou custo que foi "
-"facturado."
+"Se facturado sobre os custos, esta é a data do ultimo trabalho ou custo que "
+"foi facturado."
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
@@ -137,7 +137,7 @@ msgstr "Data do ultimo custo/trabalho"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
 msgid "Total Costs"
-msgstr "Custo total"
+msgstr "Custos totais"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_quantity:0
@@ -145,13 +145,13 @@ msgid ""
 "Number of hours you spent on the analytic account (from timesheet). It "
 "computes on all journal of type 'general'."
 msgstr ""
-"Número de horas que você passou no conta analítica (do horário). É "
+"Número de horas que você passou no conta analítica (da folha de horas). É "
 "processado em todo o jornal do tipo 'general'."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Hours"
-msgstr "Horas restantes"
+msgstr "Horas Restantes"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -161,8 +161,8 @@ msgid ""
 "the pricelist."
 msgstr ""
 "Baseado nos custos você teve no projecto, o que seria o rendimento se todos "
-"estes custos forem facturados a preço normal da venda fornecido pela lista "
-"de preço."
+"estes custos fossem facturados ao preço normal da venda fornecidos pela "
+"tabela de preço."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -174,24 +174,24 @@ msgstr "Utilizador"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
 msgid "My Pending Accounts"
-msgstr "Minhas contas pendentes"
+msgstr "As minhas contas pendentes"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
 msgid "My Uninvoiced Entries"
-msgstr "Minhas entradas não facturadas"
+msgstr "As minhas entradas não facturadas"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr "Processado usando a formula: Montante facturado - Custo total."
+msgstr "Processado usando a fórmula: Montante Facturado - Custo Total."
 
 #. module: account_analytic_analysis
 #: 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 "Minhas contas"
+msgstr "As minhas contas"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
@@ -200,6 +200,9 @@ msgid ""
 "important data for project manager of services companies.\n"
 "Add menu to show relevant information for each manager."
 msgstr ""
+"Modificar a vista da conta analítica para mostrar\n"
+"dados importantes para o gestor de projecto das empresas de serviços.\n"
+"Adicione menu para mostrar as informações relevantes para cada gerente."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
@@ -219,43 +222,43 @@ msgstr "Contas da contabilidade analítica"
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
-msgstr ""
+msgstr "report_account_analytic"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
-msgstr "Montante facturado"
+msgstr "Montante Facturado"
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
 msgid "Financial Project Management"
-msgstr "Gestão do projecto financeiro"
+msgstr "Gestão do Projecto Financeiro"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr "Data do ultimo custo de facturado"
+msgstr "Data do último custo facturado"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
 msgid "Uninvoiced Amount"
-msgstr "Montante facturado"
+msgstr "Montante Facturado"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
 msgid "Pending Analytic Accounts"
-msgstr "Contas da contabilidade analítica pendentes"
+msgstr "Contabilidade analítica contas pendentes"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Hours"
-msgstr "Horas facturadas"
+msgstr "Horas Facturadas"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
 msgid "Real Margin"
-msgstr "Margem real"
+msgstr "Margem Real"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
@@ -265,12 +268,12 @@ msgstr "Montante da facturação total do cliente para esta conta"
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
 msgid "Hours summary by month"
-msgstr "Sumário de horas por mês"
+msgstr "Resumo de horas por mês"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin_rate:0
 msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
-msgstr "Processado usando a formula: (Margem real / Custos total) * 100."
+msgstr "Processado usando a fórmula: (Margem Real / Custos Total) * 100."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -279,17 +282,17 @@ msgid ""
 "invoice based on analytic account."
 msgstr ""
 "Número de horas (do diário de tipo 'geral') que pode ser facturado se você "
-"factura baseado na conta analítica."
+"factura baseado em conta analítica."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Analytic accounts"
-msgstr "Conta da Contabilidade analítica"
+msgstr "Contas da Contabilidade Analítica"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
 msgid "Remaining Revenue"
-msgstr "Lucro restante"
+msgstr "Receita Restante"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
@@ -297,18 +300,18 @@ msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
 msgstr ""
-"Se facturado da conta analítica, a quantidade restante que você pode "
+"Se facturado por conta analítica, a quantidade restante que você pode "
 "facturar ao cliente baseado nos custos totais."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Hours Tot."
-msgstr "Processado usando a formula: Montante facturado / Horas totais."
+msgstr "Processado usando a fórmula: Montante Facturado / Horas Totais."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Hours (real)"
-msgstr "Lucro por hora (real)"
+msgstr "Receitas por hora (real)"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,unit_amount:0
@@ -332,7 +335,7 @@ msgstr "Conta da Contabilidade Analítica"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
 msgid "Overpassed Accounts"
-msgstr "Contas ultrapassadas"
+msgstr "Contas Excedidas"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
@@ -347,4 +350,4 @@ msgid ""
 "indirect costs, like time spent on timesheets."
 msgstr ""
 "Total de custos para esta conta. Inclui custos reais (das facturas) e custos "
-"indirectos, como o tempo passado em folha de presença."
+"indirectos, como o tempo passado em folha de horas."
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index b94afdc9292..6eda0241eea 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -42,10 +42,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem
-            action="action_analytic_default_form"
-            id="menu_analytic_defaul_form"
-            parent="account.menu_analytic_accounting"/>
+<!--        <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"/>
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 55afe582445..656b9105210 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -129,10 +129,10 @@
         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"/>
+<!--    <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>
@@ -192,11 +192,16 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-
-    <menuitem
-        parent="account.account_analytic_def_account"
-        id="menu_account_analytic_plan_action"
-        action="account_analytic_plan_form_action"/>
+	
+	<menuitem
+        parent="account.menu_analytic"
+        name="Multi Plans"
+        id="menu_account_analytic_multi_plan_action"
+        />
+     <menuitem
+         parent="menu_account_analytic_multi_plan_action"
+         id="menu_account_analytic_plan_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>
diff --git a/addons/account_analytic_plans/i18n/id.po b/addons/account_analytic_plans/i18n/id.po
index bb4edb18b29..f1012dd6ec1 100644
--- a/addons/account_analytic_plans/i18n/id.po
+++ b/addons/account_analytic_plans/i18n/id.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-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/pt.po b/addons/account_analytic_plans/i18n/pt.po
index 7b17be3392e..59d93dbf74f 100644
--- a/addons/account_analytic_plans/i18n/pt.po
+++ b/addons/account_analytic_plans/i18n/pt.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-28 23:17+0000\n"
-"Last-Translator: Paulino <Unknown>\n"
+"PO-Revision-Date: 2010-06-01 10:24+0000\n"
+"Last-Translator: cmsa <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-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -26,8 +26,7 @@ msgstr "Identificação da conta4"
 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 nenhum caractere "
-"especial !"
+"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
 
 #. module: account_analytic_plans
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
diff --git a/addons/account_anglo_saxon/i18n/id.po b/addons/account_anglo_saxon/i18n/id.po
index bf59eb13b73..d3e467bf0b2 100644
--- a/addons/account_anglo_saxon/i18n/id.po
+++ b/addons/account_anglo_saxon/i18n/id.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-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_budget/crossovered_budget_report.xml b/addons/account_budget/crossovered_budget_report.xml
index 0e3fcad2fc7..7a968cc9557 100644
--- a/addons/account_budget/crossovered_budget_report.xml
+++ b/addons/account_budget/crossovered_budget_report.xml
@@ -4,7 +4,7 @@
 
 	<!-- Reports on crossovered.budget -->
 		<report id="report_crossovered_budget"
-				string="Print Budgets"
+				string="Budgets"
 				model="crossovered.budget"
 				name="crossovered.budget.report"
 				rml="account_budget/report/crossovered_budget_report.rml"
@@ -48,7 +48,7 @@
 			model="account.budget.post"
 			name="account.budget"
 			rml="account_budget/report/budget_report.rml"
-			string="Print Budget"/>
+			string="Budget"/>
 
 	</data>
 </openerp>
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index 00dec853486..e7a0faf069d 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -178,12 +178,33 @@
             </field>
         </record>
 
+        <record id="view_crossovered_budget_search" model="ir.ui.view">
+           <field name="name">crossovered.budget.search</field>
+           <field name="model">crossovered.budget</field>
+           <field name="type">search</field>
+           <field name="arch" type="xml">
+               <search string="Budget">
+                   <group col="20" colspan="4">
+                       <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"  default="1"/>
+                       <filter string="To Validate" icon="terp-gtk-go-back-rtl" domain="[('state','=','validate')]" help="To Validate Budgets" />
+                       <separator orientation="vertical"/>
+                       <field name="name" select="1"/>
+                       <field name="code" select="1" />
+                       <field name="state"/>
+                       <field name="date_from"/>
+                       <field name="date_to"/>
+                   </group>
+               </search>
+           </field>
+        </record>
+
         <record model="ir.actions.act_window" id="act_crossovered_budget_view">
             <field name="name">Budget</field>
             <field name="res_model">crossovered.budget</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="crossovered_budget_view_tree"/>
+            <field name="search_view_id" ref="view_crossovered_budget_search"/>
         </record>
         <menuitem parent="next_id_31"
             id="menu_act_crossovered_budget_view"
diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po
index 2c3e8b90cca..bbc7bebe665 100644
--- a/addons/account_budget/i18n/id.po
+++ b/addons/account_budget/i18n/id.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-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_chart/i18n/id.po b/addons/account_chart/i18n/id.po
index 058e3f8f5a2..0d9737bac30 100644
--- a/addons/account_chart/i18n/id.po
+++ b/addons/account_chart/i18n/id.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-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_date_check/i18n/id.po b/addons/account_date_check/i18n/id.po
index 79a166f2119..b0641600ce9 100644
--- a/addons/account_date_check/i18n/id.po
+++ b/addons/account_date_check/i18n/id.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-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po
index 19087830a14..68e3e3be2df 100644
--- a/addons/account_followup/i18n/es.po
+++ b/addons/account_followup/i18n/es.po
@@ -7,13 +7,14 @@ 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-11-30 18:05+0000\n"
-"Last-Translator: Hesed Franquet <Unknown>\n"
+"PO-Revision-Date: 2010-05-28 19:11+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -255,7 +256,7 @@ msgstr ""
 #. module: account_followup
 #: wizard_button:account_followup.followup.print.all,summary,end:0
 msgid "Ok"
-msgstr "Ok"
+msgstr "Aceptar"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po
index 45fce2cbd2b..e647ce85b34 100644
--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/i18n/hr.po
@@ -7,24 +7,24 @@ 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 12:18+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
+"PO-Revision-Date: 2010-06-07 04:28+0000\n"
+"Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Date :"
-msgstr ""
+msgstr "Datum :"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,next,partner_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "Partneri"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -35,17 +35,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 #: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
 msgid "All payable entries"
-msgstr ""
+msgstr "Sve stavke potraživanja"
 
 #. module: account_followup
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
-msgstr ""
+msgstr "Ispisana Poruka"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -60,18 +60,18 @@ msgstr ""
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "Ukupni dug"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(user_signature)s: User name"
-msgstr ""
+msgstr "%(user_signature)s: Korisničko ime"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Select partners"
-msgstr ""
+msgstr "Odaberi partnere"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -82,17 +82,17 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "Dug"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Email Settings"
-msgstr ""
+msgstr "Email Postavke"
 
 #. module: account_followup
 #: field:account_followup.stat,account_type:0
 msgid "Account Type"
-msgstr ""
+msgstr "Tip Računa"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -108,7 +108,7 @@ msgstr ""
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(date)s: Current Date"
-msgstr ""
+msgstr "%(date)s: Trenutni Datum"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -131,7 +131,7 @@ msgstr ""
 #: field:account_followup.followup,description:0
 #: rml:account_followup.followup.print:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -141,27 +141,27 @@ msgstr ""
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "VAT:"
-msgstr ""
+msgstr "VAT:"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Tvrtka"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Datum Računa"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,next,email_subject:0
 msgid "Email Subject"
-msgstr ""
+msgstr "Predmet email-a"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Paid"
-msgstr ""
+msgstr "Plaćeno"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
@@ -186,17 +186,17 @@ msgstr ""
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Partner Selection"
-msgstr ""
+msgstr "Odabir Partnera"
 
 #. module: account_followup
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za Arhitekturu Prikaza!"
 
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
 msgid "Type of Term"
-msgstr ""
+msgstr "Tip Uvjeta"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,init:0
@@ -206,12 +206,12 @@ msgstr ""
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Select partners to remind"
-msgstr ""
+msgstr "Odaberite partnere za opomenu"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Li."
-msgstr ""
+msgstr "Li."
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -240,23 +240,23 @@ msgstr ""
 #. module: account_followup
 #: wizard_button:account_followup.followup.print.all,summary,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
 #: field:account_followup.followup.line,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
 msgid "First move"
-msgstr ""
+msgstr "Prvi potez"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "End of Month"
-msgstr ""
+msgstr "Kraj Mjeseca"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -273,7 +273,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Lines"
-msgstr ""
+msgstr "Linije"
 
 #. module: account_followup
 #: model:ir.actions.wizard,name:account_followup.action_account_followup_all_wizard
diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po
index 11aa146ef83..d7f2d146fcd 100644
--- a/addons/account_followup/i18n/pt.po
+++ b/addons/account_followup/i18n/pt.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-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
index 2317e0c65a9..fda547f3c68 100644
--- a/addons/account_invoice_layout/account_invoice_layout.py
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -170,6 +170,7 @@ class account_invoice_line(osv.osv):
 
     _defaults = {
         'state': lambda *a: 'article',
+        'sequence': lambda *a : 0,
 #       'account_id': _default_account
     }
 account_invoice_line()
diff --git a/addons/account_invoice_layout/i18n/pt.po b/addons/account_invoice_layout/i18n/pt.po
index cbfbfc454a2..e61eb9a0564 100644
--- a/addons/account_invoice_layout/i18n/pt.po
+++ b/addons/account_invoice_layout/i18n/pt.po
@@ -7,19 +7,19 @@ 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-11-28 23:25+0000\n"
-"Last-Translator: Paulino <Unknown>\n"
+"PO-Revision-Date: 2010-06-01 09:55+0000\n"
+"Last-Translator: cmsa <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-04-17 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Sub Total"
-msgstr "Sub Total"
+msgstr "Sub-total"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -48,7 +48,7 @@ msgstr "Título"
 #. module: account_invoice_layout
 #: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message
 msgid "Invoices with Layout and Message"
-msgstr "Facturas com layout e mensagem"
+msgstr "Facturas com Layout e Mensagem"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -84,7 +84,7 @@ msgstr "Preço Unitário"
 #. module: account_invoice_layout
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome do modelo inválido na definição da acção."
 
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_notify_message
@@ -119,7 +119,7 @@ msgstr "Referençia do cliente:"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,state:0
@@ -134,7 +134,7 @@ msgstr "Preço"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "/ ("
-msgstr ""
+msgstr "/("
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -149,7 +149,7 @@ msgstr "Conta de Origem"
 #. module: account_invoice_layout
 #: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
 msgid "Write Messages"
-msgstr ""
+msgstr "Escrever mensagens"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -189,7 +189,7 @@ msgstr "Quebra de Página"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Document:"
-msgstr ""
+msgstr "Documento:"
 
 #. module: account_invoice_layout
 #: wizard_view:wizard.notify_message,init:0
@@ -214,7 +214,7 @@ msgstr "Facturas com disposição"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Description / Taxes"
-msgstr ""
+msgstr "Descrição / Impostos"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -224,7 +224,7 @@ msgstr "Montante"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Description/Taxes"
-msgstr ""
+msgstr "Descrição/Impostos"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -264,7 +264,7 @@ msgstr "Factura do fornecedor"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Note :"
-msgstr ""
+msgstr "Nota:"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -274,12 +274,12 @@ msgstr "Taxa"
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
 msgid "account_invoice_layout"
-msgstr ""
+msgstr "account_invoice_layout"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Total (Excl. taxes):"
-msgstr ""
+msgstr "Total (Antes de Impostos):"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index 2dbc570776c..519155a16d0 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/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-03-20 07:13+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-06-04 13:32+0000\n"
+"Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -251,12 +251,12 @@ msgstr "无效XML视图结构!"
 #: wizard_button:populate_payment,search,end:0
 #: wizard_button:populate_statement,init,end:0
 msgid "_Cancel"
-msgstr "取消"
+msgstr "取消(_C)"
 
 #. module: account_payment
 #: field:payment.line,create_date:0
 msgid "Created"
-msgstr "创建"
+msgstr "已创建"
 
 #. module: account_payment
 #: view:payment.line:0
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index 266dcb535d8..5e37bd79488 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -58,16 +58,16 @@ class payment_order_create(osv.osv_memory):
     def create_payment(self, cr, uid, ids, context=None):
         order_obj = self.pool.get('payment.order')
         line_obj = self.pool.get('account.move.line')
-
-        data = self.read(cr, uid, ids, [], context)[0]
-        line_ids= data['entries']
+        payment_obj = self.pool.get('payment.line')
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, [])[0]
+        line_ids = data['entries']
         if not line_ids: return {}
 
-        payment = order_obj.browse(cr, uid, data['active_id'],
-                context=context)
+        payment = order_obj.browse(cr, uid, context['active_id'], context=context)
         t = payment.mode and payment.mode.type.id or None
-        line2bank = pool.get('account.move.line').line2bank(cr, uid,
-                line_ids, t, context)
+        line2bank = line_obj.line2bank(cr, uid, line_ids, t, context)
 
         ## Finally populate the current payment with new lines:
         for line in line_obj.browse(cr, uid, line_ids, context=context):
@@ -78,7 +78,7 @@ class payment_order_create(osv.osv_memory):
                 date_to_pay = line.date_maturity
             elif payment.date_prefered == 'fixed':
                 date_to_pay = payment.date_planned
-            pool.get('payment.line').create(cr, uid,{
+            payment_obj.create(cr, uid,{
                 'move_line_id': line.id,
                 'amount_currency': line.amount_to_pay,
                 'bank_id': line2bank.get(line.id),
@@ -88,13 +88,14 @@ class payment_order_create(osv.osv_memory):
                 'date': date_to_pay,
                 'currency': line.invoice and line.invoice.currency_id.id or False,
                 }, context=context)
-        return {}
+        return {'nodestroy':True,}
 
     def search_entries(self, cr, uid, ids, context=None):
         order_obj = self.pool.get('payment.order')
         line_obj = self.pool.get('account.move.line')
         mod_obj = self.pool.get('ir.model.data')
-
+        if context is None:
+            context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
         search_due_date = data['duedate']
         payment = order_obj.browse(cr, uid, context['active_id'], context=context)
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index 061c152361c..322c0a72e48 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -7,12 +7,14 @@
              <field name="model">account.payment.make.payment</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-	             <form string="Make Payment">
-                 	<label string ="Are you sure you want to make payment?" />
-				    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="launch_wizard" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+				<form string="Make Payment">
+					<group height="80" width="320">
+						<separator string="Are you sure you want to make payment?"/>
+						<newline/>
+						<group  colspan="2" col="4">
+							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+							<button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1"/>
+		 				</group>
  					</group>
 				</form>
 			</field>
diff --git a/addons/account_report/account_report.xml b/addons/account_report/account_report.xml
index 4576e421c2e..48273cdd3b3 100644
--- a/addons/account_report/account_report.xml
+++ b/addons/account_report/account_report.xml
@@ -11,6 +11,6 @@
             menu="False"
             model="account.report.report"
             name="print.indicator.pdf"
-            string="Print Indicators in PDF"/>
+            string="Indicators in PDF"/>
     </data>
 </openerp>
diff --git a/addons/account_report_india/report/report_balance_sheet.rml b/addons/account_report_india/report/report_balance_sheet.rml
index 95a34c2f063..c540e16f58e 100644
--- a/addons/account_report_india/report/report_balance_sheet.rml
+++ b/addons/account_report_india/report/report_balance_sheet.rml
@@ -186,7 +186,7 @@
           <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance'])) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -196,7 +196,7 @@
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(sum_dr()) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -224,7 +224,7 @@
           <para style="terp_default_9">[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance'])) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -234,7 +234,7 @@
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(sum_cr()) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account_report_india/report/report_balance_sheet_horizontal.rml b/addons/account_report_india/report/report_balance_sheet_horizontal.rml
index 09a2f252f80..d9b92da3856 100644
--- a/addons/account_report_india/report/report_balance_sheet_horizontal.rml
+++ b/addons/account_report_india/report/report_balance_sheet_horizontal.rml
@@ -197,7 +197,7 @@
 	        <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
 	      </td>
 	      <td>
-	        <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance'])) ]]</para>
+	        <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
 	      </td>
 	      <td>
 	        <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font><font>[[ a['code1'] ]]</font></para>
@@ -206,7 +206,7 @@
 	        <para style="terp_default_9"><font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name1'] ]]</font></para>
 	      </td>
 	      <td>
-	        <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance1'])) ]]</para>
+	        <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]]</para>
 	      </td>
 	   </tr>
       </blockTable>
@@ -216,13 +216,13 @@
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account_report_india/report/report_pl_account.rml b/addons/account_report_india/report/report_pl_account.rml
index 77f3fa50ad8..6e72a198115 100644
--- a/addons/account_report_india/report/report_pl_account.rml
+++ b/addons/account_report_india/report/report_pl_account.rml
@@ -201,7 +201,7 @@
           </para>
         </td>
          <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a.balance)) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -214,7 +214,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or '' ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -224,7 +224,7 @@
           <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -256,7 +256,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a.balance)) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -269,7 +269,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or '' ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -279,7 +279,7 @@
           <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account_report_india/report/report_pl_account_horizontal.rml b/addons/account_report_india/report/report_pl_account_horizontal.rml
index 0c2be18da0b..b68d375d3be 100644
--- a/addons/account_report_india/report/report_pl_account_horizontal.rml
+++ b/addons/account_report_india/report/report_pl_account_horizontal.rml
@@ -214,7 +214,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance'])) ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
           </td>
           <td>
             <para style="terp_default_9">
@@ -227,7 +227,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance1'])) ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -240,7 +240,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or '' ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9"></para>
@@ -249,7 +249,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or '' ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -260,13 +260,13 @@
           <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account_reporting/i18n/pt.po b/addons/account_reporting/i18n/pt.po
index 03f50826416..9d810d497ad 100644
--- a/addons/account_reporting/i18n/pt.po
+++ b/addons/account_reporting/i18n/pt.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-11-28 23:58+0000\n"
-"Last-Translator: Paulino <Unknown>\n"
+"PO-Revision-Date: 2010-06-01 09:52+0000\n"
+"Last-Translator: cmsa <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-04-17 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
@@ -46,13 +46,13 @@ msgstr "Nota"
 #. module: account_reporting
 #: field:account.report.bs,report_type:0
 msgid "Report Type"
-msgstr "Tipo de relatório"
+msgstr "Tipo de Relatório"
 
 #. module: account_reporting
 #: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form
 #: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet
 msgid "Balance Sheet Report"
-msgstr "Relatório do balancete"
+msgstr "Relatório Balancete"
 
 #. module: account_reporting
 #: constraint:ir.actions.act_window:0
@@ -62,7 +62,7 @@ msgstr "Nome de modelo inválido na definição da acção"
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier"
-msgstr "Correio"
+msgstr "Courier"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -167,7 +167,7 @@ msgstr "Cores rml"
 #. module: account_reporting
 #: model:ir.module.module,shortdesc:account_reporting.module_meta_information
 msgid "Reporting of Balancesheet for accounting"
-msgstr ""
+msgstr "Relatório do balancete para a contabilidade."
 
 #. module: account_reporting
 #: field:account.report.bs,code:0
diff --git a/addons/account_tax_include/account_tax_include.py b/addons/account_tax_include/account_tax_include.py
index 6e0c9552694..d84a21afff7 100644
--- a/addons/account_tax_include/account_tax_include.py
+++ b/addons/account_tax_include/account_tax_include.py
@@ -23,18 +23,6 @@ import time
 from osv import fields, osv
 import decimal_precision as dp
 
-class account_tax(osv.osv):
-    _inherit = 'account.tax'
-    _description = 'Account Tax'
-    _columns = {
-        'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
-                }
-
-    _defaults = {
-        'price_include': 0,
-                }
-account_tax()
-
 class account_invoice(osv.osv):
     _inherit = "account.invoice"
     _columns = {
diff --git a/addons/account_tax_include/account_tax_include_view.xml b/addons/account_tax_include/account_tax_include_view.xml
index 98440d0a000..32aea6802d1 100644
--- a/addons/account_tax_include/account_tax_include_view.xml
+++ b/addons/account_tax_include/account_tax_include_view.xml
@@ -2,32 +2,6 @@
 <openerp>
     <data>
 
-	   <!-- Add price include (boolean) on tax form/tree view -->
-       <record id="view_tax_tree_inherit" model="ir.ui.view">
-            <field name="name">account.tax.tree.inherit.tree</field>
-            <field name="type">tree</field>
-            <field name="model">account.tax</field>
-            <field name="inherit_id" ref="account.view_tax_tree"/>
-            <field name="arch" type="xml">
-                <field name="name" position="after">
-                    <field name="price_include"/>
-                </field>
-            </field>
-        </record>
-
-        <record id="view_tax_form_inherit" model="ir.ui.view">
-            <field name="name">account.tax.tree.inherit.form</field>
-            <field name="type">form</field>
-            <field name="model">account.tax</field>
-            <field name="inherit_id" ref="account.view_tax_form"/>
-            <field name="arch" type="xml">
-                <field name="sequence" position="after">
-                    <field groups="base.group_extended" name="price_include"/>
-                </field>
-            </field>
-        </record>
-        <!-- End -->
-
         <record id="account_tax_view_price" model="ir.ui.view">
             <field name="name">account.tax.exlcuded.view.form</field>
             <field name="type">form</field>
diff --git a/addons/account_tax_include/i18n/ru.po b/addons/account_tax_include/i18n/ru.po
index e61c38be4a1..de13c665c78 100644
--- a/addons/account_tax_include/i18n/ru.po
+++ b/addons/account_tax_include/i18n/ru.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-09-08 13:39+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
+"PO-Revision-Date: 2010-06-06 06:51+0000\n"
+"Last-Translator: mr.The <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-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
@@ -44,7 +44,7 @@ msgstr "До налогов"
 #. module: account_tax_include
 #: view:account.tax:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Выполнить код для цен с налогами"
 
 #. module: account_tax_include
 #: field:account.invoice.line,price_subtotal_incl:0
diff --git a/addons/account_voucher/voucher_report.xml b/addons/account_voucher/voucher_report.xml
index 56353628bd1..c0dfed1c683 100644
--- a/addons/account_voucher/voucher_report.xml
+++ b/addons/account_voucher/voucher_report.xml
@@ -2,16 +2,16 @@
 <openerp>
     <data>
         <report id="report_account_voucher"
-            string="Print Voucher"
+            string="Vouchers"
             model="account.voucher"
             name="voucher.cash_receipt.drcr"
             rml="account_voucher/report/report_voucher.rml"
             auto="False"
             header = "False"
             menu="True"/>
-            
+
         <report id="report_account_voucher_amt"
-            string="Print Receipt"
+            string="Receipts"
             model="account.voucher"
             name="voucher.cash_amount"
             rml="account_voucher/report/report_voucher_amount.rml"
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 6eb6988480d..aed57a283aa 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -71,7 +71,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_account_move_filter" model="ir.ui.view">
             <field name="name">account.voucher.select</field>
             <field name="model">account.voucher</field>
@@ -79,10 +79,10 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group col='8' colspan='4'>
-                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
-                        <filter icon="terp-account" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
-                        <filter icon="terp-account" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                        <filter icon="terp-account" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers"/>
+                        <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'/>
@@ -92,14 +92,14 @@
                         <field name="period_id" select='1'/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="12" col="10">
-                        <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
-                        <filter string="Type" icon="terp-account" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
-                        <filter string="States" icon="terp-account" domain="[]" context="{'group_by':'state'}"/>
+                    <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>
                     <newline/>
-                    <group expand="1" string="Extended options...">
+                    <group expand="0" string="Extended options...">
                        <field name="journal_id" widget="selection" context="{'journal_id': self}" />
                        <field name="period_id" widget="selection" context="{'period_id': self}" groups="base.group_extended"/>
                        <field name="type" context="{'type': self}" />
@@ -107,19 +107,30 @@
                 </search>
             </field>
         </record>
-        
-        <!--  Receipt Vouchers -->
+
+         <!--  Receipt Vouchers -->
         <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
-            <field name="name">Voucher Entries</field>
+            <field name="name">Customer Vouchers</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','rec_voucher')]</field>-->
-<!--            <field name="context">{'type':'rec_voucher'}</field>-->
+            <field name="domain">[('journal_id.type','=','sale')]</field>
         </record>
         <menuitem id="menu_action_receipt_vou_voucher_list"
-        action="action_receipt_vou_voucher_list" parent="account.menu_finance_entries" sequence="8"/>
+        action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="8"/>
+
+        <!--  Purchase Vouchers -->
+        <record model="ir.actions.act_window" id="action_pay_vou_voucher_list">
+            <field name="name">Vendor Vouchers</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">[('journal_id.type','=','purchase')]</field>
+        </record>
+        <menuitem id="menu_action_pay_vou_voucher_list"
+        action="action_pay_vou_voucher_list" parent="account.menu_finance_payables" sequence="8"/>
 
 <!--        <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">-->
 <!--            <field name="name">Cash Receipt</field>-->
@@ -245,7 +256,7 @@
 <!--        </record>-->
 <!--        <menuitem id="menu_action_view_jour_voucher_form"-->
 <!--            action="action_view_jour_voucher_form" parent="menu_action_other_voucher_list"/>-->
-        
+
         <record model="ir.ui.view" id="view_account_journal_form_inherit">
             <field name="name">account.journal.form.inherit</field>
             <field name="model">account.journal</field>
@@ -257,7 +268,7 @@
                 </field>
             </field>
         </record>
-        
+
         <act_window
             domain="[('journal_id', '=', active_id)]"
             id="act_journal_voucher_open"
@@ -265,6 +276,6 @@
             context="{'journal_id': active_id, 'type':type}"
             res_model="account.voucher"
             src_model="account.journal"/>
-        
+
         </data>
 </openerp>
diff --git a/addons/account_voucher_payment/i18n/ca.po b/addons/account_voucher_payment/i18n/ca.po
index daf15f0ea67..6a76e867e21 100644
--- a/addons/account_voucher_payment/i18n/ca.po
+++ b/addons/account_voucher_payment/i18n/ca.po
@@ -1,20 +1,20 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_voucher_payment
+# Catalan 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: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-01-26 11:00+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-06-04 09:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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-05-21 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher_payment
diff --git a/addons/account_voucher_payment/i18n/es.po b/addons/account_voucher_payment/i18n/es.po
index a3df62eaec2..600b962c9d6 100644
--- a/addons/account_voucher_payment/i18n/es.po
+++ b/addons/account_voucher_payment/i18n/es.po
@@ -1,19 +1,20 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_voucher_payment
+# 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: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-02-19 05:54+0000\n"
-"Last-Translator: Luis Alejandro Rangel Sánchez <xlarsx@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-06-04 09:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-05-21 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher_payment
diff --git a/addons/analytic_journal_billing_rate/i18n/id.po b/addons/analytic_journal_billing_rate/i18n/id.po
index d8e269a7cb4..532b0ebee6d 100644
--- a/addons/analytic_journal_billing_rate/i18n/id.po
+++ b/addons/analytic_journal_billing_rate/i18n/id.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-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/auction/i18n/pl.po b/addons/auction/i18n/pl.po
index c5219bd77b3..aab4490920c 100644
--- a/addons/auction/i18n/pl.po
+++ b/addons/auction/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 11:09+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-04 21:56+0000\n"
+"Last-Translator: ErnestŻyciński <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-04-17 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -39,12 +39,12 @@ msgstr ""
 #: field:report.seller.auction,seller:0
 #: field:report.seller.auction2,seller:0
 msgid "Seller"
-msgstr ""
+msgstr "Sprzedawca"
 
 #. module: auction
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
@@ -102,7 +102,7 @@ msgstr ""
 #: field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
-msgstr ""
+msgstr "Kupujący"
 
 #. module: auction
 #: field:report.auction.view,nobjects:0
@@ -140,7 +140,7 @@ 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 "Kwota zafakturowana"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -165,7 +165,7 @@ msgstr ""
 #. module: auction
 #: field:auction.deposit.cost,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Kwota"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_deposit_border
@@ -191,12 +191,12 @@ msgstr ""
 #. module: auction
 #: field:auction.dates,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Konto analityczne"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Unclassifieds"
-msgstr ""
+msgstr "Niesklasyfikowane"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_dates_next_by_auction
@@ -232,7 +232,7 @@ msgstr "Rodzaj obiektu"
 #. module: auction
 #: wizard_field:auction.lots.sms_send,init,text:0
 msgid "SMS Message"
-msgstr ""
+msgstr "Wiadomość SMS"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -243,7 +243,7 @@ msgstr "Sztuka nowoczesna"
 #: view:auction.lots:0
 #: view:report.unclassified.objects:0
 msgid "Ref"
-msgstr ""
+msgstr "Odnośnik"
 
 #. module: auction
 #: field:report.auction.view,nseller:0
diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index 58ebcb44914..bde1b397caa 100644
--- a/addons/auction/i18n/zh_CN.po
+++ b/addons/auction/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:33+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-06-04 12:37+0000\n"
+"Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -415,7 +415,7 @@ msgstr "库存数量"
 #: wizard_button:auction.lots.numerotate,search,end:0
 #: wizard_button:auction.lots.numerotate_cont,init,end:0
 msgid "Exit"
-msgstr "出口"
+msgstr "退出"
 
 #. module: auction
 #: field:report.buyer.auction2,net_revenue:0
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index ce07647dc92..0882b6f0e1b 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -46,7 +46,7 @@
                             </group>
                             <separator colspan="4" string="Note"/>
                             <label align="0.0" colspan="4" width="900"
-                            	string="The rule use a AND operator. The model must match all non empty fields so that the rule execute the action described in the 'Actions' tab." />
+                            	string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
                         </page>
                         <page string="Actions">
                             <separator colspan="4" string="Fields to Change"/>
@@ -56,15 +56,15 @@
                             <field name="server_action_id"/>
                             <field name="filter_id"/>
                         </page>
-                        <page string="E-Mail Actions">
+                        <page string="Email Actions">
 <!--                        	<group col="4" colspan="2">-->
-	                            <separator colspan="4" string="Template of Email to Send"/>
+	                            <separator colspan="4" string="Email Information"/>
 	                            <field name="act_mail_to_watchers"/>
 	                            <field name="act_mail_to_user"/>
 	                            <field colspan="4" name="act_mail_to_email"/>
 <!--	                        </group>-->
 <!--	                        <group col="4" colspan="2">-->
-	                            <separator colspan="4" string="E-Mail Reminders (includes the content of the object)"/>
+	                            <separator colspan="4" string="Email Reminders"/>
 	                            <field name="act_remind_partner"/>
 	                            <field name="act_remind_attach"/>
 	                            <field name="act_remind_user"/>
@@ -73,7 +73,7 @@
 	                            </group>
 	                            <field colspan="4" name="act_email_cc"/>
 <!--	                        </group>-->
-                            <separator colspan="4" string="Mail Body"/>
+                            <separator colspan="4" string="Email Body"/>
                             <field colspan="4" name="act_mail_body" height="250"
                             	nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
                             <separator colspan="4" string="Special Keywords to Be Used in The Body"/>
@@ -82,9 +82,9 @@
                             <label align="0.0" string="%%(object_description)s = Object description" colspan="2"/>
                             <label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/>
                             <label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
-                            <label align="0.0" string="%%(partner_email)s = Partner email" colspan="2"/>
+                            <label align="0.0" string="%%(partner_email)s = Partner Email" colspan="2"/>
                             <label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/>
-                            <label align="0.0" string="%%(object_user_email)s = Responsible email" colspan="2"/>
+                            <label align="0.0" string="%%(object_user_email)s = Responsible Email" colspan="2"/>
                             <label align="0.0" string="%%(object_user_phone)s = Responsible phone" colspan="2"/>
                         </page>
                     </notebook>
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index bf93c9c775d..8a9764bff63 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -410,7 +410,10 @@ property or property parameter."),
             event.add('location').value = event_obj.location
         if event_obj.rrule:
             event.add('rrule').value = event_obj.rrule
-
+        if event_obj.user_id:
+            event_org = event.add('organizer')
+            event_org.params['CN'] = [event_obj.user_id.name]
+            event_org.value = 'MAILTO:' + (event_obj.user_id.user_email or event_obj.user_id.name)
         if event_obj.alarm_id:
             # computes alarm data
             valarm = event.add('valarm')
@@ -440,7 +443,7 @@ property or property parameter."),
             attendee_add.params['CUTYPE'] = [str(attendee.cutype)]
             attendee_add.params['ROLE'] = [str(attendee.role)]
             attendee_add.params['RSVP'] = [str(attendee.rsvp)]
-            attendee_add.value = 'MAILTO:' + attendee.email
+            attendee_add.value = 'MAILTO:' + (attendee.email or '')
         res = cal.serialize()
         return res
     
@@ -480,8 +483,8 @@ property or property parameter."),
                         'company': company
             }
             body = html_invitation % body_vals
-            attach = self.get_ics_file(cr, uid, res_obj, context=context)
             if mail_to and email_from:
+                attach = self.get_ics_file(cr, uid, res_obj, context=context)
                 tools.email_send(
                     email_from, 
                     mail_to, 
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index a5afddc9823..d0c1a57ba84 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -95,10 +95,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
-                   <filter icon="gtk-apply" string="Accepted"
+                   <filter icon="terp-check" string="Accepted"
                        domain="[('state','=', 'accepted')]"
                        separator="1" help="Accepted Invitations" />
-                   <filter icon="gtk-close" string="Declined"
+                   <filter icon="terp-dialog-close" string="Declined"
                        domain="[('state','=', 'declined')]"
                        separator="1" help="Declined Invitations" />
                    <separator orientation="vertical"/>
@@ -108,19 +108,19 @@
                    <field name="cutype" string="Invitation type" select="1"/>
                    <field name="event_date" select="1"/>
                    <newline/>
-				    <group expand="1" string="Group By...">
-						<filter string="Type" icon="terp-project" help="Invitation Type"
+				    <group expand="0" string="Group By...">
+						<filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
 					        domain="[]" context="{'group_by':'cutype'}" />
-					    <filter string="Role" icon="terp-project"
+					    <filter string="Role" icon="terp-gtk-select-all"
 					        domain="[]" context="{'group_by':'role'}" />
-					    <filter string="Required Reply" icon="terp-crm"
+					    <filter string="Required Reply" icon="terp-mail-replied"
 					        domain="[]" context="{'group_by':'rsvp'}" />
 					    <separator orientation="vertical" />
-					    <filter string="User" icon="terp-partner" domain="[]"
+					    <filter string="User" icon="terp-personal" domain="[]"
 					        context="{'group_by':'user_id'}" />
-					    <filter string="Contact" icon="terp-partner" domain="[]"
-					        context="{'group_by':'partner_address_id'}" />						
-					    <filter string="State" icon="terp-project" help="Invitation Type"
+					    <filter string="Contact" icon="terp-gtk-jump-to-ltr" domain="[]"
+					        context="{'group_by':'partner_address_id'}" />
+					    <filter string="State" icon="terp-stock_effects-object-colorize" help="Invitation Type"
                             domain="[]" context="{'group_by':' state'}" />
 					</group>
                </search>
@@ -137,15 +137,14 @@
 	     </record>
 
 		<!-- Calenadar's menu -->
-
-        <menuitem id="base.menu_calendar_configuration" name="Calendar"
-            parent="base.menu_base_config" sequence="10" />
+          <menuitem id="base.menu_calendar_configuration" name="Calendar"
+            parent="base.menu_config_address_book" sequence="15" />
 
 		<!-- Invitation menu -->
 
-		<menuitem id="menu_attendee_invitations"
-			name="Event Invitations" parent="base.menu_calendar_configuration"
-			sequence="10" action="action_view_attendee_form" />
+	       <menuitem id="menu_attendee_invitations"
+            name="Event Invitations" parent="base.menu_calendar_configuration"
+            sequence="10" action="action_view_attendee_form" />
 
 		<!--		ALARM FORM VIEW-->
 
@@ -192,11 +191,10 @@
 
 		<!--		Menu for Alarms-->
 
-        <menuitem id="menu_crm_meeting_avail_alarm"
+         <menuitem id="menu_crm_meeting_avail_alarm"
             groups="base.group_extended"
             action="base_calendar.action_res_alarm_view"
             parent="base.menu_calendar_configuration" />
-
         <!-- Event Form View-->
 
 		<record model="ir.ui.view" id="event_form_view">
@@ -385,7 +383,7 @@
 	        <field name="arch" type="xml">
                 <search string="Search Events">
                        <group col="12" colspan="4">
-                           <filter icon="terp-partner" string="My Events"
+                           <filter icon="terp-go-today" string="My Events"
                                domain="[('user_id','=',uid)]"
                                help="My Events" />
                            <separator orientation="vertical"/>
@@ -398,15 +396,15 @@
                            <field name="class" select="1"/>
                        </group>
                        <newline/>
-						<group expand="1" string="Group By...">
-							<filter string="Date" icon="terp-project"
+						<group expand="0" string="Group By...">
+							<filter string="Date" icon="terp-go-month"
 						        domain="[]" context="{'group_by':'date'}" />
-						    <filter string="Availability" icon="terp-project"
+						    <filter string="Availability" icon="terp-camera_test"
 						        domain="[]" context="{'group_by':'show_as'}" />
-						    <filter string="Privacy" icon="terp-crm"
+						    <filter string="Privacy" icon="terp-locked"
 						        domain="[]" context="{'group_by':'class'}" />
 						    <separator orientation="vertical" />
-						    <filter string="Responsible" icon="terp-crm" domain="[]"
+						    <filter string="Responsible" icon="terp-personal" domain="[]"
 						        context="{'group_by':'user_id'}" />
 						</group>
                 </search>
@@ -427,9 +425,9 @@
 
 		<!-- Event menu  -->
 
-		<menuitem id="menu_events"
-				name="Events" parent="base.menu_calendar_configuration"
-				sequence="5" action="action_view_event" />
+		  <menuitem id="menu_events"
+                name="Events" parent="base.menu_calendar_configuration"
+                sequence="5" action="action_view_event" />
 
      </data>
  </openerp>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 8852ea19980..b4e7fa3e2ed 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -134,7 +134,8 @@
             <field name="address" mode="form,tree" colspan="4" nolabel="1" select="1" position="replace">
                 <field name="address" mode="form,tree" colspan="4" nolabel="1" select="1">
                     <form string="Address">
-                       <group string="Postal Address" colspan="2" col="2">
+                       <group  colspan="2" col="2">
+                           <separator string="Postal Address" colspan="2" col="2"/>
                            <field name="type" />
                            <field name="street"/>
                            <field name="street2"/>
@@ -143,7 +144,8 @@
                            <field name="country_id" completion="1"/>
                            <field name="state_id"/>
                         </group>
-                        <group string="Communication" colspan="2" col="2">
+                        <group colspan="2" col="2">
+                           <separator string="Communication" colspan="2" col="2"/>
                            <field name="phone"/>
                            <field name="fax"/>
                            <field name="email" widget="email"/>
diff --git a/addons/base_report_designer/i18n/hr.po b/addons/base_report_designer/i18n/hr.po
index f63fe3a567e..e9ea4ca9884 100644
--- a/addons/base_report_designer/i18n/hr.po
+++ b/addons/base_report_designer/i18n/hr.po
@@ -7,25 +7,25 @@ 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-03-24 09:27+0000\n"
+"PO-Revision-Date: 2010-06-06 23:30+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,text:0
 msgid "Introduction"
-msgstr ""
+msgstr "Uvod"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form:0
 msgid "Upload your modified report"
-msgstr ""
+msgstr "Pošalji promijenjen izvještaj na Server"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form_result,send_form:0
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 97c9ea0d301..2d6b400d2c5 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -28,9 +28,9 @@
 		            <field name="currency" widget="selection"/><field name="street"/>
 		            <field name="zip"/>
 		            <field name="street2"/>
-		            <field name="city"/>
 		            <field name="country_id"/>
 		            <field name="state_id"/>
+		            <field name="city"/>
 		            <field name="email"/>
 		            <field name="phone"/>
 		            <field name="website"/>
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index a9fde39ffde..c62951b13b7 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -71,7 +71,6 @@ class base_gtkcontactform(osv.osv_memory):
              'other':fields.boolean('Other'),
              'ebook':fields.boolean('ebook'),
              'updates':fields.boolean('Updates'),
-             'contact_me':fields.boolean('Contact Me'),
              }
     def execute(self, cr, uid, ids, context=None):
         if context is None:
@@ -81,10 +80,10 @@ class base_gtkcontactform(osv.osv_memory):
         company_data = self.pool.get('base.setup.company').read(cr, uid, company_id, context=context)
         company_data = company_data and company_data[0] or {}
         country = ''
-        
+
         if company_data.get('country_id', False):
             country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'], context=context)['name']
-        
+
         for res in self.read(cr, uid, ids, context=context):
             email = res.get('email','')
             result = "\ncompany: "+ tools.ustr(company_data.get('name',''))
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
index c5578f9bc9a..41711032bf0 100644
--- a/addons/base_setup/gtk_contact_form.xml
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -24,9 +24,7 @@
           <group string="res_config_contents" position="replace">
           	<group colspan="4" height="450" width="600">
           	 	<group colspan="4">
-          	 	 	<field name="contact_me" nolabel="1"/>
-		            <label align="0.0" string="I accept to be contacted by OpenERP." colspan="3"/>
-		            <field name="ebook" nolabel="1"/>
+ 		            <field name="ebook" nolabel="1"/>
 		            <label align="0.0" string="I want to receive the Open ERP ebook (PDF) by email." colspan="3"/>
 		            <field name="updates" nolabel="1"/>
 		            <label align="0.0" string="Yes, I would like to receive information updates from OpenERP." colspan="3"/>
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index 0774c70a0e7..3b01565a325 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.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-03-26 01:09+0000\n"
+"PO-Revision-Date: 2010-06-06 23:31+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -22,7 +22,7 @@ msgstr ""
 #: wizard_field:base_setup.base_setup,init,city:0
 #: wizard_field:base_setup.base_setup,update,city:0
 msgid "City"
-msgstr ""
+msgstr "Grad"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po
index 7c3ff6f08b5..92ab4f294b9 100644
--- a/addons/base_setup/i18n/id.po
+++ b/addons/base_setup/i18n/id.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-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_vat/i18n/id.po b/addons/base_vat/i18n/id.po
index 8881f0627cc..b6255217c5a 100644
--- a/addons/base_vat/i18n/id.po
+++ b/addons/base_vat/i18n/id.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-09 13:47+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-06-03 01:30+0000\n"
+"Last-Translator: Abdul Munif Hanafi <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-04-17 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-06-04 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
@@ -25,7 +25,7 @@ msgstr ""
 #. module: base_vat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
@@ -35,4 +35,4 @@ msgstr ""
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "VAT"
-msgstr ""
+msgstr "VAT"
diff --git a/addons/base_vat/i18n/pt.po b/addons/base_vat/i18n/pt.po
index 4fb9b3a9d59..d6c15aa6451 100644
--- a/addons/base_vat/i18n/pt.po
+++ b/addons/base_vat/i18n/pt.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-09-08 15:10+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
+"PO-Revision-Date: 2010-05-28 11:26+0000\n"
+"Last-Translator: cmsa <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-04-17 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
@@ -21,6 +21,8 @@ msgstr ""
 msgid ""
 "Enable the VAT Number for the partner. Check the validity of that VAT Number."
 msgstr ""
+"Active o NIF (Número de Identificação Fiscal) para o parceiro verificando a "
+"sua validade"
 
 #. module: base_vat
 #: constraint:ir.ui.view:0
@@ -30,9 +32,9 @@ msgstr "XML inválido para a arquitectura de vista"
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr ""
+msgstr "Declaração Legal do IVA"
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "VAT"
-msgstr ""
+msgstr "IVA"
diff --git a/addons/board/i18n/pt.po b/addons/board/i18n/pt.po
index d2766a3cc5c..6ceaf2a831a 100644
--- a/addons/board/i18n/pt.po
+++ b/addons/board/i18n/pt.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-09-08 13:29+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
+"PO-Revision-Date: 2010-06-01 10:02+0000\n"
+"Last-Translator: cmsa <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-04-17 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -26,7 +26,7 @@ msgstr ""
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "board.board"
-msgstr ""
+msgstr "board.board"
 
 #. module: board
 #: field:board.note,user_id:0
@@ -36,7 +36,7 @@ msgstr "Autor"
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
 msgid "Dashboard main module"
-msgstr ""
+msgstr "Módulo Principal do Painel"
 
 #. module: board
 #: view:board.note:0
@@ -52,7 +52,7 @@ msgstr "Largura"
 #. module: board
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da aclção."
 
 #. module: board
 #: field:board.board.line,name:0
@@ -84,7 +84,7 @@ msgstr "Vista de acções"
 #. module: board
 #: model:ir.model,name:board.model_board_note
 msgid "board.note"
-msgstr ""
+msgstr "board.note"
 
 #. module: board
 #: field:board.note,date:0
@@ -124,7 +124,7 @@ msgstr "Notas"
 #. module: board
 #: model:ir.model,name:board.model_board_note_type
 msgid "board.note.type"
-msgstr ""
+msgstr "board.note.type"
 
 #. module: board
 #: view:board.board:0
@@ -136,7 +136,7 @@ msgstr "Painel"
 #. module: board
 #: model:ir.module.module,description:board.module_meta_information
 msgid "Base module for all dashboards."
-msgstr ""
+msgstr "Módulo base para todos os painéis."
 
 #. module: board
 #: field:board.board.line,position:0
@@ -212,7 +212,7 @@ msgstr "Vista de painel"
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "board.board.line"
-msgstr ""
+msgstr "board.board.line"
 
 #. module: board
 #: field:board.note,name:0
diff --git a/addons/caldav/security/ir.model.access.csv b/addons/caldav/security/ir.model.access.csv
index 4dd04fa4c68..fa7b85a39f1 100644
--- a/addons/caldav/security/ir.model.access.csv
+++ b/addons/caldav/security/ir.model.access.csv
@@ -10,3 +10,4 @@
 "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 386387b1157..ea5cf3f6ef2 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -108,13 +108,13 @@ between mails and Open ERP.""",
         'crm_phonecall_demo.xml'
     ],
     'test': [
-#            'test/test_crm_lead.yml', 
-#            'test/test_crm_meeting.yml', 
-#            'test/test_crm_opportunity.yml', 
-#            'test/test_crm_phonecall.yml', 
-             ], 
-    'installable': True, 
-    'active': False, 
+            'test/test_crm_lead.yml',
+            'test/test_crm_meeting.yml',
+            'test/test_crm_opportunity.yml',
+            'test/test_crm_phonecall.yml',
+             ],
+    'installable': True,
+    'active': False,
     'certificate': '0079056041421',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index ba45efd4b3b..d3c640efca3 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -203,9 +203,13 @@ class crm_case(object):
         address = self.pool.get('res.partner.address').browse(cr, uid, add)
         return {'value': {'email_from': address.email}}
     
-    def _history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, message_id=False, context={}):
+    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, email=email, details=details, email_from=email_from, message_id=message_id, context=context)
+        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, \
+                                       context=context)
     
     def case_open(self, cr, uid, ids, *args):
         """Opens Case
@@ -438,6 +442,7 @@ class crm_case_section(osv.osv):
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
         'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
         'note': fields.text('Description'),
+        'working_hours': fields.float('Working Hours', digits=(16,2 )),
     }
 
     _defaults = {
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 3a14659672a..9092efef8e8 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -82,23 +82,9 @@ this if you want the rule to send an email to the partner."),
         if hasattr(obj, 'categ_id'):
             ok = ok and (not action.trg_categ_id or action.trg_categ_id.id==obj.categ_id.id)
 
-#    TODO: history_line is removed
-#        if hasattr(obj, 'history_line'):
-#            ok = ok and (not action.trg_max_history or action.trg_max_history<=(len(obj.history_line)+1))
-#            reg_history = action.regex_history
-#            result_history = True
-#            if reg_history:
-#                ptrn = re.compile(str(reg_history))
-#                if obj.history_line:
-#                    _result = ptrn.search(str(obj.history_line[0].description))
-#                    if not _result:
-#                        result_history = False
-            regex_h = not reg_history or result_history
-            ok = ok and regex_h
         return ok
 
     def do_action(self, cr, uid, action, model_obj, obj, 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,
@@ -118,7 +104,7 @@ this if you want the rule to send an email to the partner."),
                     write['email_cc'] = obj.email_cc+','+obj.act_email_cc
             else:
                 write['email_cc'] = obj.act_email_cc
-
+        
         model_obj.write(cr, uid, [obj.id], write, context)
         emails = []
 
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index cfff95888cc..1873f53f573 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -1,59 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        
-        <record id="event_type_case_create" model="res.partner.event.type">
-            <field name="name">CRM: Create Case</field>
-            <field name="key">crm_case_draft</field>
-        </record>
-        
-        <record id="event_type_case_open" model="res.partner.event.type">
-            <field name="name">CRM: Open Case</field>
-            <field name="key">crm_case_open</field>
-        </record>
-        
-        <record id="event_type_case_pending" model="res.partner.event.type">
-            <field name="name">CRM: Pending Case</field>
-            <field name="key">crm_case_pending</field>
-        </record>
-        
-        <record id="event_type_case_cancel" model="res.partner.event.type">
-            <field name="name">CRM: Cancel Case</field>
-            <field name="key">crm_case_cancel</field>
-        </record>
-        
-        <record id="event_type_case_close" model="res.partner.event.type">
-            <field name="name">CRM: Close Case</field>
-            <field name="key">crm_case_done</field>
-        </record>
-        
-    </data>
-    
     <data noupdate="1">
 		<record model="crm.case.section" id="section_sales_department">
 			<field name="name">Sales Department</field>
 			<field name="code">Sales</field>
 		</record>
         
-        <record id="event_type_case_create" model="res.partner.event.type">
-            <field eval="False" name="active"/>
-        </record>
-        
-        <record id="event_type_case_open" model="res.partner.event.type">
-            <field eval="True" name="active"/>
-        </record>
-        
-        <record id="event_type_case_pending" model="res.partner.event.type">
-            <field eval="False" name="active"/>
-        </record>
-        
-        <record id="event_type_case_close" model="res.partner.event.type">
-            <field eval="True" name="active"/>
-        </record>
-        
-        <record id="event_type_case_cancel" model="res.partner.event.type">
-            <field eval="False" name="active"/>
-        </record>
         
         <record id="ir_cron_crm_action" model="ir.cron">
             <field name="name">Check cases rules</field>
diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 1d9235feac6..8fb7c02ff85 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -39,7 +39,8 @@ class crm_installer(osv.osv_memory):
         'crm_caldav': fields.boolean('Calendar Synchronizing', help="Help you to synchronize the meetings with other calender clients(e.g.: Sunbird)."), 
         'sale_crm': fields.boolean('Create Quotation from Opportunity', help="This module relates sale to opportunity cases in the CRM."),
         'fetchmail': fields.boolean('Fetch Emails', help="Fetchmail Server."),
-        'thunderbird': fields.boolean('Thunderbird', help="Thunderbird Interface."),  
+        'thunderbird': fields.boolean('Thunderbird', help="Thunderbird Interface."), 
+        'wiki_sale_faq': fields.boolean('Sale FAQ', help="Sale FAQ."), 
     }
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 370285352d1..9d92f6f1b95 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -17,6 +17,13 @@
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string">You can enhance OpenERP's basic CRM support with a few additional OpenERP applications</attribute>
+          </xpath>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+              <attribute name='rowspan'>13</attribute>
+              <attribute name='string'></attribute>
+          </xpath>
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
+            <attribute name="string">Configure</attribute>
           </xpath>
 		  <group colspan="8">
 			<group colspan="2" col="2">
@@ -35,7 +42,8 @@
 	          	<field name="crm_claim" />
 	          	<field name="crm_helpdesk" />
 	          	<field name="crm_fundraising" />
-	          	<field name="sale_crm" invisible="1"/>
+                <field name="wiki_sale_faq"/>
+  	          	<field name="sale_crm" invisible="1"/>
           </group>
           </group>
         </data>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index a9e8d1c000f..c1060f3e658 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -108,8 +108,8 @@ class crm_lead(osv.osv, crm_case):
         '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"),
-        'description': fields.text('Description'),
-        'write_date': fields.datetime('Update Date' , readonly=True),
+        'description': fields.text('Notes'),
+        'write_date': fields.datetime('Update Date' , readonly=True), 
 
         # Lead fields
         'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
@@ -137,7 +137,6 @@ and users by email"),
                                 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),
-        'function_name': fields.char('Function', size=64),
         'state': fields.selection(crm.AVAILABLE_STATES, '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\'.\
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9c24e306154..465c63ae626 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -12,9 +12,11 @@
         <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
         <field name="context">{'object_id':'crm.lead'}</field>
     </record>
-    <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act"
-        groups="base.group_extended"
-        parent="crm.menu_crm_case_stage" />
+
+     <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages"
+        groups="base.group_extended" sequence="0"
+        parent="menu_crm_config_lead" />
+
 
     	<!--  Resource Type Form View -->
 
@@ -26,10 +28,11 @@
             <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
             <field name="context">{'object_id':'crm.lead'}</field>
         </record>
-        <menuitem action="crm_lead_resource_act"
-            id="menu_crm_lead_resource_act"
-            groups="base.group_extended"
-            parent="crm.menu_crm_case_resource_type" />
+
+      <menuitem action="crm_lead_resource_act"
+            id="menu_crm_lead_resource_act" name="Resource Type"
+            groups="base.group_extended" sequence="2"
+            parent="menu_crm_config_lead" />
 
 		<!-- CRM Lead Form View  -->
 
@@ -71,7 +74,7 @@
                         <field name="partner_name" string="Partner Name" colspan="4"/>
                         <newline/>
                         <field domain="[('domain', '=', 'contact')]" name="title"/>
-                        <field name="function_name" />
+                        <field name="function" />
                         <field name="street" colspan="4"/>
                         <field name="street2" colspan="4"/>
                         <field name="zip"/>
@@ -160,16 +163,21 @@
                                 <field name="email_to"/>
                                 <field name="email_from"/>
                             </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
+                            <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="%(action_crm_send_mail)d"
-                                context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                icon="gtk-undo" type="action" />
+                            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="name" />
                             <field name="date"/>
                             <field name="email_from" />
                             <field name="email_to"/>
@@ -177,7 +185,7 @@
                         </tree>
                     </field>
                     <button colspan="2" string="Send New Email"
-                        name="%(action_crm_send_mail)d"
+                        name="%(crm.action_crm_send_mail)d"
                         context="{'mail':'new', 'model': 'crm.lead'}"
                         icon="gtk-go-forward" type="action" />
                     <button colspan="2" string="Forward to Partner"
@@ -265,23 +273,23 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
-                <filter icon="terp-project"
+                <filter icon="terp-check"
                     string="Current"
                     default="1" name="current"
                     domain="[('state','in',('draft','open'))]"/>
-                <filter icon="terp-project"
+                <filter icon="terp-camera_test"
                     string="Open"
                     domain="[('state','=','open')]"/>
-                <filter icon="terp-project"
+                <filter icon="terp-gtk-media-pause"
                     string="Pending"
                     domain="[('state','=','pending')]"/>
 
                 <separator orientation="vertical"/>
-                <filter icon="gtk-home" string="Today"
+                <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" />
-                <filter icon="gtk-media-rewind" string="7 Days"
+                <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'))]"
@@ -290,32 +298,32 @@
                 <field name="partner_name"/>
                 <field name="email_from"/>
                 <field name="user_id" widget="selection">
-                    <filter icon="terp-partner"
+                    <filter icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
                 </field>
                 <field name="section_id" default="context.get('section_id', False)" widget="selection"
                     context="{'invisible_section': False}">
-                    <filter icon="terp-crm"
+                    <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id','=',uid)]"
                         help="My Sale Team"/>
-                    <filter icon="terp-crm"
+                    <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[]"
                         help="Show Sales Team"/>
                 </field>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Source" icon="terp-crm" domain="[]" context="{'group_by':'categ_id'}"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Team" icon="terp-crm" domain="[]" context="{'group_by':'section_id'}"/>
-                    <filter string="Salesman" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Referrer" icon="terp-crm" domain="[]" context="{'group_by':'referred'}"/>
+                    <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Creation" icon="terp-project"
+                    <filter string="Creation" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" />
                 </group>
            </search>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e84bbb673ee..cd3b7866a89 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -13,8 +13,8 @@
         <field name="context">{'object_id':'crm.meeting'}</field>
     </record>
 
-    <menuitem action="crm_meeting_categ_action"
-        id="menu_crm_case_meeting-act" parent="crm.menu_crm_case_categ" />
+     <menuitem action="crm_meeting_categ_action" name="Categories"
+        id="menu_crm_case_meeting-act" parent="menu_crm_config_meeting" />
 
 	<!-- CRM Meetings Form View -->
 
@@ -263,32 +263,32 @@
         <field name="arch" type="xml">
                 <search string="Search Meetings">
                        <group col="12" colspan="4">
-                           <filter icon="terp-project" name="current" string="Current"
+                           <filter icon="terp-check" name="current" string="Current"
                                 domain="[('state','in',('draft', 'open'))]"
                                 help="Current Meetings"/>
                            <separator orientation="vertical"/>
                            <field name="name" select="1" string="Subject"/>
                            <field name="partner_id" select="1" />
                            <field name="section_id" select="1" widget="selection">
-                               <filter icon="terp-crm"
+                               <filter icon="terp-personal+"
                                    domain="[('section_id','=',context.get('section_id',False))]"
                                    help="My Sale Team" />
                            </field>
                            <field name="user_id" select="1" widget="selection"/>
                        </group>
                        <newline/>
-					   	<group expand="1" string="Group By...">
-							<filter string="Date" icon="terp-project"
+					   	<group expand="0" string="Group By...">
+							<filter string="Date" icon="terp-go-month"
 						        domain="[]" context="{'group_by':'date'}" />
-						    <filter string="Privacy" icon="terp-crm"
+						    <filter string="Privacy" icon="terp-locked"
 						        domain="[]" context="{'group_by':'class'}" />
 						    <separator orientation="vertical" />
-						    <filter string="Responsible" icon="terp-crm" domain="[]"
+						    <filter string="Responsible" icon="terp-personal" domain="[]"
 						        context="{'group_by':'user_id'}" />
-						    <filter string="Partner" icon="terp-partner" domain="[]"
+						    <filter string="Partner" icon="terp-personal" domain="[]"
 						        context="{'group_by':'partner_id'}" />
 						    <separator orientation="vertical" />
-						    <filter string="State" icon="terp-crm" domain="[]"
+						    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
 						        context="{'group_by':'state'}" />
 						    <separator orientation="vertical" />
 						</group>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 6f34e42324d..eadc4158d69 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
+    <data>
 
-	<!-- Opportunity Categories Form View -->
+        <!-- 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>
+        <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"
-        parent="crm.menu_crm_case_categ" />
+        <menuitem action="crm_opportunity_categ_action"
+            id="menu_crm_case_opportunity-act" name="Categories"
+            parent="menu_crm_config_opportunity" />
 
-		<!-- Opportunity Stages Form View-->
+        <!-- Opportunity Stages Form View-->
 
         <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
             <field name="name">Opportunity Stages</field>
@@ -29,8 +29,8 @@
         </record>
 
         <menuitem action="crm_opportunity_stage_act"
-            id="menu_crm_opportunity_stage_act"
-            parent="crm.menu_crm_case_stage" />
+            id="menu_crm_opportunity_stage_act" name="Stages"
+            parent="menu_crm_config_opportunity" />
 
 		<!-- Opportunity Resource Type Form View -->
 
@@ -44,288 +44,307 @@
         </record>
 
         <menuitem action="crm_opportunity_resource_act"
-            id="menu_crm_opportunity_resource_act"
-            parent="crm.menu_crm_case_resource_type" />
+            id="menu_crm_opportunity_resource_act" name="Resource"
+            parent="menu_crm_config_opportunity" />
 
-	<!-- Opportunities Form View -->
+        <!-- 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>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Opportunities">
-                <group colspan="4" col="7">
-                    <field name="name"  required="1" string="Opportunity"/>
-                    <label string="Stage:" align="1.0"/>
-                    <group colspan="1" col="4">
-                        <field name="stage_id" nolabel="1"
-                            on_change="onchange_stage_id(stage_id)"
-                            widget="selection"
-                            domain="[('object_id.model', '=', 'crm.lead')]" />
-                        <button name="stage_previous"
+            <record model="ir.ui.view" id="crm_case_form_view_oppor">
+                <field name="name">Opportunities</field>
+                <field name="model">crm.lead</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+                    <form string="Opportunities">
+                        <group colspan="4" col="7">
+                            <field name="name"  required="1" string="Opportunity"/>
+                            <label string="Stage:" align="1.0"/>
+                            <group colspan="1" col="4">
+                                <field name="stage_id" nolabel="1"
+                                on_change="onchange_stage_id(stage_id)"
+                                widget="selection"
+                                domain="[('object_id.model', '=', 'crm.lead')]" />
+                                <button name="stage_previous"
+                                states="open,pending" type="object"
+                                icon="gtk-go-back" string="" />
+                                <button name="stage_next" states="open,pending"
+                                type="object" icon="gtk-go-forward" string="" />
+                            </group>
+                            <field name="user_id"/>
+
+                            <button name="action_makeMeeting" type="object"
+                            string="Schedule Meeting" icon="gtk-redo" />
+
+                            <field name="planned_revenue"/>
+                            <field name="probability"/>
+                            <field name="date_deadline" string="Expected Closing"/>
+                            <button string="Schedule Call"
+                            name="%(opportunity2phonecall_act)d" icon="gtk-redo" type="action"  />
+                            <newline/>
+                            <field name="date_action"/>
+                            <field name="priority" string="Priority"/>
+                        </group>
+                        <notebook colspan="4">
+                        <page string="Opportunity">
+                            <group col="4" colspan="2">
+                                <separator colspan="4" string="Contacts"/>
+                                <field name="partner_id" select="1"
+                                on_change="onchange_partner_id(partner_id, email_from)"
+                                colspan="2" />
+                                <field name="partner_address_id"
+                                string="Contact"
+                                on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                                colspan="1" />
+                                <field name="email_from" string="Email" />
+                                <field name="phone"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Categorization"/>
+                                <field name="section_id" colspan="1" widget="selection"/>
+                                <field name="categ_id" select="1" groups="base.group_extended"
+                                string="Category" widget="selection"
+                                domain="[('object_id.model', '=', 'crm.lead')]" />
+                            </group>
+
+                            <separator colspan="4" string="Details"/>
+                            <field name="description" nolabel="1" colspan="4"/>
+
+                            <separator colspan="4"/>
+                            <group col="8" colspan="4">
+                                <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_escalate" string="Escalate"
+                                    states="open,draft,pending" type="object"
+                                    groups="base.group_extended"
+                                    icon="gtk-go-up" />
+                                <button name="case_cancel" string="Mark Lost"
+                                    states="draft,open,pending" type="object"
+                                    icon="gtk-close" />
+                                <button name="case_close" string="Mark Won"
+                                    states="open,draft,pending" type="object"
+                                    icon="gtk-apply" />
+                                <button name="case_reset" string="Reset to New"
+                                    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', '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="2" string="Send New Email"
+                                name="%(crm.action_crm_send_mail)d"
+                                context="{'mail':'new', 'model': 'crm.lead'}"
+                                icon="gtk-go-forward" type="action" />
+                            <button colspan="2" string="Forward to Partner"
+                                name="%(crm_lead_forward_to_partner_act)d"
+                                icon="gtk-go-forward" type="action" />
+                        </page>
+                        <page string="History" groups="base.group_extended">
+                            <group col="2" colspan="2">
+                                <separator string="Dates" colspan="2"/>
+                                <field name="create_date"/>
+                                <field name="write_date"/>
+                                <field name="date_closed"/>
+                                <field name="date_open"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Misc" colspan="2"/>
+                                <field name="active"/>
+                                <field name="day_open"/>
+                                <field name="day_close"/>
+                                <field name="referred"/>
+                            </group>
+                            <separator colspan="4" string="References"/>
+                            <field name="ref"/>
+                            <field name="ref2"/>
+                            <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>
+
+        <!-- Opportunities Tree View -->
+
+            <record model="ir.ui.view" id="crm_case_tree_view_oppor">
+                <field name="name">Opportunities Tree</field>
+                <field name="model">crm.lead</field>
+                <field name="type">tree</field>
+                <field name="arch" type="xml">
+                    <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline &lt; current_date">
+                        <field name="date_deadline" invisible="1"/>
+                        <field name="create_date"/>
+                        <field name="name" string="Opportunity"/>
+                        <field name="partner_id"/>
+                        <field name="stage_id"/>
+                        <field name="categ_id" invisible="1" groups="base.group_extended"/>
+                        <button name="stage_previous" string="Previous"
+                            states="open,pending" type="object" icon="gtk-go-back" />
+                        <button name="stage_next" string="Next"
                             states="open,pending" type="object"
-                            icon="gtk-go-back" string="" />
-                        <button name="stage_next" states="open,pending"
-                            type="object" icon="gtk-go-forward" string="" />
-                    </group>
-                    <field name="user_id"/>
-
-                       <button name="action_makeMeeting" type="object"
-                        string="Schedule Meeting" icon="gtk-redo" />
-
-                    <field name="planned_revenue"/>
-                    <field name="probability"/>
-                    <field name="date_deadline" string="Expected Closing"/>
-                    <button string="Schedule Call"
-                        name="%(opportunity2phonecall_act)d" icon="gtk-redo" type="action"  />
-
-                    <newline/>
-                    <field name="date_action"/>
-                    <field name="priority" string="Priority"/>
-                </group>
-                <notebook colspan="4">
-                <page string="Opportunity">
-                    <group col="4" colspan="2">
-                        <separator colspan="4" string="Contacts"/>
-                        <field name="partner_id" select="1"
-                            on_change="onchange_partner_id(partner_id, email_from)"
-                            colspan="2" />
-                        <field name="partner_address_id"
-                            string="Contact"
-                            on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                            colspan="1" />
-                        <field name="email_from" string="Email" />
-                        <field name="phone"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Categorization"/>
-                        <field name="section_id" colspan="1" widget="selection"/>
-                        <field name="categ_id" select="1" groups="base.group_extended"
-                            string="Category" widget="selection"
-                            domain="[('object_id.model', '=', 'crm.lead')]" />
-                    </group>
-
-                    <separator colspan="4" string="Details"/>
-                    <field name="description" nolabel="1" colspan="4"/>
-
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
+                            icon="gtk-go-forward" />
+                        <field name="planned_revenue" sum="Total of Planned Revenue"/>
+                        <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
+                        <field name="date_action"/>
+                        <field name="section_id" groups="base.group_extended"/>
+                        <field name="user_id"/>
+                        <field name="priority"/>
                         <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_escalate" string="Escalate"
-                            states="open,draft,pending" type="object"
-                            groups="base.group_extended"
-                            icon="gtk-go-up" />
-                        <button name="case_cancel" string="Mark Lost"
-                            states="draft,open,pending" type="object"
-                            icon="gtk-close" />
-                        <button name="case_close" string="Mark Won"
+                        <button name="case_close" string="Won"
                             states="open,draft,pending" type="object"
                             icon="gtk-apply" />
-                        <button name="case_reset" string="Reset to New"
-                            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">
-                        <form string="Communication history">
-                            <group col="6" colspan="4">
-                                <field name="date"/>
-                                <field name="email_to"/>
-                                <field name="email_from"/>
-							</group>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                       string="Reply to Last Email"
-                                       name="%(action_crm_send_mail)d"
-                                       context="{'mail':'reply', 'model': 'crm.lead'}"
-                                       icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email_to"/>
-                                   <field name="date"/>
-                               </tree>
-                           </field>
-                           <button colspan="2" string="Send New Email"
-                               name="%(action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'crm.lead'}"
-                               icon="gtk-go-forward" type="action" />
-                           <button colspan="2" string="Forward to Partner"
-                               name="%(crm_lead_forward_to_partner_act)d"
-                               icon="gtk-go-forward" type="action" />
-                 </page>
-                <page string="History" groups="base.group_extended">
-                    <group col="2" colspan="2">
-                        <separator string="Dates" colspan="2"/>
-                        <field name="create_date"/>
-                        <field name="write_date"/>
-                        <field name="date_closed"/>
-                        <field name="date_open"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Misc" colspan="2"/>
-                        <field name="active"/>
-                        <field name="day_open"/>
-                        <field name="day_close"/>
-                        <field name="referred"/>
-                    </group>
-                    <separator colspan="4" string="References"/>
-                    <field name="ref"/>
-                    <field name="ref2"/>
-                    <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>
-
-	<!-- Opportunities Tree View -->
-
-    <record model="ir.ui.view" id="crm_case_tree_view_oppor">
-        <field name="name">Opportunities Tree</field>
-        <field name="model">crm.lead</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline &lt; current_date">
-                <field name="date_deadline" invisible="1"/>
-                <field name="create_date"/>
-                <field name="name" string="Opportunity"/>
-                <field name="partner_id"/>
-                <field name="stage_id"/>
-                <field name="categ_id" invisible="1" groups="base.group_extended"/>
-                <button name="stage_previous" string="Previous"
-                    states="open,pending" type="object" icon="gtk-go-back" />
-                <button name="stage_next" string="Next"
-                    states="open,pending" type="object"
-                    icon="gtk-go-forward" />
-                <field name="planned_revenue" sum="Total of Planned Revenue"/>
-                <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                <field name="date_action"/>
-                <field name="section_id" groups="base.group_extended"/>
-                <field name="user_id"/>
-                <field name="priority"/>
-                <field name="state"/>
-                <button name="case_open" string="Open"
-                    states="draft,pending" type="object"
-                    icon="gtk-go-forward" />
-                <button name="case_close" string="Won"
-                    states="open,draft,pending" type="object"
-                    icon="gtk-apply" />
-                <button name="case_pending" string="Pending"
-                    states="open,draft" type="object"
-                    icon="gtk-media-pause" />
-                <button name="case_cancel" string="Lost"
-                    states="draft,open,pending" type="object"
-                    icon="gtk-cancel" />
-            </tree>
-        </field>
-    </record>
-
-	<!-- Opportunities Graph View -->
-
-    <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
-        <field name="name">CRM - Opportunity Graph</field>
-        <field name="model">crm.lead</field>
-        <field name="type">graph</field>
-        <field name="arch" type="xml">
-            <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
-                <field name="categ_id"/>
-                <field name="planned_revenue" operator="+"/>
-                <field name="state" group="True"/>
-            </graph>
-        </field>
-    </record>
-
-	<!-- Opportunities Search View -->
-
-    <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
-        <field name="name">CRM - Opportunities Search</field>
-        <field name="model">crm.lead</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Search Opportunities">
-                <filter icon="terp-project"
-                    string="Current"
-                    name="current"
-                    domain="[('state','in',('draft','open'))]"/>
-                <filter icon="terp-project"
-                    string="Open"
-                    domain="[('state','=','open')]"/>
-                <filter icon="terp-project"
-                    string="Pending"
-                    domain="[('state','=','pending')]"/>
-                <separator orientation="vertical"/>
-                <filter icon="gtk-home" 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" />
-                <filter icon="gtk-media-rewind" 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'))]"
-                />
-                <separator orientation="vertical"/>
-                <field name="name" string="Opportunity"/>
-                <field name="user_id" widget="selection">
-                    <filter icon="terp-partner"
-                        domain="[('user_id','=',uid)]"
-                        help="My Opportunities" default="1"/>
-                    <filter icon="terp-partner"
-                        domain="[('user_id','=', uid)]"
-                        help="Unassigned Opportunities"/>
+                        <button name="case_pending" string="Pending"
+                            states="open,draft" type="object"
+                            icon="gtk-media-pause" />
+                        <button name="case_cancel" string="Lost"
+                            states="draft,open,pending" type="object"
+                            icon="gtk-cancel" />
+                    </tree>
                 </field>
-                <field name="section_id"
-                    default="context.get('section_id', False)" select="1"
-                    widget="selection">
-                    <filter icon="terp-crm"
-                        domain="[('section_id','=',context.get('section_id',False))]"
-                        help="My Sale Team" />
-                </field>
-                <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Stage" icon="terp-crm" domain="[]"
-                        context="{'group_by':'stage_id'}"/>
-                    <filter string="Priority" icon="terp-crm" domain="[]"
-                        context="{'group_by':'priority'}"/>
-                    <filter string="Category" icon="terp-crm"
-                        domain="[]" context="{'group_by':'categ_id'}"/>
+            </record>
 
-                    <separator orientation="vertical"/>
-                    <filter string="Salesman" icon="terp-crm"
-                        domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Creation" icon="terp-project"
-                        domain="[]" context="{'group_by':'create_date'}"/>
-                    <filter string="Exp.Closing" icon="terp-project"
-                        domain="[]" context="{'group_by':'date_deadline'}"/>
-                </group>
-           </search>
-        </field>
-    </record>
+        <!-- Opportunities Graph View -->
+
+            <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
+                <field name="name">CRM - Opportunity Graph</field>
+                <field name="model">crm.lead</field>
+                <field name="type">graph</field>
+                <field name="arch" type="xml">
+                    <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
+                        <field name="categ_id"/>
+                        <field name="planned_revenue" operator="+"/>
+                        <field name="state" group="True"/>
+                    </graph>
+                </field>
+            </record>
+
+        <!-- Opportunities Search View -->
+
+            <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
+                <field name="name">CRM - Opportunities Search</field>
+                <field name="model">crm.lead</field>
+                <field name="type">search</field>
+                <field name="arch" type="xml">
+                    <search string="Search Opportunities">
+                        <filter icon="terp-check"
+                            string="Current"
+                            name="current"
+                            domain="[('state','in',('draft','open'))]"/>
+                        <filter icon="terp-camera_test"
+                            string="Open"
+                            domain="[('state','=','open')]"/>
+                        <filter icon="terp-gtk-media-pause"
+                            string="Pending"
+                            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'))]"
+                            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'))]"
+                        />
+                        <separator orientation="vertical"/>
+                        <field name="name" string="Opportunity"/>
+                        <field name="user_id" widget="selection">
+                            <filter icon="terp-personal-"
+                                domain="[('user_id','=', False)]"
+                                help="Unassigned Opportunities" />
+                        </field>
+                        <field name="section_id"
+                            default="context.get('section_id', False)" select="1"
+                            widget="selection">
+                            <filter icon="terp-personal+"
+                                domain="[('section_id','=',context.get('section_id',False))]"
+                                help="My Sale Team" />
+                        </field>
+                        <newline/>
+                        <group expand="0" string="Group By..." colspan="16">
+                            <filter string="Stage" icon="terp-stage" domain="[]"
+                                context="{'group_by':'stage_id'}" />
+                            <filter string="Priority" icon="terp-rating-rated" domain="[]"
+                                context="{'group_by':'priority'}" />
+                            <filter string="Category" icon="terp-stock_symbol-selection"
+                                domain="[]" context="{'group_by':'categ_id'}" />
+
+                            <separator orientation="vertical" />
+                            <filter string="Salesman" icon="terp-personal"
+                                domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}" />
+                            <separator orientation="vertical" />
+                            <filter string="Creation" icon="terp-go-month"
+                                domain="[]" context="{'group_by':'create_date'}" />
+                            <filter string="Exp.Closing" icon="terp-go-month"
+                                domain="[]" context="{'group_by':'date_deadline'}" />
+                        </group>
+                    </search>
+                </field>
+            </record>
+
+
+        <!-- Opportunities Graph View -->
+
+            <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
+                <field name="name">CRM - Opportunity Graph</field>
+                <field name="model">crm.lead</field>
+                <field name="type">graph</field>
+                <field name="arch" type="xml">
+                    <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
+                        <field name="categ_id"/>
+                        <field name="planned_revenue" operator="+"/>
+                        <field name="state" group="True"/>
+                    </graph>
+                </field>
+            </record>
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 205b30d39dc..657360a4206 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -38,6 +38,9 @@ class crm_phonecall(osv.osv, crm_case):
         'name': fields.char('Name', size=64),
         'active': fields.boolean('Active', required=False), 
         'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
+        'date_action_last': fields.datetime('Last Action', readonly=1),
+        'date_action_next': fields.datetime('Next Action', readonly=1), 
+        'create_date': fields.datetime('Creation Date' , readonly=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
                              Define Responsible user and Email account for mail gateway.'), 
@@ -87,6 +90,7 @@ class crm_phonecall(osv.osv, crm_case):
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
         'state': lambda *a: 'draft', 
+        'user_id': lambda self,cr,uid,ctx: uid,
         'active': lambda *a: 1, 
     }
     
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 65b77ed5abe..db8adda789c 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -13,8 +13,8 @@
         <field name="context">{'object_id':'crm.phonecall'}</field>
     </record>
 
-    <menuitem action="crm_phonecall_categ_action"
-        id="menu_crm_case_phonecall-act" parent="crm.menu_crm_case_categ" />
+    <menuitem action="crm_phonecall_categ_action" name="Categories"
+        id="menu_crm_case_phonecall-act" parent="menu_crm_config_phonecall" />
 
 <!-- ResourceType Form View -->
 
@@ -27,10 +27,9 @@
             <field name="context">{'object_id':'crm.phonecall'}</field>
         </record>
 
-    <menuitem action="crm_phonecall_resource_act"
-        id="menu_crm_phonecall_resource_act"
-        parent="crm.menu_crm_case_resource_type" />
-
+     <menuitem action="crm_phonecall_resource_act"
+        id="menu_crm_phonecall_resource_act" name="Resource Type"
+        parent="menu_crm_config_phonecall" />
 
 <!--  PhoneCalls Tree View -->
 
@@ -137,7 +136,7 @@
             </form>
         </field>
     </record>
-	
+
 	<!--Inbound Phonecalls Form View -->
 
 	<record model="ir.ui.view" id="crm_case_inbound_phone_form_view">
@@ -197,9 +196,9 @@
             </form>
         </field>
     </record>
-    
+
     <!--Inbound Phonecalls Tree View -->
-    
+
     <record model="ir.ui.view" id="crm_case_inbound_phone_tree_view">
         <field name="name">CRM - Inbound Phone Calls Tree</field>
         <field name="model">crm.phonecall</field>
@@ -248,12 +247,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="gtk-home" string="Today"
+               <filter icon="terp-go-today" string="Today"
                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),\
                     ('date','&gt;=',datetime.strftime('%%Y-%%m-%%d 00:00:00'))]"
                    help="Todays's Phonecalls"
                />
-               <filter icon="gtk-media-rewind"
+               <filter icon="terp-go-week"
                    string="7 Days"
                    help="Phonecalls during last 7 days"
                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')),\
@@ -263,31 +262,31 @@
                <field name="name" string="Call Summary"/>
                <field name="partner_id"/>
                <field name="user_id" widget="selection">
-                   <filter icon="terp-partner"
+                   <filter icon="terp-personal-"
                        domain="[('user_id','=',False)]"
                        help="Unassigned Phonecalls" />
                </field>
                <field name="section_id"
                    select="1" widget="selection" string="Sales Team">
-                   <filter icon="terp-crm"
+                   <filter icon="terp-personal+"
                        domain="[('section_id','=',context.get('section_id',False))]"
                        help="My Sale Team" />
                </field>
                <newline/>
                <group expand="0" string="Group By..." colspan="4">
-                   <filter string="Partner" icon="terp-crm" domain="[]"
+                   <filter string="Partner" icon="terp-personal" domain="[]"
                        context="{'group_by':'partner_id'}" />
-                   <filter string="Responsible" icon="terp-crm"
+                   <filter string="Responsible" icon="terp-personal"
                        domain="[]" context="{'group_by':'user_id'}" />
                    <separator orientation="vertical" />
-                   <filter string="Creation" icon="terp-project"
+                   <filter string="Creation" icon="terp-go-month"
                        domain="[]" context="{'group_by':'create_date'}" />
-                   <filter string="Date" icon="terp-project" domain="[]"
+                   <filter string="Date" icon="terp-go-month" domain="[]"
                        context="{'group_by':'date'}" />
                </group>
            </search>
         </field>
     </record>
-    
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 2992959bdd0..ee5a6ac35f4 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -70,10 +70,10 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Type">
                    <group col="10" colspan="4">
-                           <filter string="This Year" icon="terp-hr"
+                           <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Team and Type for this year" />
-                           <filter string="This Month" icon="terp-hr"
+                           <filter string="This Month" icon="terp-go-month"
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by Team and Type for this month" />
                            <separator orientation="vertical"/>
@@ -162,10 +162,10 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
                    <group col="8" colspan="4">
-                           <filter string="This Year" icon="terp-hr"
+                           <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Team and Stage for this year" />
-                           <filter string="This Month" icon="terp-hr"
+                           <filter string="This Month" icon="terp-go-month"
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by Team and Stage for this month" />
                            <separator orientation="vertical"/>
@@ -237,10 +237,10 @@
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
                    <group col='8' colspan='4'>
-                           <filter string="This Year" icon="terp-hr"
+                           <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Section, Category and Stage for this year" />
-                           <filter string="This Month" icon="terp-hr"
+                           <filter string="This Month" icon="terp-go-month"
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by Section, Category and Stage for this month" />
                            <separator orientation="vertical"/>
@@ -330,10 +330,10 @@
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
                    <group col='12' colspan='4'>
-                           <filter string="This Year" icon="terp-hr"
+                           <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by User for this year" />
-                           <filter string="This Month" icon="terp-hr"
+                           <filter string="This Month" icon="terp-go-month"
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by User for this month" />
                            <separator orientation="vertical"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 52450419fd2..f854981858c 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="base.menu_crm_configuration" name="Cases"
-            parent="base.menu_base_config" sequence="0" groups="base.group_extended"/>
+        <menuitem id="base.menu_crm_config_sales" name="Sales"
+            parent="base.menu_base_config" sequence="1" groups="base.group_extended"/>
+
+        <menuitem id="menu_crm_config_lead" name="Lead"
+            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" groups="base.group_extended"/>
+
+        <menuitem id="menu_crm_config_meeting" name="Meeting"
+            parent="base.menu_base_config" sequence="4" groups="base.group_extended"/>
+
+        <menuitem id="menu_crm_config_phonecall" name="Phone Call"
+            parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
 
         <menuitem id="base.next_id_64" name="Reporting"
         	parent="base.menu_base_partner" sequence="8" />
@@ -117,9 +129,7 @@
             <field name="view_id" ref="crm_case_stage_tree"/>
         </record>
 
-        <menuitem  id="menu_crm_case_stage" name="Stages" parent="base.menu_crm_configuration" groups="base.group_extended"/>
-
-		<!-- Case Categories Form View -->
+ <!-- Case Categories Form View -->
 
         <record id="crm_case_categ-view" model="ir.ui.view">
             <field name="name">crm.case.categ.form</field>
@@ -156,11 +166,11 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
         </record>
-        <menuitem id="menu_crm_case_categ"   name="Categories"  parent="base.menu_crm_configuration" groups="base.group_extended"/>
 
         <menuitem action="crm_case_section_act"
-            id="menu_crm_case_section_act"
-            parent="base.menu_crm_configuration" />
+            id="menu_crm_case_section_act" sequence="4"
+            parent="base.menu_crm_config_sales" />
+
 
 
 		<!-- Resource Type of case Tree View -->
@@ -201,8 +211,6 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_resource_type_tree"/>
         </record>
-        <menuitem id="menu_crm_case_resource_type" name="Resource Type"
-            parent="base.menu_crm_configuration" groups="base.group_extended" />
 
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by section</field>
@@ -342,10 +350,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="crm_segmentation_tree-act"
+
+       <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
-            groups="base.group_extended"
-            parent="base.menu_crm_configuration" />
+            groups="base.group_extended" sequence="5"
+            parent="base.menu_crm_config_sales" />
 
         <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 d0b526f542e..3efa06d3d90 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-05-17 23:03+0000\n"
-"Last-Translator: Carlos Incaser <Unknown>\n"
+"PO-Revision-Date: 2010-05-31 22:24+0000\n"
+"Last-Translator: victor tejada yau <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-05-19 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -951,6 +951,8 @@ msgid ""
 "Category related to the section.Subdivide the CRM cases independently or "
 "section-wise."
 msgstr ""
+"Categoria relacionada a la seccion. subdividido independientemente los casos "
+"CRM  o modo-seccion"
 
 #. module: crm
 #: field:crm.case.rule,act_state:0
@@ -1340,7 +1342,7 @@ msgstr "Calcular la segmentación"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Email"
-msgstr ""
+msgstr "Dirigir correo electronico"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation-act
@@ -1563,6 +1565,8 @@ msgid ""
 "Helps you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
 msgstr ""
+"Te ayuda a organizar los procesos para emplear trabajos: evaluacion, "
+"reunion, integracion de correo electronico"
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -1619,7 +1623,7 @@ msgstr "Convertido"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Reply to Last Email"
-msgstr ""
+msgstr "Responder el ultimo correo electronico"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1629,7 +1633,7 @@ msgstr "Descripción de segmentación"
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Gives Location of Meeting"
-msgstr ""
+msgstr "Dando la ubicacion de la reunion"
 
 #. module: crm
 #: view:crm.case:0
@@ -1644,7 +1648,7 @@ msgstr "Historial"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_job
 msgid "Job Cases"
-msgstr ""
+msgstr "casos de trabajos"
 
 #. module: crm
 #: view:crm.job:0
@@ -1654,7 +1658,7 @@ msgstr "Trabajos - selección de personal"
 #. module: crm
 #: field:crm.case.rule,regex_name:0
 msgid "Regular Expression on Case Name"
-msgstr ""
+msgstr "Expresion regular en nombre de caso"
 
 #. module: crm
 #: field:crm.case,state:0
@@ -1719,7 +1723,7 @@ msgstr "¡No se ha encontrado Email en la dirección de su compañía!"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Search Funds"
-msgstr ""
+msgstr "buscar fondos"
 
 #. module: crm
 #: view:crm.claim:0
@@ -1729,7 +1733,7 @@ msgstr "Tipo de reclamación"
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Support Tree"
-msgstr ""
+msgstr "Arbol de soporte tecnico"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -1760,12 +1764,14 @@ msgstr "Referencia"
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Exception de regla"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
 msgstr ""
+"Verifica esto si tu quieres enviar la norma en un correo electronico a el "
+"socio"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead2
@@ -1810,7 +1816,7 @@ msgstr "Importe de venta"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Add a CC"
-msgstr ""
+msgstr "Agregar un CC"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1838,7 +1844,7 @@ msgstr "Alarma"
 #. module: crm
 #: field:crm.case.rule,act_mail_to_watchers:0
 msgid "Mail to watchers (CC)"
-msgstr ""
+msgstr "correo a los observadores (CC)"
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -1903,7 +1909,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_set_rrule
 msgid "Set RRULE"
-msgstr ""
+msgstr "Establecer RRULE"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor4
@@ -1981,7 +1987,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email Fail!"
-msgstr ""
+msgstr "Correo electronico fallo"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index f90c62ca5cc..a751a326814 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.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-01-22 23:56+0000\n"
-"Last-Translator: Paulino <Unknown>\n"
+"PO-Revision-Date: 2010-06-01 14:21+0000\n"
+"Last-Translator: cmsa <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-04-17 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -34,7 +34,7 @@ msgstr ""
 #: help:crm.case.rule,act_mail_to_user:0
 msgid ""
 "Check this if you want the rule to send an email to the responsible person."
-msgstr ""
+msgstr "Marque isto se quer que a regra envie um email ao responsável."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -57,7 +57,7 @@ msgstr "Fechar dica"
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 Dias    "
 
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
@@ -67,7 +67,7 @@ msgstr "Gere um serviço de Helpdesk"
 #. module: crm
 #: view:crm.job:0
 msgid "Pending Jobs"
-msgstr ""
+msgstr "Tarefas Pendentes"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_to:0
@@ -82,7 +82,7 @@ msgstr "Custos previstos"
 #. module: crm
 #: wizard_field:crm.job.partner_create,init,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "Fechar tarefa requerida"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -191,6 +191,8 @@ msgid ""
 "Describes the action name.eg:on which object which ation to be taken on "
 "basis of which condition"
 msgstr ""
+"Descreve o nome da acção . Ou seja, em que Objecto, que acção e em que "
+"condições"
 
 #. module: crm
 #: help:crm.case,section_id:0
@@ -238,7 +240,7 @@ msgstr "Salário proposto"
 #. module: crm
 #: help:crm.case.section,sequence:0
 msgid "Gives the sequence order when displaying a list of case sections."
-msgstr ""
+msgstr "Devolve a ordem de sequência quando apresenta as secções de opções"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -3619,6 +3621,8 @@ msgstr ""
 msgid ""
 "Can not send mail with empty body,you should have description in the body"
 msgstr ""
+"Não pode enviar um email sem corpo de texto, deve inserir texto no corpo do "
+"email."
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 2c0fa8c8fc6..db9837b5d0c 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -21,6 +21,7 @@
 
 from osv import fields,osv
 import tools
+from crm import crm
 
 AVAILABLE_STATES = [
     ('draft','Draft'),
@@ -35,7 +36,7 @@ class crm_lead_report(osv.osv):
     _name = "crm.lead.report"
     _auto = False
     _description = "CRM Lead Report"
-    
+
     def _get_data(self, cr, uid, ids, field_name, arg, context={}):
 
         """ @param cr: the current row, from the database cursor,
@@ -89,8 +90,13 @@ class crm_lead_report(osv.osv):
                                   ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
         '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), 
+        'day': fields.char('Day', size=128, readonly=True),
+        'email': fields.integer('# of 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_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
         'delay_close': fields.float('Delay to close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
+        'probability': fields.float('Probability',digits=(16,2),readonly=True),
+        'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]" , readonly=True),
@@ -98,11 +104,15 @@ class crm_lead_report(osv.osv):
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]", readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
-        'company_id': fields.many2one('res.company', 'Company', readonly=True), 
+        'opening_date': fields.date('Opening Date', readonly=True),
+        'creation_date': fields.date('Creation Date', readonly=True),
+        'date_closed': fields.date('Close Date', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        
         'type':fields.selection([
             ('lead','Lead'),
             ('opportunity','Opportunity'),
-            
         ],'Type', help="Type is used to separate Leads and Opportunities"),
     }
     def init(self, cr):
@@ -120,25 +130,51 @@ class crm_lead_report(osv.osv):
                     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.user_id,
+                    c.probability,
                     c.stage_id,
                     c.type as type,
                     c.company_id,
+                    c.priority,
                     c.section_id,
                     c.categ_id,
                     c.partner_id,
-                    count(*) as nbr,
+                    c.planned_revenue,
+                    (select 1) as nbr,
                     0 as avg_answers,
                     0.0 as perc_done,
                     0.0 as perc_cancel,
+                    (select count(id) from mailgate_message where thread_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_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
                     crm_lead c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
-                     c.state, c.user_id,c.section_id,c.stage_id,categ_id,c.partner_id,c.company_id, c.type
-                     ,c.create_date,to_char(c.create_date, 'YYYY-MM-DD')
+                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 da480d21dc0..f6ac9238b3c 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -10,19 +10,24 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
             <tree string="Leads Analysis">
-				<field name="name" invisible="1"/>
-				<field name="month" invisible="1"/>
-				<field name="section_id" invisible="1"/>
-				<field name="user_id" invisible="1"/>
-    			<field name="company_id" invisible="1"/>
-				<field name="partner_id" invisible="1"/>
-				<field name="day" invisible="1"/>
-				<field name="nbr" string="#Leads" sum="#Leads" attrs="{'string': 'type'=='opportunity' and '#opp' or '#lead'}"/>
-                <field name="delay_close" sum='Avg Closing Delay'/>
+                <field name="name" invisible="1"/>
                 <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="type" invisible="1"/>
+                <field name="priority" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="section_id" invisible="1"/>
+                <field name="user_id" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="partner_id" invisible="1"/>
+                <field name="day" invisible="1"/>
+                <field name="nbr" sum="# Leads"/>
+                <field name="email" sum="#Mails"/>
+                <field name="delay_open" sum='Avg Closing Delay'/>
+                <field name="delay_close" sum='Avg Closing Delay'/>
+                <field name="delay_expected"/>
+                <field name="avg_answers"/>
              </tree>
             </field>
         </record>
@@ -71,20 +76,17 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group col="16" colspan="8">
-                   	    <filter string="Last 365 Days" icon="gtk-media-rewind"
+                   	    <filter string="Last 365 Days" icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter string="Last 30 Days" icon="gtk-media-rewind" name="This Month"
+                        <filter string="Last 30 Days" icon="terp-go-month" name="This Month"
                     	    domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                        <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'))]"/>
                    		<separator orientation="vertical" />
-                        <filter icon="terp-crm"
-                    		string="Draft"
-                    		domain="[('state','=','draft')]"/>
-					    <filter icon="terp-crm"
-                    		string="Open"
-                    		domain="[('state','=','open')]"/>
-					    <filter icon="terp-crm"
+                        <filter icon="terp-check"
+                    		string="Current"
+                    		domain="[('state','in',('draft','open')]"/>
+					    <filter icon="terp-check"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
                    		<separator orientation="vertical" />
@@ -98,40 +100,51 @@
                    			help="My section" />
                    		</field>
                       	<field name="user_id" select="1" widget="selection">
-	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-crm"
+                   <group  expand="0" string="Group By...">
+                        <filter string="User" name="User" icon="terp-personal"
                         	domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Company" icon="terp-crm"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
-                        <filter string="Section" icon="terp-crm"
+                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Section" icon="terp-personal+"
                         	domain="[]"
                         	context="{'group_by':'section_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="State" icon="terp-crm"
-                        	domain="[]" context="{'group_by':'state'}" />
-						<filter string="Stage" icon="terp-crm" domain="[]"
-							context="{'group_by':'stage_id'}" />
-                        <filter string="Category" icon="terp-crm"
+                        <filter string="Category" icon="terp-stock_symbol-selection"
                         	domain="[]" context="{'group_by':'categ_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-crm"
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                        	domain="[]" context="{'group_by':'state'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Company" icon="terp-go-home"
+                        	domain="[]"
+                        	context="{'group_by':'company_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-go-month"
                         	domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-crm"
+                        <filter string="Month" icon="terp-go-month"
                         	domain="[]" context="{'group_by':'month'}" />
-                        <filter string="Year" icon="terp-crm"
+                        <filter string="Year" icon="terp-go-year"
                         	domain="[]" context="{'group_by':'name'}" />
                   </group>
                    <newline/>
                    <group  expand="0" string="Extended options..." groups="base.group_extended">
-                       <field name="state"/>
-	            	   <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-		               <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       <field name="partner_id"/>
+                    		<separator orientation="vertical"/>
+                         <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                          <separator orientation="vertical"/>
+                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       	<newline/>
+                          <field name="creation_date"/>
+                          <field name="opening_date"/>
+                          <field name="date_closed"/>
                    </group>
                </search>
             </field>
@@ -144,20 +157,26 @@
             <field name="model">crm.lead.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            <tree string="Opportunities">
-				<field name="name" invisible="1"/>
-				<field name="month" invisible="1"/>
-				<field name="section_id" invisible="1" groups="base.group_extended"/>
-				<field name="user_id" invisible="1"/>
-    			<field name="company_id" invisible="1" groups="base.group_extended"/>
-				<field name="partner_id" invisible="1"/>
-				<field name="day" invisible="1"/>
-				<field name="nbr" string="#Opportunities" sum="#Opportunities"/>
-                <field name="delay_close" sum='Avg Closing Delay'/>
+            <tree string="Leads Analysis">
+                <field name="name" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="section_id" invisible="1" groups="base.group_extended"/>
+                <field name="user_id" invisible="1"/>
+                <field name="partner_id" invisible="1"/>
+                <field name="day" invisible="1"/>
                 <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
+                <field name="priority"  invisible="1"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="type" invisible="1"/>
+                <field name="company_id" invisible="1" groups="base.group_multi_company"/>
+                <field name="nbr" string="#Opportunities" sum="#Opportunities"/>
+                <field name="planned_revenue" sum="Planned Revenues"/>
+                <field name="email" sum="# of Emails"/>
+                <field name="delay_open" sum='Delay to open'/>
+                <field name="delay_close" sum='Delay to close'/>
+                <field name="delay_expected"/>
+                <field name="probability" widget="progressbar"/>
              </tree>
             </field>
         </record>
@@ -170,7 +189,7 @@
             <field name="view_type">form</field>
             <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
-            <field name="domain">[('type', '=', 'lead')]</field>
+            <field name="domain">['|',('type', '=', 'lead'),('type', '=', False)]</field>
             <field name="search_view_id" ref="view_report_crm_lead_filter"/>
         </record>
 
@@ -188,8 +207,8 @@
             <field name="act_window_id" ref="action_report_crm_lead"/>
        </record>
 
-	<record id="action_report_crm_opportunity" model="ir.actions.act_window">
-            <field name="name">Opportunities</field>
+	   <record id="action_report_crm_opportunity" model="ir.actions.act_window">
+            <field name="name">Opportunities Analysis</field>
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
             <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
@@ -216,7 +235,7 @@
            groups="base.group_extended"
            parent="base.next_id_64" action="action_report_crm_lead" />
 
-		<menuitem name="Opportunities" id="menu_report_crm_opportunities_tree"
+		<menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
            groups="base.group_extended"
            parent="base.next_id_64" action="action_report_crm_opportunity" />
 
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index c1954f8607f..c0e666e4eaa 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -21,6 +21,7 @@
 
 from osv import fields,osv
 import tools
+from crm import crm
 
 AVAILABLE_STATES = [
     ('draft','Draft'),
@@ -78,6 +79,7 @@ class crm_phonecall_report(osv.osv):
         'name': fields.char('Year', size=64, required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'nbr': fields.integer('# of Cases', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
@@ -89,15 +91,22 @@ class crm_phonecall_report(osv.osv):
                                   ('07', 'July'), ('08', 'August'),\
                                   ('09', 'September'), ('10', 'October'),\
                                   ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
-        '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), 
         'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
+        'duration': fields.float('Duration', digits=(16,2),readonly=True, group_operator="avg"),
+        'delay_open': fields.float('Delay to open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                         domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.phonecall')]"),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
+                         domain="[('section_id','=',section_id),\
+                        ('object_id.model', '=', 'crm.phonecall')]", readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'opening_date': fields.date('Opening Date', readonly=True),
+        'creation_date': fields.date('Creation Date', readonly=True),
+        'date_closed': fields.date('Close Date', readonly=True),
     }
 
     def init(self, cr):
@@ -114,23 +123,45 @@ class crm_phonecall_report(osv.osv):
                     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,
+                    c.user_id,
+                    c.section_id,
+                    c.categ_id,
+                    c.partner_id,
+                    c.stage_id,
+                    c.duration,
+                    c.company_id,
+                    c.priority,
+                    (select 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
+                    
+                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,
-                    count(*) 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
-                from
-                    crm_phonecall c
-                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
-                     ,to_char(c.create_date, 'YYYY-MM-DD'),c.create_date
+                    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
             )""")
 
 crm_phonecall_report()
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 4e57ba1d474..ddc50460e31 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -10,18 +10,22 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Phone calls">
-					<field name="name" invisible="1"/>
-					<field name="month" invisible="1"/>
-					<field name="section_id" invisible="1"/>
+                    <field name="name" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="section_id" invisible="1"/>
+                    <field name="priority" invisible="1"/>
+                    <field name="stage_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="company_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
-					<field name="nbr" string="#Phone calls" sum="#Phone calls"/>
-	                <field name="delay_close" avg="Avg Closing Delay"/>
                     <field name="state" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="day" invisible="1"/>
-				</tree>
+                    <field name="nbr" string="#Phone calls" sum="#Phone calls"/>
+                    <field name="duration" avg="Duration"/>
+                    <field name="delay_close" avg="Avg Closing Delay"/>
+                    <field name="delay_open" sum='Delay to open'/>
+              </tree>
             </field>
         </record>
 
@@ -36,9 +40,9 @@
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
                     <field name="user_id" select="1"/>
-					<field name="section_id" select="1"/>
+                    <field name="section_id" select="1"/>
                     <field name="nbr" select="1"/>
-                     <field name="delay_close"/>
+                   <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_revenue_prob"/>
                     <field name="probability"/>
@@ -73,97 +77,86 @@
                   <group col="16" colspan="8">
                    		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
                    			domain="[('name','=',time.localtime()[0])]"/>-->
-                   		<filter string="This Year" icon="terp-hr"
+                   		<filter string="This Year" icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
 
                    		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
                    			domain="[('month','=',time.strftime('%%m'))]" />-->
-                       <filter string="This Month" icon="terp-hr" name="This Month"
+                       <filter string="This Month" icon="terp-go-month" name="This Month"
                     	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
 
-                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                       <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'))]"/>
 
                    		<separator orientation="vertical" />
+                        <filter icon="terp-check"
+                    		string="Current"
+                    		domain="[('state','in',('draft','oprn'))]"/>
                         <filter icon="terp-hr"
-                    		string="Draft"
-                    		domain="[('state','=','draft')]"/>
-					   <filter icon="terp-hr"
-                    		string="Open"
-                    		domain="[('state','=','open')]"/>
-					   <filter icon="terp-hr"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
+                        <filter icon="terp-sale"
+                    		string="Done"
+                    		domain="[('state','=','done')]"/>
 
                    		<separator orientation="vertical" />
-                   		<field name="section_id"
-                   			default="context.get('section_id', False)"
-                   			widget="selection"
-                   			context="{'invisible_section': False}">
+                      <filter string="Stage" icon="terp-crm" domain="[]"
+                          context="{'group_by':'stage_id'}" />
 
-                   			<filter icon="terp-crm"
+
+                   			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
                    				help="My section" />
 
-                   		</field>
-                   		<field name="company_id" widget="selection" groups="base.group_multi_company">
-                           <filter icon="terp-crm"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id.company_id','=',uid)]"
-                        help="My company"/>
-                        </field>
-
                       	<field name="user_id" select="1" widget="selection">
 	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
                     <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-sale"
+                   <group  expand="0" string="Group By...">
+                        <filter string="User" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
-
-                        <filter string="Company" icon="terp-sale"
+                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Section" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'section_id'}" />
+                        <filter string="Category" icon="terp-stock_symbol-selection"
+                        	domain="[]" context="{'group_by':'categ_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                        	domain="[]" context="{'group_by':'state'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             context="{'group_by':'company_id'}" />
-
-                        <filter string="Section" icon="terp-sale"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
-
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
-                            domain="[]" context="{'group_by':'state'}" />
-
-                        <filter string="Category" icon="terp-sale"
-                            domain="[]" context="{'group_by':'categ_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
+                        <filter string="Day" icon="terp-go-month"
                             domain="[]" context="{'group_by':'day'}"/>
-
-                        <filter string="Month" icon="terp-sale"
+                        <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" />
-
-                        <filter string="Year" icon="terp-sale"
+                        <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
 
                    <newline/>
                    <group  expand="0" string="Extended options..."  groups="base.group_extended">
-                         <filter icon="terp-sale"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
-
-                    	<filter icon="terp-sale"
-                    		string="Cancel"
-                    		domain="[('state','=','cancel')]"/>
-                    	<group>
-		            	    <separator orientation="vertical"/>
-			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-			             </group>
+                      <field name="partner_id"/>
+                   		<separator orientation="vertical"/>
+                         <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                       	<newline/>
+                        <field name="creation_date"/>
+                        <field name="opening_date"/>
+                        <field name="date_closed"/>
                    </group>
-                   <newline/>
                </search>
             </field>
         </record>
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index 93d865d7f74..3d2dc0373a5 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -27,10 +27,12 @@ class res_partner(osv.osv):
     
     _columns = {
                 'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
-                                                     'Opportunities', domain=[('type', '=', 'opportunity')]), 
+                                        'Opportunities', readonly=True, \
+                                        domain=[('type', '=', 'opportunity')]), 
                 'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
-                                                     'Meetings'), 
-                'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id', 'Phonecalls'), 
+                                        'Meetings', readonly=True), 
+                'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
+                                        'Phonecalls', readonly=True), 
                 }
 
 res_partner()
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 540c8d13186..24523f7b072 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -10,52 +10,54 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-               		<page string="CRM">
-						<field name="meeting_ids" colspan="4" nolabel="1" />
-						<field name="phonecall_ids" colspan="4" nolabel="1" />
-						<field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
-               				<tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
-				                <field name="create_date"/>
-				                <field name="partner_name"/>
-				                <field name="name"/>
-				                <field name="email_from"/>
-				                <field name="phone"/>
-				
-				                <field name="categ_id" invisible="1"/>
-				                <field name="type_id" invisible="1"/>
-				                <field name="referred" invisible="1"/>
-				
-				                <field name="stage_id"/>
-				                <button name="stage_previous" string="Previous"
-				                    states="open,pending" type="object" icon="gtk-go-back" />
-				                <button name="stage_next" string="Next"
-				                    states="open,pending" type="object"
-				                    icon="gtk-go-forward" />
-				                <field name="section_id"
-				                    invisible="context.get('invisible_section', True)" />
-				                <field name="user_id" />
-				                <field name="state" />
-				                <button name="case_open" string="Open"
-				                    states="draft,pending" type="object"
-				                    icon="gtk-go-forward" />
-				                <button name="case_close" string="Close"
-				                    states="open,draft,pending" type="object"
-				                    icon="gtk-close" />
-				                <button string="Convert to Opportunity"
-				                    name="convert_opportunity"
-				                    states="draft,open,pending" icon="gtk-index"
-				                    type="object" />
-				                <button name="case_escalate" string="Escalate"
-				                    states="open,draft,pending" type="object"
-				                    icon="gtk-go-up" />
-				                <button name="case_cancel" string="Cancel"
-				                    states="draft,open,pending" type="object"
-				                    icon="gtk-cancel" />
-				            </tree>
-               			</field>
-					</page>
-                </notebook>
+                <xpath expr="//notebook[last()]" position="after">
+                    <notebook colspan="4">
+		               		<page string="CRM">
+								<field name="meeting_ids" colspan="4" nolabel="1" />
+								<field name="phonecall_ids" colspan="4" nolabel="1" />
+								<field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
+		               				<tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+						                <field name="create_date"/>
+						                <field name="partner_name"/>
+						                <field name="name"/>
+						                <field name="email_from"/>
+						                <field name="phone"/>
+						
+						                <field name="categ_id" invisible="1"/>
+						                <field name="type_id" invisible="1"/>
+						                <field name="referred" invisible="1"/>
+						
+						                <field name="stage_id"/>
+						                <button name="stage_previous" string="Previous"
+						                    states="open,pending" type="object" icon="gtk-go-back" />
+						                <button name="stage_next" string="Next"
+						                    states="open,pending" type="object"
+						                    icon="gtk-go-forward" />
+						                <field name="section_id"
+						                    invisible="context.get('invisible_section', True)" />
+						                <field name="user_id" />
+						                <field name="state" />
+						                <button name="case_open" string="Open"
+						                    states="draft,pending" type="object"
+						                    icon="gtk-go-forward" />
+						                <button name="case_close" string="Close"
+						                    states="open,draft,pending" type="object"
+						                    icon="gtk-close" />
+						                <button string="Convert to Opportunity"
+						                    name="convert_opportunity"
+						                    states="draft,open,pending" icon="gtk-index"
+						                    type="object" />
+						                <button name="case_escalate" string="Escalate"
+						                    states="open,draft,pending" type="object"
+						                    icon="gtk-go-up" />
+						                <button name="case_cancel" string="Cancel"
+						                    states="draft,open,pending" type="object"
+						                    icon="gtk-cancel" />
+						            </tree>
+		               			</field>
+							</page>
+						</notebook>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/crm/scripts/php/crmlead.php b/addons/crm/scripts/php/crmlead.php
index aa23e5c78ba..91cfe7649ed 100644
--- a/addons/crm/scripts/php/crmlead.php
+++ b/addons/crm/scripts/php/crmlead.php
@@ -117,7 +117,7 @@ class Contact
 							  "email_from" => new xmlrpcval($post['email'], "string"),
 							  "phone" => new xmlrpcval($post['phone'], "string"),
 							  "partner_name" => new xmlrpcval($post['name'], "string"),
-							  "function_name" => new xmlrpcval($post["jobtitle"], "string"),
+							  "function" => new xmlrpcval($post["jobtitle"], "string"),
 							  "zip" => new xmlrpcval($post['zip'], "string"),
 							  "stage_id" => new xmlrpcval(6, "int"),
 							  "city" => new xmlrpcval($post['city'], "string"),
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 1f90f74f281..bbd437dba47 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -26,3 +26,4 @@
 "access_crm_lead2opportunity_partner","crm.lead2opportunity.partner","model_crm_lead2opportunity_partner","crm.group_crm_user",1,1,1,1
 "access_crm_installer","crm.installer.rule","model_crm_installer","crm.group_crm_user",1,1,1,1
 "access_crm_lead_forward_to_partner","crm.lead.forward.to.partner","model_crm_lead_forward_to_partner","crm.group_crm_user",2,2,2,2
+"access_mailgate_thread","mailgate.thread","model_mailgate_thread","crm.group_crm_user",1,1,1,1
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
index bfdbe912fed..13706c7bb17 100644
--- a/addons/crm/test/test_crm_lead.yml
+++ b/addons/crm/test/test_crm_lead.yml
@@ -82,9 +82,9 @@
 -  |   
    I can check that a lead and a business opportunity is now assigned to this
    lead.
--
-   # !python {model: crm.lead, id: crm_lead_newcustomer0}: 
-   #   - opportunity_id == False
+#-
+#   !python {model: crm.lead, id: crm_lead_newcustomer0}: 
+#     - opportunity_id == False
          
 -  |
    I check that the partner associated to this lead as the same country, phone number
@@ -97,10 +97,11 @@
     opportunity = obj_opportunity.browse(cr, uid, ids)[0]
     assert lead.partner_name == opportunity.partner_id.name
     assert lead.phone == opportunity.phone
--
-  |
-  # yaml is also not working  smpt server and send new email.
-  
+
+#-
+#  |
+#  yaml is also not working  smpt server and send new email.
+
 - |
   I configure with smtp server.
 - |
@@ -113,4 +114,4 @@
 - |
   I Reply to last Email to lead with some document attached.and check that communication history generated or not.
 
-  
+
diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 153f136cfb2..945066506d7 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -107,8 +107,8 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         #TODO: ids and context are not comming
         res = False
         msg_val = ''
-        res_id = False # Comes from context
-        model = None # Comes from context
+        res_id = context.get('active_id')
+        model = context.get('active_model')
         model_pool = self.pool.get(model)
         if not res_id or not model:
             return res
@@ -212,7 +212,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         lead = lead_proxy.browse(cr, uid, lead_id, context=context)
         if lead.type == 'lead':
                 field_names = [
-                    'partner_name', 'title', 'function_name', 'street', 'street2', 
+                    'partner_name', 'title', 'function', 'street', 'street2', 
                     'zip', 'city', 'country_id', 'state_id', 'email_from', 
                     'phone', 'fax', 'mobile'
                 ]
diff --git a/addons/crm/wizard/crm_forward_to_partner_view.xml b/addons/crm/wizard/crm_forward_to_partner_view.xml
index 1e8c6fc8583..b6295cfa3a9 100644
--- a/addons/crm/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm/wizard/crm_forward_to_partner_view.xml
@@ -9,7 +9,7 @@
                 <form string="Forward to Partner">
                     <separator string="User" colspan="4" />
                     <field name="email_from" colspan="2" />
-                    <field name="history" colspan="2" on_change="on_change_history(history)"/>
+                    <field name="history" colspan="2" on_change="on_change_history(history, context)"/>
                     <separator string="Send to" colspan="4" />
                     <field name="name" colspan="2" />
 					<group col="2" colspan="2" attrs="{ 'invisible' : [('name','!=','user')]}">
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 2decc56b806..98a075ba1ba 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -155,7 +155,7 @@ class crm_lead2partner(osv.osv_memory):
                         'email': lead.email_from,
                         'fax': lead.fax,
                         'title': lead.title,
-                        'function': lead.function_name,
+                        'function': lead.function,
                         'street': lead.street,
                         'street2': lead.street2,
                         'zip': lead.zip,
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 8458172104a..8bc63f2f1a1 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -99,7 +99,7 @@ class crm_send_new_email(osv.osv_memory):
                 model = hist.model_id.model
                 model_pool = self.pool.get(model)
                 res_ids = model_pool.search(cr, uid, [('thread_id','=', hist.thread_id.id)])
-                res_id = res_ids and res_ids[0] or False        
+                res_id = res_ids and res_ids[0] or False
                 case = model_pool.browse(cr, uid, res_id)
             emails = [obj.email_to] + (obj.email_cc or '').split(',')
             emails = filter(None, emails)
@@ -107,7 +107,11 @@ class crm_send_new_email(osv.osv_memory):
 
             body = case_pool.format_body(body)
             email_from = getattr(obj, 'email_from', False)
-            case_pool._history(cr, uid, [case], _('Send'), history=True, email=obj.email_to, details=body, email_from=email_from, message_id=message_id)
+
+            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)
 
             x_headers = dict()
             #x_headers = {
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index a625ec4dbc8..61cf7c6368d 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -2,6 +2,10 @@
 <openerp>
     <data>
 
+    <menuitem id="menu_config_claim" name="Claim"
+        groups="base.group_extended"
+        parent="base.menu_base_config" sequence="8" />
+
     <!-- Claims categories  -->
 
     <record id="crm_claim_categ_action" model="ir.actions.act_window">
@@ -13,8 +17,9 @@
         <field name="context">{'object_id':'crm.claim'}</field>
     </record>
 
-    <menuitem action="crm_claim_categ_action"
-        id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ" />
+    <menuitem action="crm_claim_categ_action" name="Categories"
+        id="menu_crm_case_claim-act" parent="menu_config_claim" />
+
 
     <!-- Claim Stages -->
 
@@ -27,8 +32,8 @@
         <field name="context">{'object_id':'crm.claim'}</field>
     </record>
 
-    <menuitem action="crm_claim_stage_act"
-            id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage" />
+     <menuitem action="crm_claim_stage_act" name="Stages"
+            id="menu_crm_claim_stage_act" parent="menu_config_claim" />
 
     <!-- Claim Resource Type -->
 
@@ -41,9 +46,9 @@
         <field name="context">{'object_id':'crm.claim'}</field>
     </record>
 
-    <menuitem action="crm_claim_resource_act"
+     <menuitem action="crm_claim_resource_act" name="Resource Type"
             id="menu_crm_claim_stage_act"
-            parent="crm.menu_crm_case_resource_type" />
+            parent="menu_config_claim" />
 
         <!-- Claims    -->
 
@@ -174,31 +179,38 @@
                    <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>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                       string="Reply to Last Email"
-                                       name="%(crm.action_crm_send_mail)d"
-                                       context="{'mail':'reply', 'model': 'crm.claim'}"
-                                       icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email_to"/>
-                                   <field name="date"/>
-                               </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" />
+                   <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="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>
 
@@ -246,16 +258,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
-                   <filter icon="gtk-new" string="Current" name="current"
+                   <filter icon="terp-check" string="Current" name="current"
                        domain="[('state','in',('draft', 'open'))]"
                        separator="1" help="Current Claims" default="1"
                    />
-                   <filter icon="gtk-execute"
+                   <filter icon="terp-camera_test"
                        string="In Progress"
                        domain="[('state','=','open')]"
                        separator="1" help="In Progress Claims"
                    />
-                   <filter icon="gtk-media-pause"
+                   <filter icon="terp-gtk-media-pause"
                        string="Pending"
                        domain="[('state','=','pending')]"
                        separator="1" help="All pending Claims"
@@ -264,18 +276,18 @@
                    <field name="name" select='1'/>
                    <field name="partner_id" select="1"/>
                    <field name="user_id" select="1" widget="selection">
-                           <filter icon="terp-partner"
+                           <filter icon="terp-personal-"
                                domain="[('user_id','=', False)]"
                                help="Unassigned Claims" />
                    </field>
                    <field name="section_id" select="1"
                        widget="selection"/>
                    <newline/>
-                   <group expand="1" string="Group By...">
-                       <filter string="Deadline" icon="terp-crm"
+                   <group expand="0" string="Group By...">
+                       <filter string="Deadline" icon="terp-go-month"
                            domain="[]"
                            context="{'group_by':'date_deadline'}" />
-                       <filter string="Closure" icon="terp-crm"
+                       <filter string="Closure" icon="terp-go-month"
                            domain="[]"
                            context="{'group_by':'date_closed'}" />
                    </group>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index ca6fdb95277..7892039436c 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -77,25 +77,25 @@
                   <group col="16" colspan="8">
                    		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
                    			domain="[('name','=',time.localtime()[0])]"/>-->
-                   		<filter string="This Year" icon="terp-hr"
+                   		<filter string="This Year" icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
 
                    		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
                    			domain="[('month','=',time.strftime('%%m'))]" />-->
-                       <filter string="This Month" icon="terp-hr" name="This Month"
+                       <filter string="This Month" icon="terp-go-month" name="This Month"
                     	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
 
-                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                       <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'))]"/>
 
                    		<separator orientation="vertical" />
-                        <filter icon="terp-hr"
+                        <filter icon="terp-document-new"
                     		string="Draft"
                     		domain="[('state','=','draft')]"/>
-					   <filter icon="terp-hr"
+					   <filter icon="terp-camera_test"
                     		string="Open"
                     		domain="[('state','=','open')]"/>
-					   <filter icon="terp-hr"
+					   <filter icon="terp-gtk-media-pause"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
 
@@ -105,69 +105,69 @@
                    			widget="selection"
                    			context="{'invisible_section': False}">
 
-                   			<filter icon="terp-crm"
+                   			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
                    				help="My section" />
 
                    		</field>
                    		<field name="company_id" widget="selection">
-                           <filter icon="terp-crm"
+                           <filter icon="terp-go-home"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
                         </field>
 
                       	<field name="user_id" select="1" widget="selection">
-	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
-                    <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-sale"
+                   <newline/>
+                   <group  expand="0" string="Group By...">
+                        <filter string="User" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
 
-                        <filter string="Company" icon="terp-sale"
+                        <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
 
-                        <filter string="Section" icon="terp-sale"
+                        <filter string="Section" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
 
-                        <filter string="Stage" icon="terp-sale" domain="[]"
+                        <filter string="Stage" icon="terp-stage" domain="[]"
                              context="{'group_by':'stage_id'}" />
 
-                        <filter string="Category" icon="terp-sale"
+                        <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
 
                         <separator orientation="vertical"/>
-                         <filter string="Priority" icon="terp-sale" domain="[]"
+                         <filter string="Priority" icon="terp-rating-rated" domain="[]"
                              context="{'group_by':'priority'}" />
-                         <filter string="Type" icon="terp-sale" domain="[]"
+                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
                              context="{'group_by':'type_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
+                        <filter string="Day" icon="terp-go-month"
                             domain="[]" context="{'group_by':'day'}"/>
 
-                        <filter string="Month" icon="terp-sale"
+                        <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" />
 
-                        <filter string="Year" icon="terp-sale"
+                        <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
                    <newline/>
                    <group  expand="0" string="Extended options..." groups="base.group_extended">
-                         <filter icon="terp-sale"
+                         <filter icon="terp-dialog-close"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
 
-                    	<filter icon="terp-sale"
+                    	<filter icon="terp-gtk-stop"
                     		string="Cancel"
                     		domain="[('state','=','cancel')]"/>
 
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 908e9c7616d..9ef1c936be4 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+           <!-- Fund Raising Configuration Menu -->
+        <menuitem id="menu_config_fundrising" name="Fund Raising"
+        groups="base.group_extended"
+        parent="base.menu_base_config" sequence="7" />
 
         <!-- Fund Raising Categories Form View -->
 
@@ -13,9 +17,9 @@
             <field name="context">{'object_id':'crm.fundraising'}</field>
         </record>
 
-        <menuitem action="crm_fund_categ_action"
+       <menuitem action="crm_fund_categ_action" name="Categories"
             id="menu_crm_case_fundraising-act" groups="base.group_extended"
-            parent="crm.menu_crm_case_categ" />
+            parent="menu_config_fundrising" />
 
         <!-- Fund Stage Form View -->
 
@@ -28,10 +32,11 @@
             <field name="context">{'object_id':'crm.fundraising'}</field>
         </record>
 
-        <menuitem action="crm_fundraising_stage_act"
-            groups="base.group_extended"
+         <menuitem action="crm_fundraising_stage_act"
+            groups="base.group_extended" name="Stages"
             id="menu_crm_fundraising_stage_act"
-            parent="crm.menu_crm_case_stage" />
+            parent="menu_config_fundrising" />
+
 
         <!-- Fund Resource Type Form View -->
 
@@ -44,10 +49,10 @@
             <field name="context">{'object_id':'crm.fundraising'}</field>
         </record>
 
-        <menuitem action="crm_fundraising_resource_act"
-            groups="base.group_extended"
+       <menuitem action="crm_fundraising_resource_act"
+            groups="base.group_extended" name="Resource Type"
             id="menu_crm_fundraising_resource_act"
-            parent="crm.menu_crm_case_resource_type" />
+            parent="menu_config_fundrising" />
 
 
         <!-- Fund Raising Tree View -->
@@ -195,18 +200,25 @@
                                         <field name="email_to"/>
                                         <field name="email_from"/>
                                     </group>
-                                    <newline/>
-                                    <field name="description" colspan="4" nolabel="1"/>
+                                    <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.fundraising'}"
-                                        icon="gtk-undo" type="action" />
+                                    string="Reply to Last Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'reply', 'model': 'crm.fundraising'}"
+                                    icon="gtk-undo" type="action" />
                                 </form>
                                 <tree string="Communication history">
-                                    <field name="description"/>
-                                    <field name="email_to"/>
                                     <field name="date"/>
+                                    <field name="email_from" />
+                                    <field name="email_to"/>
+                                    <field name="description"/>
                                 </tree>
                             </field>
                             <button colspan="4" string="Send New Email"
@@ -257,13 +269,13 @@
                 <field name="arch" type="xml">
                     <search string="Search Funds">
                         <group>
-                            <filter icon="gtk-new" string="Current"
+                            <filter icon="terp-check" string="Current"
                                 domain="[('state','in',('draft', 'open'))]" name="current"
                                 help="Current Funds" />
-                            <filter icon="gtk-yes" string="Open"
+                            <filter icon="terp-camera_test" string="Open"
                                 domain="[('state','=','open')]"
                                 help="Open Funds" />
-                            <filter icon="gtk-media-pause"
+                            <filter icon="terp-gtk-media-pause"
                                 string="Pending"
                                 domain="[('state','=','pending')]"
                                 help="Pending Funds" />
@@ -273,26 +285,26 @@
                                 string="Fund Description" />
                             <field name="user_id" select="1"
                                 widget="selection">
-                                <filter icon="terp-partner"
+                                <filter icon="terp-personal-"
                                     domain="[('user_id','=', False)]"
                                     help="Unassigned" />
                             </field>
                             <field name="section_id" select="1" widget="selection" string="Sales Team">
-                                <filter icon="terp-crm"
+                                <filter icon="terp-personal+"
                                     domain="[('section_id','=',context.get('section_id',False))]"
                                     help="My section" />
                             </field>
                         </group>
                         <newline/>
-                        <group expand="1" string="Group By...">
-                            <filter string="Partner" icon="terp-partner"
+                        <group expand="0" string="Group By...">
+                            <filter string="Partner" icon="terp-personal"
                                 domain="[]"
                                 context="{'group_by':'partner_id'}" />
-                            <filter string="Responsible" icon="terp-crm"
+                            <filter string="Responsible" icon="terp-personal"
                                 domain="[]"
                                 context="{'group_by':'user_id'}" />
                             <separator orientation="vertical" />
-                            <filter string="Type" icon="terp-project"
+                            <filter string="Type" icon="terp-stock_symbol-selection"
                                 domain="[]"
                                 context="{'group_by':'type_id'}" />
                         </group>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 20e8ef68b6b..6e27fc8390d 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -76,25 +76,25 @@
                   <group col="16" colspan="8">
                    		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
                    			domain="[('name','=',time.localtime()[0])]"/>-->
-                   		<filter string="This Year" icon="terp-hr"
+                   		<filter string="This Year" icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
 
                    		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
                    			domain="[('month','=',time.strftime('%%m'))]" />-->
-                       <filter string="This Month" icon="terp-hr" name="This Month"
+                       <filter string="This Month" icon="terp-go-month" name="This Month"
                     	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
 
-                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                       <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'))]"/>
 
                    		<separator orientation="vertical" />
-                        <filter icon="terp-hr"
+                        <filter icon="terp-document-new"
                     		string="Draft"
                     		domain="[('state','=','draft')]"/>
-					   <filter icon="terp-hr"
+					   <filter icon="terp-camera_test"
                     		string="Open"
                     		domain="[('state','=','open')]"/>
-					   <filter icon="terp-hr"
+					   <filter icon="terp-gtk-media-pause"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
 
@@ -104,60 +104,61 @@
                    			widget="selection"
                    			context="{'invisible_section': False}">
 
-                   			<filter icon="terp-crm"
+                   			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
                    				help="My section" />
 
                    		</field>
                    		<field name="company_id" widget="selection">
-                           <filter icon="terp-crm"
+                           <filter icon="terp-go-home"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
                         </field>
 
                       	<field name="user_id" select="1" widget="selection">
-	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
-                   <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-sale"
+                   <newline/>
+                   <group  expand="0" string="Group By...">
+                        <filter string="User" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
 
-                        <filter string="Company" icon="terp-sale"
+                        <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             context="{'group_by':'company_id'}" />
 
-                        <filter string="Section" icon="terp-sale"
+                        <filter string="Section" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
 
-                        <filter string="Category" icon="terp-sale"
+                        <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
+                        <filter string="Day" icon="terp-go-month"
                             domain="[]" context="{'group_by':'day'}"/>
 
-                        <filter string="Month" icon="terp-sale"
+                        <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" />
 
-                        <filter string="Year" icon="terp-sale"
+                        <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
 
                   </group>
                    <newline/>
                    <group  expand="0" string="Extended options..." groups="base.group_extended">
-                         <filter icon="terp-sale"
+                         <filter icon="terp-dialog-close"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
 
-                    	<filter icon="terp-sale"
+                    	<filter icon="terp-gtk-stop"
                     		string="Cancel"
                     		domain="[('state','=','cancel')]"/>
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index e771e0ba29f..57e7bba0199 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+       <!-- Helpdesk Support Categories Configuration Menu-->
+       <menuitem id="menu_config_helpdesk" name="Helpdesk"
+        groups="base.group_extended"
+        parent="base.menu_base_config" sequence="8" />
 
         <!-- Helpdesk Support Categories Form View -->
 
@@ -13,8 +17,8 @@
             <field name="context">{'object_id':'crm.helpdesk'}</field>
         </record>
 
-        <menuitem action="crm_helpdesk_categ_action"
-            id="menu_crm_case_helpdesk-act" parent="crm.menu_crm_case_categ" />
+        <menuitem action="crm_helpdesk_categ_action" name="Categories"
+            id="menu_crm_case_helpdesk-act" parent="menu_config_helpdesk" />
 
         <!--  Helpdesk Support Form View -->
 
@@ -135,18 +139,25 @@
                                         <field name="email_to"/>
                                         <field name="email_from"/>
                                     </group>
-                                    <newline/>
-                                    <field name="description" colspan="4" nolabel="1"/>
+                                    <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.helpdesk'}"
-                                        icon="gtk-undo" type="action" />
+                                    string="Reply to Last Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'reply', 'model': 'crm.helpdesk'}"
+                                    icon="gtk-undo" type="action" />
                                 </form>
                                 <tree string="Communication history">
-                                    <field name="description"/>
-                                    <field name="email_to"/>
                                     <field name="date"/>
+                                    <field name="email_from" />
+                                    <field name="email_to"/>
+                                    <field name="description"/>
                                 </tree>
                             </field>
                             <button colspan="4" string="Send New Email"
@@ -223,12 +234,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
-                    <filter icon="gtk-home" string="Today"
+                    <filter icon="terp-go-today" string="Today"
                         separator="1"
                         domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
                         help="Todays's Helpdesk Requests"
                         />
-                    <filter icon="gtk-media-rewind"
+                    <filter icon="terp-go-week"
                         string="7 Days" separator="1"
                         help="Helpdesk requests during last 7 days"
                         domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
@@ -238,17 +249,17 @@
                     <field name="partner_id" />
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="section_id" select="1" widget="selection" string="Sales Team">
-                        <filter icon="terp-crm"
+                        <filter icon="terp-personal+"
                             domain="[('section_id','=',context.get('section_id',False))]"
                             help="My section" />
                     </field>
                     <newline/>
-                    <group expand="1" string="Group By...">
-                        <filter string="Customer" icon="terp-crm"
+                    <group expand="0" string="Group By...">
+                        <filter string="Customer" icon="terp-personal"
                             domain="[]" context="{'group_by':'partner_id'}" />
-                        <filter string="State" icon="terp-crm" domain="[]"
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
                             context="{'group_by':'state'}" />
-                        <filter string="Priority" icon="terp-crm"
+                        <filter string="Priority" icon="terp-rating-rated"
                             domain="[]" context="{'group_by':'priority'}" />
                     </group>
                 </search>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index f564bb38d4d..c6875e21a4a 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -71,25 +71,25 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="9">
-                   		<filter string="This Year" icon="terp-hr"
+                   		<filter string="This Year" icon="terp-go-year"
                    			domain="[('name','=',time.localtime()[0])]"
                    			default="1" />
 
-                   		<filter string="This Month" icon="terp-hr"
+                   		<filter string="This Month" icon="terp-go-month"
                    			domain="[('month','=',time.strftime('%%m'))]"
                    			default="1" />
 
                    		<separator orientation="vertical" />
-                   		<filter string="Current" icon="terp-hr"
+                   		<filter string="Current" icon="terp-check"
                    			domain="[('state','in',('open','draft'))]" />
 
-                   		<filter string="Won" icon="terp-hr"
+                   		<filter string="Won" icon="terp-check"
                    			domain="[('state','=','done')]" />
 
-                   		<filter string="Lost" icon="terp-hr"
+                   		<filter string="Lost" icon="terp-dialog-close"
                    			domain="[('state','=','cancel')]" />
 
-                   		<filter string="Deadline" icon="terp-hr"
+                   		<filter string="Deadline" icon="terp-go-month"
                    			domain="[('date_deadline','=',time.strftime('%%m/%%d/%%Y'))]" />
 
                    		<separator orientation="vertical" />
@@ -98,14 +98,14 @@
                    			widget="selection"
                    			context="{'invisible_section': False}">
 
-                   			<filter icon="terp-crm"
+                   			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
                    				help="My section" />
 
                    		</field>
                    		<field name="company_id" widget="selection">
-                           <filter icon="terp-crm"
+                           <filter icon="terp-go-home"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
@@ -114,59 +114,41 @@
                          <field name="user_id" widget="selection"/>
                    </group>
                    <newline/>
-                  <group expand="1" string="Group By...">
-                        <filter string="User" icon="terp-sale"
+                  <group expand="0" string="Group By...">
+                        <filter string="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}"
                             default="1" />
 
-                        <filter string="Company" icon="terp-sale"
+                        <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             context="{'group_by':'company_id'}" />
 
-                        <filter string="Section" icon="terp-sale"
+                        <filter string="Section" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
 
-                        <filter string="Partner" icon="terp-sale"
+                        <filter string="Partner" icon="terp-personal"
                             domain="[]"
                             context="{'group_by':'partner_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="Month" icon="terp-sale"
+                        <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" />
 
-                        <filter string="Year" icon="terp-sale"
+                        <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
 
                   </group>
                     <newline/>
                    <group expand="0" string="Extended options..."  groups="base.group_extended">
-                        <filter icon="terp-sale"
-                            string="Lowest"
-                            domain="[('priority','=','5')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Low"
-                            domain="[('priority','=','4')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Normal"
-                            domain="[('priority','=','3')]"/>
-
-                        <filter icon="terp-sale"
-                            string="High"
-                            domain="[('priority','=','2')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Highest"
-                            domain="[('priority','=','1')]"/>
-
+                        <filter string="Priority" icon="terp-rating-rated"
+                            domain="[]" context="{'group_by':'priority'}" />
                    </group>
-                   
+
 
                </search>
             </field>
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index 040dff1ff38..eeb95d77fc1 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -15,9 +15,9 @@
           <field name="view_type">form</field>
           <field name="view_mode">tree,form</field>
         </record>
-        <menuitem parent="base.menu_crm_configuration" id="menu_segm_questionnaire"
-                  action="open_questionnaires" />
 
+        <menuitem parent="base.menu_crm_config_sales" id="menu_segm_questionnaire"
+                  action="open_questionnaires" />
 
         <record model="ir.actions.act_window" id="open_questions">
           <field name="name">Questions</field>
@@ -25,7 +25,8 @@
           <field name="view_type">form</field>
           <field name="view_mode">tree,form</field>
         </record>
-        <menuitem parent="base.menu_crm_configuration" id="menu_segm_answer"
+
+        <menuitem parent="base.menu_crm_config_sales" id="menu_segm_answer"
                   action="open_questions" />
 
 <!-- Profiling Questionnaire Tree view  -->
diff --git a/addons/crm_profiling/i18n/pt.po b/addons/crm_profiling/i18n/pt.po
index 90a457d5732..eb95525ad0c 100644
--- a/addons/crm_profiling/i18n/pt.po
+++ b/addons/crm_profiling/i18n/pt.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-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 8a78ae46fdd..ac227827d11 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Generic Modules/Others',
     'description': """This is a complete document management system:
     * User Authentication
-    * Document Indexation
+    * Document Indexation :- .pptx and .docx files are not support in windows platform.
 
     ATTENTION:
     - When you install this module in a running company that have already PDF files stored into the database,
diff --git a/addons/document/document.py b/addons/document/document.py
index 2b2ac2f7587..5d3075f7a4a 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -75,7 +75,7 @@ class document_file(osv.osv):
         'user_id': fields.many2one('res.users', 'Owner', select=1),
         'group_ids': fields.many2many('res.groups', 'document_group_rel', 'item_id', 'group_id', 'Groups'),
         # the directory id now is mandatory. It can still be computed automatically.
-        'parent_id': fields.many2one('document.directory', 'Directory', select=1, required=True),
+        'parent_id': fields.many2one('document.directory', 'Directory', select=1),
         'file_size': fields.integer('File Size', required=True),
         'file_type': fields.char('Content Type', size=128),
         # If ir.attachment contained any data before document is installed, preserve
@@ -88,11 +88,16 @@ class document_file(osv.osv):
         'create_uid':  fields.many2one('res.users', 'Creator', readonly=True),
         'store_method': fields.selection([('db', 'Database'), ('fs', 'Filesystem'), ('link', 'Link')], "Storing Method"),
         'datas': fields.function(_data_get, method=True, fnct_inv=_data_set, string='File Content', type="binary", nodrop=True),
+        'url': fields.char('File URL',size=64),
         'store_fname': fields.char('Stored Filename', size=200),
         'res_model': fields.char('Attached Model', size=64), #res_model
         'res_id': fields.integer('Attached ID'), #res_id
         'partner_id':fields.many2one('res.partner', 'Partner', select=1),
-        'title': fields.char('Resource Title', size=64),
+        'type':fields.selection([
+            ('url','URL'),
+            ('binary','Binary'),
+
+        ],'Type', help="Type is used to separate URL and binary File"),
     }
 
     def __get_def_directory(self, cr, uid, context=None):
@@ -103,6 +108,7 @@ class document_file(osv.osv):
         'user_id': lambda self, cr, uid, ctx:uid,
         'file_size': lambda self, cr, uid, ctx:0,
         'store_method': lambda *args: 'db',
+        'type': 'binary',
         'parent_id': __get_def_directory
     }
     _sql_constraints = [
@@ -155,7 +161,6 @@ class document_file(osv.osv):
     def create(self, cr, uid, vals, context=None):
         if not context:
             context = {}
-        vals['title'] = vals['name']
         vals['parent_id'] = context.get('parent_id', False) or vals.get('parent_id', False)
         if not vals['parent_id']:
             vals['parent_id'] = self.pool.get('document.directory')._get_root_directory(cr,uid, context)
@@ -168,8 +173,6 @@ class document_file(osv.osv):
             result = obj_model.read(cr, uid, [vals['res_id']], ['name', 'partner_id', 'address_id'], context=context)
             if len(result):
                 obj = result[0]
-                if obj.get('name', False):
-                    vals['title'] = (obj.get('name', ''))[:60]
                 if obj_model._name == 'res.partner':
                     vals['partner_id'] = obj['id']
                 elif obj.get('address_id', False):
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 56e52aa9b69..e395f96833d 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -104,11 +104,9 @@ class document_directory(osv.osv):
     ]
     def name_get(self, cr, uid, ids, context={}):
         res = []
-        all_ids = self.search(cr,uid,[])
+        if not self.search(cr,uid,[('id','in',ids)]):
+            ids = []
         for d in self.browse(cr, uid, ids, context=context):
-            if d.id not in all_ids:
-                continue
-
             s = ''
             d2 = d
             while d2 and d2.parent_id:
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 720ab6de69f..0bab191d942 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -118,7 +118,7 @@
     <record model="ir.ui.view" id="view_document_directory_tree">
         <field name="name">document.directory</field>
         <field name="model">document.directory</field>
-        <field name="type">tree</field>        
+        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Directories" toolbar="1">
                 <field name="name"/>
@@ -179,71 +179,96 @@
             <form string="Documents">
                 <group colspan="4" col="6">
                     <field name="name" select="1" />
-                    <field name="title" select="1"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
-                    <field name="parent_id"/>
+                    <field name="type"/>
+                     <field name="parent_id"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Attachment">
                     <group col="2" colspan="2">
                         <separator string="Data" colspan="2"/>
+                        <group col="2" colspan="2" attrs="{'invisible':[('type','=','url')]}">
                         <field name="datas" filename="datas_fname"/>
                         <field name="datas_fname" select="1"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Attached To" colspan="2"/>
-                        <field name="res_model" readonly="1"/>
-                        <field name="res_id" readonly="1"/>
-                    </group>
-                    <separator string="Preview" colspan="4"/>
-                    <field
-                        name="preview"
-                        widget="image"
-                        readonly="1"
-                        nolabel="1"
-                        colspan="4"
-                        img_height="400"
-                        img_width="800"/>
+                        </group>
+                        <group col="2" colspan="2" attrs="{'invisible':[('type','=','binary')]}">
+                        <field name="url" widget="url"/>
+                        </group>
 
-                </page><page string="Indexed Content">
-                    <field name="index_content" nolabel="1" colspan="4" select="1"/>
-                </page><page string="Security">
-                    <field name="group_ids" colspan="4" nolabel="1"/>
-                </page><page string="Others Info">
-                    <group colspan="4" col="4">
-                        <separator string="File Information" colspan="4"/>
-                        <field name="file_size" readonly="1"/>
-                        <newline/>
+                    </group>
+
+
+                    <group col="2" colspan="2">
+                        <separator string="Relation" colspan="2"/>
+                         <field name="res_name" readonly="1"/>
+                         <field name="partner_id"/>
+                          <field name="user_id"/>
+                    </group>
+                    <group col="4" colspan="4">
                         <separator string="History" colspan="4"/>
+                        <group col="4" colspan="4">
                         <field name="create_uid"/>
                         <field name="create_date"/>
+                        </group>
+                        <group col="4" colspan="4">
                         <field name="write_uid"/>
                         <field name="write_date"/>
+                        </group>
                     </group>
 
-                </page><page string="Notes">
+                </page>
+                <page string="Security">
+                    <field name="group_ids" colspan="4" nolabel="1"/>
+                </page>
+
+                <page string="Notes">
                     <field colspan="4" name="description" nolabel="1"/>
                 </page>
                 </notebook>
             </form>
         </field>
     </record>
+
+    <record id="view_attach_filter" model="ir.ui.view">
+            <field name="name">IR Attachment</field>
+            <field name="model">ir.attachment</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+             <search string="IR Attachment">
+             <filter icon="terp-go-month" string="Recent"
+                    help="less 1 month modified/created attachments"
+                    domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                />
+                    <separator orientation="vertical"/>
+                  <field name="user_id" widget="selection">
+                    <filter icon="terp-personal"
+                        domain="[('user_id','=', False)]"
+                        help="Filter on my Attachment" />
+                    </field>
+                    <field name="partner_id" widget="selection"/>
+                    <newline/>
+                 <group expand="0" string="Group By...">
+                    <filter string="Partner" icon="terp-personal" domain="[]"
+                       context="{'group_by':'partner_id'}" />
+                    <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
+                 </group>
+              </search>
+             </field>
+         </record>
     <record model="ir.ui.view" id="view_document_file_tree">
         <field name="name">ir.attachment</field>
         <field name="model">ir.attachment</field>
         <field name="type">tree</field>
         <field name="priority" eval="1"/>
         <field name="arch" type="xml">
-            <tree string="Documents">
+            <tree colors="blue:type in ('url')" string="Documents">
                 <field name="name"/>
-                <field name="title" />
-                <field name="partner_id"/>
+                <field name="type"/>
                 <field name="datas_fname"/>
                 <field name="user_id"/>
                 <field name="create_date"/>
                 <field name="write_date"/>
             </tree>
+
         </field>
     </record>
 
diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index efe3a8183ab..d3964fc2d99 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -44,7 +44,6 @@ class report_document_user(osv.osv):
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
         'user_id':fields.integer('Owner', readonly=True),
         'user':fields.char('User',size=64,readonly=True),
-        'file_title': fields.char('File Name',size=64,readonly=True),
         'directory': fields.char('Directory',size=64,readonly=True),
         'create_date': fields.datetime('Date Created', readonly=True),
         'change_date': fields.datetime('Modified Date', readonly=True),
@@ -66,7 +65,6 @@ class report_document_user(osv.osv):
                      d.name as directory,
                      f.create_date as create_date,
                      f.file_size as file_size,
-                     min(f.title) as file_title,
                      min(d.type) as type,
                      f.write_date as change_date
                  from ir_attachment f
@@ -83,7 +81,6 @@ class report_files_partner(osv.osv):
     _auto = False
     _columns = {
         'name': fields.char('Year',size=64,required=False, readonly=True),
-        'file_title': fields.char('File Name',size=64,readonly=True),
         'directory': fields.char('Directory',size=64,readonly=True),
         'create_date': fields.datetime('Date Created', readonly=True),
         'change_date': fields.datetime('Modified Date', readonly=True),
@@ -101,7 +98,6 @@ class report_files_partner(osv.osv):
                 select min(f.id) as id,count(*) as nbr,
                        to_char(f.create_date,'YYYY') as name,
                        min(to_char(f.create_date,'MM')) as month,
-                       min(f.title) as file_title,
                        p.name as partner
                 from ir_attachment f
                 inner join res_partner p
@@ -145,7 +141,6 @@ class report_document_wall(osv.osv):
         'user_id':fields.many2one('res.users', 'Owner',readonly=True),
         'user':fields.char('User',size=64,readonly=True),
         'month': fields.char('Month', size=24,readonly=True),
-        'file_name':fields.char('Last Posted File Name',size=64,readonly=True),
         'last':fields.datetime('Last Posted Time', readonly=True),
              }
 
@@ -153,7 +148,6 @@ class report_document_wall(osv.osv):
          cr.execute("""
             create or replace view report_document_wall as (
                select max(f.id) as id,
-               min(title) as file_name,
                to_char(min(f.create_date),'YYYY-MM-DD HH24:MI:SS') as last,
                f.user_id as user_id, f.user_id as user,
                to_char(f.create_date,'Month') as month
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index c6d59fa3d29..00743d768e7 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -8,7 +8,6 @@
             <field name="arch" type="xml">
                 <form string="Files">
                     <field name="name" select="1"/>
-                    <field name="file_title" select="1"/>
                     <field name="user" select="1"/>
                     <field name="directory" select="1"/>
                     <field name="file_size"/>
@@ -26,7 +25,6 @@
                 <tree string="Files">
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="file_title"/>
                     <field name="user" select="1"/>
                     <field name="directory" select="1"/>
                     <field name="file_size"/>
@@ -43,12 +41,11 @@
                 <search string="All users files">
                 	<group col="12" colspan="4">
                         <separator orientation="vertical"/>
-						<filter icon="terp-stock" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
-						<filter icon="terp-stock" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
+						<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
+						<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
 						<separator orientation="vertical"/>
 						<field name="name" select="1"/>
 						<field name="month" select="1"/>
-						<field name="file_title" select="1"/>
 	                    <field name="user" select="1"/>
 	                    <field name="directory" select="1"/>
 	           		</group>
@@ -79,13 +76,11 @@
                 <form string="Wall of Shame">
                     <field name="user_id" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="file_name" select="1"/>
                     <field name="last"/>
                 </form>
             </field>
         </record>
 
-
         <record model="ir.ui.view" id="view_document_wall_tree">
             <field name="name">report.document.wall.tree</field>
             <field name="model">report.document.wall</field>
@@ -94,7 +89,6 @@
                 <tree string="Wall of Shame">
                     <field name="user_id" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="file_name"/>
                     <field name="last"/>
                 </tree>
             </field>
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index 4979c05a17d..2f2f2094bc3 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -57,6 +57,7 @@ class PptxIndex(indexer):
         return ['.pptx']
 
     def _doIndexFile(self,fname):
+        # pptx2txt.pl package not support in windows platform.
         # Download pptx2txt package from  http://sourceforge.net/projects/pptx2txt/" link.
         # To install this tool, just copy pptx2txt.pl to appropriate place (e.g. /usr/bin directory)
         fp = Popen(['pptx2txt.pl', fname], shell=False, stdout=PIPE).stdout
@@ -88,6 +89,7 @@ class DocxIndex(indexer):
         return ['.docx']
 
     def _doIndexFile(self,fname):
+        # docx2txt.pl package not support in windows platform.
         # Download docx2txt package from  "http://sourceforge.net/projects/docx2txt/" link.   
         # In case, you don't want to use Makefile for installation, you can follow these steps for manual installation.
         # Copy docx2txt.pl, docx2txt.sh and docx2txt.config to appropriate place (e.g. /usr/bin directory) . used following command.
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 70870b50783..66e4a994cba 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -558,8 +558,7 @@ class abstracted_fs:
                 
                 if dst_obj2:                    
                     ressource_type_id = pool.get('ir.model').search(cr, uid, [('model','=',dst_obj2._name)])[0]
-                    ressource_id = dst_obj2.id
-                    title = dst_obj2.name
+                    ressource_id = dst_obj2.id                    
                     ressource_model = dst_obj2._name                    
                     if dst_obj2._name == 'res.partner':
                         partner_id = dst_obj2.id
@@ -569,8 +568,7 @@ class abstracted_fs:
                     ressource_type_id = False
                     ressource_id = False
                     ressource_model = False
-                    partner_id = False
-                    title = False                
+                    partner_id = False                               
                 pool.get('document.directory').write(cr, uid, result['directory'], {
                     'name' : dst_basename,
                     'ressource_id': ressource_id,
@@ -579,8 +577,7 @@ class abstracted_fs:
                 })
                 val = {
                     'res_id': ressource_id,
-                    'res_model': ressource_model,
-                    'title': title,
+                    'res_model': ressource_model,                    
                     'partner_id': partner_id
                 }
                 pool.get('ir.attachment').write(cr, uid, result['attachment'], val)
@@ -603,7 +600,6 @@ class abstracted_fs:
                     'res_model': False,
                     'name': dst_basename,
                     'datas_fname': dst_basename,
-                    'title': dst_basename,
                 }
 
                 if (dst_obj and (dst_obj.type in ('directory','ressource'))) or not dst_obj2:
@@ -613,8 +609,7 @@ class abstracted_fs:
 
                 if dst_obj2:
                     val['res_model'] = dst_obj2._name
-                    val['res_id'] = dst_obj2.id
-                    val['title'] = dst_obj2.name
+                    val['res_id'] = dst_obj2.id                    
                     if dst_obj2._name == 'res.partner':
                         val['partner_id'] = dst_obj2.id
                     else:                        
diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py
index d04251a229d..3a85b3061a7 100644
--- a/addons/document_ftp/ftpserver/ftpserver.py
+++ b/addons/document_ftp/ftpserver/ftpserver.py
@@ -1975,7 +1975,7 @@ class FTPHandler(asynchat.async_chat):
         # which IPv6 address to use for binding the socket?
         # Unfortunately RFC-2428 does not provide satisfing information
         # on how to do that.  The assumption is that we don't have any way
-        # to know wich address to use, hence we just use the same address
+        # to know which address to use, hence we just use the same address
         # family used on the control connection.
         if not line:
             self._make_epasv(extmode=True)
diff --git a/addons/document_ics/__openerp__.py b/addons/document_ics/__openerp__.py
index 4f3326fe635..4ad979fec5c 100644
--- a/addons/document_ics/__openerp__.py
+++ b/addons/document_ics/__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/>.
 #
 ##############################################################################
 
diff --git a/addons/email_template/__init__.py b/addons/email_template/__init__.py
new file mode 100755
index 00000000000..c959f7204da
--- /dev/null
+++ b/addons/email_template/__init__.py
@@ -0,0 +1,5 @@
+import email_template_account
+import email_template
+import email_template_mailbox
+import wizard
+
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
new file mode 100755
index 00000000000..9c5f7bb5c70
--- /dev/null
+++ b/addons/email_template/__openerp__.py
@@ -0,0 +1,24 @@
+{
+    "name" : "Email Template for Open ERP",
+    "version" : "0.7 RC",
+    "author" : "Open ERP",
+    "website" : "http://openerp.com",
+    "category" : "Added functionality",
+    "depends" : ['base'],
+    "description": """
+    Email Template is extraction of Power Email basically just to send the emails.
+    """,
+    "init_xml": ['email_template_scheduler_data.xml'],
+    "update_xml": [
+        'security/email_template_security.xml',
+        'email_template_workflow.xml',
+        'email_template_account_view.xml',
+        'email_template_view.xml',
+        'email_template_mailbox_view.xml',
+        'wizard/email_template_send_wizard_view.xml',
+    ],
+    "installable": True,
+    "active": False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
new file mode 100755
index 00000000000..6c46da458c6
--- /dev/null
+++ b/addons/email_template/email_template.py
@@ -0,0 +1,698 @@
+import base64
+import random
+import time
+import types
+import netsvc
+
+LOGGER = netsvc.Logger()
+
+TEMPLATE_ENGINES = []
+
+from osv import osv, fields
+from tools.translate import _
+from mako.template import Template  #For backward combatibility
+try:
+    from mako.template import Template as MakoTemplate
+    from mako import exceptions
+    TEMPLATE_ENGINES.append(('mako', 'Mako Templates'))
+except:
+    LOGGER.notifyChannel(
+                         _("Email Template"),
+                         netsvc.LOG_ERROR,
+                         _("Mako templates not installed")
+                         )
+try:
+    from django.template import Context, Template as DjangoTemplate
+    #Workaround for bug:
+    #http://code.google.com/p/django-tagging/issues/detail?id=110
+    from django.conf import settings
+    settings.configure()
+    #Workaround ends
+    TEMPLATE_ENGINES.append(('django', 'Django Template'))
+except:
+    LOGGER.notifyChannel(
+                         _("Email Template"),
+                         netsvc.LOG_ERROR,
+                         _("Django templates not installed")
+                         )
+
+import email_template_engines
+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
+    @param cursor: Database Cursor
+    @param user: ID of current user
+    @param recid: ID of the target record under evaluation
+    @param message: The expression to be evaluated
+    @param template: BrowseRecord object of the current template
+    @param context: Open ERP Context
+    @return: Computed message (unicode) or u""
+    """
+    pool = pooler.get_pool(cursor.dbname)
+    if message is None:
+        message = {}
+    #Returns the computed expression
+    if message:
+        try:
+            message = tools.ustr(message)
+            object = pool.get(template.model_int_name).browse(cursor, user, recid, context)
+            env = {
+                'user':pool.get('res.users').browse(cursor, user, user, context),
+                'db':cursor.dbname
+                   }
+            if template.template_language == 'mako':
+                templ = MakoTemplate(message, input_encoding='utf-8')
+                reply = MakoTemplate(message).render_unicode(object=object,
+                                                             peobject=object,
+                                                             env=env,
+                                                             format_exceptions=True)
+            elif template.template_language == 'django':
+                templ = DjangoTemplate(message)
+                env['object'] = object
+                env['peobject'] = object
+                reply = templ.render(Context(env))
+            return reply or False
+        except Exception:
+            return u""
+    else:
+        return message
+
+class email_template(osv.osv):
+    "Templates for sending Email"
+    
+    _name = "email.template"
+    _description = 'Email Templates for Models'
+
+    def change_model(self, cursor, user, ids, object_name, context=None):
+        if object_name:
+            mod_name = self.pool.get('ir.model').read(
+                                              cursor,
+                                              user,
+                                              object_name,
+                                              ['model'], context)['model']
+        else:
+            mod_name = False
+        return {
+                'value':{'model_int_name':mod_name}
+                }
+
+    _columns = {
+        'name' : fields.char('Name of Template', size=100, required=True),
+        'object_name':fields.many2one('ir.model', 'Model'),
+        'model_int_name':fields.char('Model Internal Name', size=200,),
+        'def_to':fields.char(
+                 'Recepient (To)',
+                 size=250,
+                 help="The default recepient of email." 
+                 "Placeholders can be used here."),
+        'def_cc':fields.char(
+                 'Default CC',
+                 size=250,
+                 help="The default CC for the email."
+                 " Placeholders can be used here."),
+        'def_bcc':fields.char(
+                  'Default BCC',
+                  size=250,
+                  help="The default BCC for the email."
+                  " Placeholders can be used here."),
+        'lang':fields.char(
+                   'Language',
+                   size=250,
+                   help="The default language for the email."
+                   " Placeholders can be used here. "
+                   "eg. ${object.partner_id.lang}"),
+        'def_subject':fields.char(
+                  'Default Subject',
+                  size=200,
+                  help="The default subject of email."
+                  " Placeholders can be used here.",
+                  translate=True),
+        'def_body_text':fields.text(
+                    'Standard Body (Text)',
+                    help="The text version of the mail",
+                    translate=True),
+        'def_body_html':fields.text(
+                    'Body (Text-Web Client Only)',
+                    help="The text version of the mail",
+                    translate=True),
+        'use_sign':fields.boolean(
+                  'Use Signature',
+                  help="the signature from the User details" 
+                  "will be appened to the mail"),
+        'file_name':fields.char(
+                'File Name Pattern',
+                size=200,
+                help="File name pattern can be specified with placeholders." 
+                "eg. 2009_SO003.pdf",
+                translate=True),
+        'report_template':fields.many2one(
+                  'ir.actions.report.xml',
+                  'Report to send'),
+        'ref_ir_act_window':fields.many2one(
+                    'ir.actions.act_window',
+                    'Window Action',
+                    readonly=True),
+        'ref_ir_value':fields.many2one(
+                   'ir.values',
+                   'Wizard Button',
+                   readonly=True),
+        'allowed_groups':fields.many2many(
+                  'res.groups',
+                  'template_group_rel',
+                  'templ_id', 'group_id',
+                  string="Allowed User Groups",
+                  help="Only users from these groups will be"
+                  " allowed to send mails from this Template"),
+        'enforce_from_account':fields.many2one(
+                   'email_template.account',
+                   string="Enforce From Account",
+                   help="Emails will be sent only from this account.",
+                   domain="[('company','=','yes')]"),
+        'model_object_field':fields.many2one(
+                 'ir.model.fields',
+                 string="Field",
+                 help="Select the field from the model you want to use."
+                 "\nIf it is a relationship field you will be able to "
+                 "choose the nested values in the box below\n(Note:If "
+                 "there are no values make sure you have selected the"
+                 " correct model)",
+                 store=False),
+        'sub_object':fields.many2one(
+                 'ir.model',
+                 'Sub-model',
+                 help='When a relation field is used this field'
+                 ' will show you the type of field you have selected',
+                 store=False),
+        'sub_model_object_field':fields.many2one(
+                 'ir.model.fields',
+                 'Sub Field',
+                 help="When you choose relationship fields "
+                 "this field will specify the sub value you can use.",
+                 store=False),
+        'null_value':fields.char(
+                 'Null Value',
+                 help="This Value is used if the field is empty",
+                 size=50, store=False),
+        'copyvalue':fields.char(
+                'Expression',
+                size=100,
+                help="Copy and paste the value in the "
+                "location you want to use a system value.",
+                store=False),
+        'table_html':fields.text(
+             'HTML code',
+             help="Copy this html code to your HTML message"
+             " body for displaying the info in your mail.",
+             store=False),
+        #Template language(engine eg.Mako) specifics
+        'template_language':fields.selection(
+                TEMPLATE_ENGINES,
+                'Templating Language',
+                required=True
+                )
+    }
+
+    _defaults = {
+
+    }
+    _sql_constraints = [
+        ('name', 'unique (name)', _('The template name must be unique !'))
+    ]
+
+    def create(self, cr, uid, vals, context=None):
+        id = super(email_template, self).create(cr, uid, vals, context)
+        src_obj = self.pool.get('ir.model').read(cr, uid, vals['object_name'], ['model'], context)['model']
+        vals['ref_ir_act_window'] = self.pool.get('ir.actions.act_window').create(cr, uid, {
+             'name': _("%s Mail Form") % vals['name'],
+             'type': 'ir.actions.act_window',
+             'res_model': 'email_template.send.wizard',
+             'src_model': src_obj,
+             'view_type': 'form',
+             'context': "{'src_model':'%s','template_id':'%d','src_rec_id':active_id,'src_rec_ids':active_ids}" % (src_obj, id),
+             'view_mode':'form,tree',
+             'view_id': self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'email_template.send.wizard.form')], context=context)[0],
+             'target': 'new',
+             'auto_refresh':1
+        }, context)
+        vals['ref_ir_value'] = self.pool.get('ir.values').create(cr, uid, {
+             'name': _('Send Mail (%s)') % vals['name'],
+             'model': src_obj,
+             'key2': 'client_action_multi',
+             'value': "ir.actions.act_window," + str(vals['ref_ir_act_window']),
+             'object': True,
+         }, context)
+        self.write(cr, uid, id, {
+            'ref_ir_act_window': vals['ref_ir_act_window'],
+            'ref_ir_value': vals['ref_ir_value'],
+        }, context)
+        return id
+
+    def unlink(self, cr, uid, ids, context=None):
+        for template in self.browse(cr, uid, ids, context):
+            obj = self.pool.get(template.object_name.model)
+            try:
+                if template.ref_ir_act_window:
+                    self.pool.get('ir.actions.act_window').unlink(cr, uid, template.ref_ir_act_window.id, context)
+                if template.ref_ir_value:
+                    self.pool.get('ir.values').unlink(cr, uid, template.ref_ir_value.id, context)
+            except:
+                raise osv.except_osv(_("Warning"), _("Deletion of Record failed"))
+        return super(email_template, self).unlink(cr, uid, ids, context)
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        old = self.read(cr, uid, id, ['name'], context=context)
+        new_name = _("Copy of template ") + old.get('name', 'No Name')
+        check = self.search(cr, uid, [('name', '=', new_name)], context=context)
+        if check:
+            new_name = new_name + '_' + random.choice('abcdefghij') + random.choice('lmnopqrs') + random.choice('tuvwzyz')
+        default.update({'name':new_name})
+        return super(email_template, self).copy(cr, uid, id, default, context)
+    
+    def compute_pl(self,
+                   model_object_field,
+                   sub_model_object_field,
+                   null_value, template_language='mako'):
+        """
+        Returns the expression based on data provided
+        @param model_object_field: First level field
+        @param sub_model_object_field: Second level drilled down field (M2O)
+        @param null_value: What has to be returned if the value is empty
+        @param template_language: The language used for templating
+        @return: computed expression
+        """
+        #Configure for MAKO
+        copy_val = ''
+        if template_language == 'mako':
+            if model_object_field:
+                copy_val = "${object." + model_object_field
+            if sub_model_object_field:
+                copy_val += "." + sub_model_object_field
+            if null_value:
+                copy_val += " or '" + null_value + "'"
+            if model_object_field:
+                copy_val += "}"
+        elif template_language == 'django':
+            if model_object_field:
+                copy_val = "{{object." + model_object_field
+            if sub_model_object_field:
+                copy_val += "." + sub_model_object_field
+            if null_value:
+                copy_val = copy_val + '|default:"' + null_value + '"'  
+            copy_val = copy_val + "}}"        
+        return copy_val 
+            
+    def onchange_model_object_field(self, cr, uid, ids, model_object_field, template_language, context=None):
+        if not model_object_field:
+            return {}
+        result = {}
+        field_obj = self.pool.get('ir.model.fields').browse(cr, uid, model_object_field, context)
+        #Check if field is relational
+        if field_obj.ttype in ['many2one', 'one2many', 'many2many']:
+            res_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', field_obj.relation)], context=context)
+            if res_ids:
+                result['sub_object'] = res_ids[0]
+                result['copyvalue'] = self.compute_pl(False,
+                                                      False,
+                                                      False,
+                                                      template_language)
+                result['sub_model_object_field'] = False
+                result['null_value'] = False
+        else:
+            #Its a simple field... just compute placeholder
+            result['sub_object'] = False
+            result['copyvalue'] = self.compute_pl(field_obj.name,
+                                                  False,
+                                                  False,
+                                                  template_language
+                                                  )
+            result['sub_model_object_field'] = False
+            result['null_value'] = False
+        return {'value':result}
+        
+    def onchange_sub_model_object_field(self, cr, uid, ids, model_object_field, sub_model_object_field, template_language, context=None):
+        if not model_object_field or not sub_model_object_field:
+            return {}
+        result = {}
+        field_obj = self.pool.get('ir.model.fields').browse(cr, uid, model_object_field, context)
+        if field_obj.ttype in ['many2one', 'one2many', 'many2many']:
+            res_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', field_obj.relation)], context=context)
+            sub_field_obj = self.pool.get('ir.model.fields').browse(cr, uid, sub_model_object_field, context)
+            if res_ids:
+                result['sub_object'] = res_ids[0]
+                result['copyvalue'] = self.compute_pl(field_obj.name,
+                                                      sub_field_obj.name,
+                                                      False,
+                                                      template_language
+                                                      )
+                result['sub_model_object_field'] = sub_model_object_field
+                result['null_value'] = False
+        else:
+            #Its a simple field... just compute placeholder
+            result['sub_object'] = False
+            result['copyvalue'] = self.compute_pl(field_obj.name,
+                                                  False,
+                                                  False,
+                                                  template_language
+                                                  )
+            result['sub_model_object_field'] = False
+            result['null_value'] = False
+        return {'value':result}
+
+    def onchange_null_value(self, cr, uid, ids, model_object_field, sub_model_object_field, null_value, template_language, context=None):
+        if not model_object_field and not null_value:
+            return {}
+        result = {}
+        field_obj = self.pool.get('ir.model.fields').browse(cr, uid, model_object_field, context)
+        if field_obj.ttype in ['many2one', 'one2many', 'many2many']:
+            res_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', field_obj.relation)], context=context)
+            sub_field_obj = self.pool.get('ir.model.fields').browse(cr, uid, sub_model_object_field, context)
+            if res_ids:
+                result['sub_object'] = res_ids[0]
+                result['copyvalue'] = self.compute_pl(field_obj.name,
+                                                      sub_field_obj.name,
+                                                      null_value,
+                                                      template_language
+                                                      )
+                result['sub_model_object_field'] = sub_model_object_field
+                result['null_value'] = null_value
+        else:
+            #Its a simple field... just compute placeholder
+            result['sub_object'] = False
+            result['copyvalue'] = self.compute_pl(field_obj.name,
+                                                  False,
+                                                  null_value,
+                                                  template_language
+                                                  )
+            result['sub_model_object_field'] = False
+            result['null_value'] = null_value
+        return {'value':result}
+               
+    def generate_attach_reports(self,
+                                 cursor,
+                                 user,
+                                 template,
+                                 record_id,
+                                 mail,
+                                 context=None):
+        """
+        Generate report to be attached and attach it
+        to the email
+        
+        @param cursor: Database Cursor
+        @param user: ID of User
+        @param template: Browse record of
+                         template
+        @param record_id: ID of the target model
+                          for which this mail has
+                          to be generated
+        @param mail: Browse record of email object 
+        @return: True 
+        """
+        reportname = 'report.' + \
+            self.pool.get('ir.actions.report.xml').read(
+                                         cursor,
+                                         user,
+                                         template.report_template.id,
+                                         ['report_name'],
+                                         context)['report_name']
+        service = netsvc.LocalService(reportname)
+        data = {}
+        data['model'] = template.model_int_name
+        (result, format) = service.create(cursor,
+                                          user,
+                                          [record_id],
+                                          data,
+                                          context)
+        attachment_obj = self.pool.get('ir.attachment')
+        new_att_vals = {
+            'name':mail.subject + ' (Email Attachment)',
+            'datas':base64.b64encode(result),
+            'datas_fname':tools.ustr(
+                             get_value(
+                                   cursor,
+                                   user,
+                                   record_id,
+                                   template.file_name,
+                                   template,
+                                   context
+                                   ) or 'Report') + "." + format,
+            'description':mail.subject or "No Description",
+            'res_model':'email_template.mailbox',
+            'res_id':mail.id
+        }
+        attachment_id = attachment_obj.create(cursor,
+                                              user,
+                                              new_att_vals,
+                                              context)
+        if attachment_id:
+            self.pool.get('email_template.mailbox').write(
+                              cursor,
+                              user,
+                              mail.id,
+                              {
+                               'attachments_ids':[
+                                                  [6, 0, [attachment_id]]
+                                                    ],
+                               'mail_type':'multipart/mixed'
+                               },
+                               context)
+        return True
+    
+    def generate_mailbox_item_from_template(self,
+                                      cursor,
+                                      user,
+                                      template,
+                                      record_id,
+                                      context=None):
+        """
+        Generates an email from the template for
+        record record_id of target object
+        
+        @param cursor: Database Cursor
+        @param user: ID of User
+        @param template: Browse record of
+                         template
+        @param record_id: ID of the target model
+                          for which this mail has
+                          to be generated
+        @return: ID of created object 
+        """
+        if context is None:
+            context = {}
+        #If account to send from is in context select it, else use enforced account
+        if 'account_id' in context.keys():
+            from_account = self.pool.get('email_template.account').read(
+                                                    cursor,
+                                                    user,
+                                                    context.get('account_id'),
+                                                    ['name', 'email_id'],
+                                                    context
+                                                    )
+        else:
+            from_account = {
+                            'id':template.enforce_from_account.id,
+                            'name':template.enforce_from_account.name,
+                            'email_id':template.enforce_from_account.email_id
+                            }
+        lang = get_value(cursor,
+                         user,
+                         record_id,
+                         template.lang,
+                         template,
+                         context)
+        if lang:
+            ctx = context.copy()
+            ctx.update({'lang':lang})
+            template = self.browse(cursor, user, template_id, context=ctx)
+        mailbox_values = {
+            'email_from': tools.ustr(from_account['name']) + \
+                        "<" + tools.ustr(from_account['email_id']) + ">",
+            'email_to':get_value(cursor,
+                               user,
+                               record_id,
+                               template.def_to,
+                               template,
+                               context),
+            'email_cc':get_value(cursor,
+                               user,
+                               record_id,
+                               template.def_cc,
+                               template,
+                               context),
+            'email_bcc':get_value(cursor,
+                                user,
+                                record_id,
+                                template.def_bcc,
+                                template,
+                                context),
+            'subject':get_value(cursor,
+                                    user,
+                                    record_id,
+                                    template.def_subject,
+                                    template,
+                                    context),
+            'body_text':get_value(cursor,
+                                      user,
+                                      record_id,
+                                      template.def_body_text,
+                                      template,
+                                      context),
+            'body_html':get_value(cursor,
+                                      user,
+                                      record_id,
+                                      template.def_body_html,
+                                      template,
+                                      context),
+            'account_id' :from_account['id'],
+            #This is a mandatory field when automatic emails are sent
+            'state':'na',
+            'folder':'drafts',
+            'mail_type':'multipart/alternative' 
+        }
+        #Use signatures if allowed
+        if template.use_sign:
+            sign = self.pool.get('res.users').read(cursor,
+                                                   user,
+                                                   user,
+                                                   ['signature'],
+                                                   context)['signature']
+            if mailbox_values['body_text']:
+                mailbox_values['body_text'] += sign
+            if mailbox_values['body_html']:
+                mailbox_values['body_html'] += sign
+        mailbox_id = self.pool.get('email_template.mailbox').create(
+                                                             cursor,
+                                                             user,
+                                                             mailbox_values,
+                                                             context)
+        return mailbox_id
+        
+    def generate_mail(self,
+                      cursor,
+                      user,
+                      template_id,
+                      record_ids,
+                      context=None):
+        if context is None:
+            context = {}
+        template = self.browse(cursor, user, template_id, context=context)
+        if not template:
+            raise Exception("The requested template could not be loaded")
+        for record_id in record_ids:
+            mailbox_id = self._generate_mailbox_item_from_template(
+                                                                cursor,
+                                                                user,
+                                                                template,
+                                                                record_id,
+                                                                context)
+            mail = self.pool.get('email_template.mailbox').browse(
+                                                        cursor,
+                                                        user,
+                                                        mailbox_id,
+                                                        context=context
+                                                              )
+            if template.report_template:
+                self._generate_attach_reports(
+                                              cursor,
+                                              user,
+                                              template,
+                                              record_id,
+                                              mail,
+                                              context
+                                              )
+            self.pool.get('email_template.mailbox').write(
+                                                cursor,
+                                                user,
+                                                mailbox_id,
+                                                {'folder':'outbox'},
+                                                context=context
+                                                      )
+        return True
+
+email_template()
+
+class email_template_preview(osv.osv_memory):
+    _name = "email_template.preview"
+    _description = "Email Template Preview"
+    
+    def _get_model_recs(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        #Fills up the selection box which allows records from the selected object to be displayed
+        self.context = context
+        if 'active_id' in context.keys():
+#            context['active_id'] = 5
+            ref_obj_id = self.pool.get('email.template').read(cr, uid, context['active_id'], ['object_name'], context)
+            ref_obj_name = self.pool.get('ir.model').read(cr, uid, ref_obj_id[0], ['model'], context)['model']
+            ref_obj_ids = self.pool.get(ref_obj_name).search(cr, uid, [], context=context)
+            ref_obj_recs = self.pool.get(ref_obj_name).name_get(cr, uid, ref_obj_ids, context)
+            return ref_obj_recs
+    
+    def _default_model(self, cursor, user, context=None):
+        """
+        Returns the default value for model field
+        @param cursor: Database Cursor
+        @param user: ID of current user
+        @param context: Open ERP Context
+        """
+        return self.pool.get('email.template').read(
+                                                   cursor,
+                                                   user,
+                                                   context['active_id'],
+                                                   ['object_name'],
+                                                   context)['object_name']
+        
+    _columns = {
+        'ref_template':fields.many2one(
+                                       'email.template',
+                                       'Template', readonly=True),
+        'rel_model':fields.many2one('ir.model', 'Model', readonly=True),
+        'rel_model_ref':fields.selection(_get_model_recs, 'Referred Document'),
+        'to':fields.char('To', size=250, readonly=True),
+        'cc':fields.char('CC', size=250, readonly=True),
+        'bcc':fields.char('BCC', size=250, readonly=True),
+        'subject':fields.char('Subject', size=200, readonly=True),
+        'body_text':fields.text('Body', readonly=True),
+        'body_html':fields.text('Body', readonly=True),
+        'report':fields.char('Report Name', size=100, readonly=True),
+    }
+    _defaults = {
+        'ref_template': lambda self, cr, uid, ctx:ctx['active_id'],
+        'rel_model': _default_model
+    }
+
+    def on_change_ref(self, cr, uid, ids, rel_model_ref, context=None):
+        if context is None:
+            context = {}
+        if not rel_model_ref:
+            return {}
+        vals = {}
+        if context == {}:
+            context = self.context
+        template = self.pool.get('email.template').browse(cr, uid, context['active_id'], context)
+        #Search translated template
+        lang = get_value(cr, uid, rel_model_ref, template.lang, template, context)
+        if lang:
+            ctx = context.copy()
+            ctx.update({'lang':lang})
+            template = self.pool.get('email.template').browse(cr, uid, context['active_id'], ctx)
+        vals['to'] = get_value(cr, uid, rel_model_ref, template.def_to, template, context)
+        vals['cc'] = get_value(cr, uid, rel_model_ref, template.def_cc, template, context)
+        vals['bcc'] = get_value(cr, uid, rel_model_ref, template.def_bcc, template, context)
+        vals['subject'] = get_value(cr, uid, rel_model_ref, template.def_subject, template, context)
+        vals['body_text'] = get_value(cr, uid, rel_model_ref, template.def_body_text, template, context)
+        vals['body_html'] = get_value(cr, uid, rel_model_ref, template.def_body_html, template, context)
+        vals['report'] = get_value(cr, uid, rel_model_ref, template.file_name, template, context)
+        return {'value':vals}
+        
+email_template_preview()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
new file mode 100755
index 00000000000..2503d19cd10
--- /dev/null
+++ b/addons/email_template/email_template_account.py
@@ -0,0 +1,440 @@
+from osv import osv, fields
+from html2text import html2text
+import re
+import smtplib
+import base64
+from email import Encoders
+from email.mime.base import MIMEBase
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
+from email.header import decode_header, Header
+from email.utils import formatdate
+import re
+import netsvc
+import string
+import email
+import time, datetime
+import email_template_engines
+from tools.translate import _
+import tools
+
+class email_template_account(osv.osv):
+    """
+    Object to store email account settings
+    """
+    _name = "email_template.account"
+    _known_content_types = ['multipart/mixed',
+                            'multipart/alternative',
+                            'multipart/related',
+                            'text/plain',
+                            'text/html'
+                            ]
+    _columns = {
+        'name': fields.char('Email Account Desc',
+                        size=64, required=True,
+                        readonly=True, select=True,
+                        states={'draft':[('readonly', False)]}),
+        'user':fields.many2one('res.users',
+                        'Related User', required=True,
+                        readonly=True, states={'draft':[('readonly', False)]}),
+        'email_id': fields.char('Email ID',
+                        size=120, required=True,
+                        readonly=True, states={'draft':[('readonly', False)]} ,
+                        help=" eg:yourname@yourdomain.com "),
+        'smtpserver': fields.char('Server',
+                        size=120, required=True,
+                        readonly=True, states={'draft':[('readonly', False)]},
+                        help="Enter name of outgoing server,eg:smtp.gmail.com "),
+        'smtpport': fields.integer('SMTP Port ',
+                        size=64, required=True,
+                        readonly=True, states={'draft':[('readonly', False)]},
+                        help="Enter port number,eg:SMTP-587 "),
+        'smtpuname': fields.char('User Name',
+                        size=120, required=False,
+                        readonly=True, states={'draft':[('readonly', False)]}),
+        'smtppass': fields.char('Password',
+                        size=120, invisible=True,
+                        required=False, readonly=True,
+                        states={'draft':[('readonly', False)]}),
+        'smtptls':fields.boolean('Use TLS',
+                        states={'draft':[('readonly', False)]}, readonly=True),
+                                
+        'smtpssl':fields.boolean('Use SSL/TLS (only in python 2.6)',
+                        states={'draft':[('readonly', False)]}, readonly=True),
+        'send_pref':fields.selection([
+                                      ('html', 'HTML otherwise Text'),
+                                      ('text', 'Text otherwise HTML'),
+                                      ('both', 'Both HTML & Text')
+                                      ], 'Mail Format', required=True),
+        'allowed_groups':fields.many2many(
+                        'res.groups',
+                        'account_group_rel', 'templ_id', 'group_id',
+                        string="Allowed User Groups",
+                        help="Only users from these groups will be" \
+                        "allowed to send mails from this ID"),
+        'company':fields.selection([
+                        ('yes', 'Yes'),
+                        ('no', 'No')
+                        ], 'Company Mail A/c',
+                        readonly=True,
+                        help="Select if this mail account does not belong" \
+                        "to specific user but the organisation as a whole." \
+                        "eg:info@somedomain.com",
+                        required=True, states={
+                                           'draft':[('readonly', False)]
+                                           }),
+
+        'state':fields.selection([
+                                  ('draft', 'Initiated'),
+                                  ('suspended', 'Suspended'),
+                                  ('approved', 'Approved')
+                                  ],
+                        'Account Status', required=True, readonly=True),
+    }
+
+    _defaults = {
+         'name':lambda self, cursor, user, context:self.pool.get(
+                                                'res.users'
+                                                ).read(
+                                                        cursor,
+                                                        user,
+                                                        user,
+                                                        ['name'],
+                                                        context
+                                                        )['name'],
+         'smtpssl':lambda * a:True,
+         'state':lambda * a:'draft',
+         'user':lambda self, cursor, user, context:user,
+         'send_pref':lambda * a: 'html',
+         'smtptls':lambda * a:True,
+     }
+    
+    _sql_constraints = [
+        (
+         'email_uniq',
+         'unique (email_id)',
+         'Another setting already exists with this email ID !')
+    ]
+    
+    def _constraint_unique(self, cursor, user, ids):
+        """
+        This makes sure that you dont give personal 
+        users two accounts with same ID (Validated in sql constaints)
+        However this constraint exempts company accounts. 
+        Any no of co accounts for a user is allowed
+        """
+        if self.read(cursor, user, ids, ['company'])[0]['company'] == 'no':
+            accounts = self.search(cursor, user, [
+                                                 ('user', '=', user),
+                                                 ('company', '=', 'no')
+                                                 ])
+            if len(accounts) > 1 :
+                return False
+            else :
+                return True
+        else:
+            return True
+        
+    _constraints = [
+        (_constraint_unique,
+         'Error: You are not allowed to have more than 1 account.',
+         [])
+    ]
+    
+    def on_change_emailid(self, cursor, user, ids, name=None, email_id=None, context=None):
+        """
+        Called when the email ID field changes.
+        
+        UI enhancement
+        Writes the same email value to the smtpusername
+        and incoming username
+        """
+        #TODO: Check and remove the write. Is it needed?
+        self.write(cursor, user, ids, {'state':'draft'}, context=context)
+        return {
+                'value': {
+                          'state': 'draft',
+                          'smtpuname':email_id,
+                          'isuser':email_id
+                          }
+                }
+    
+    def get_outgoing_server(self, cursor, user, ids, context=None):
+        """
+        Returns the Out Going Connection (SMTP) object
+        
+        @attention: DO NOT USE except_osv IN THIS METHOD
+        @param cursor: Database Cursor
+        @param user: ID of current user
+        @param ids: ID/list of ids of current object for 
+                    which connection is required
+                    First ID will be chosen from lists
+        @param context: Context
+        
+        @return: SMTP server object or Exception
+        """
+        #Type cast ids to integer
+        if type(ids) == list:
+            ids = ids[0]
+        this_object = self.browse(cursor, user, ids, context)
+        if this_object:
+            if this_object.smtpserver and this_object.smtpport: 
+                try:
+                    if this_object.smtpssl:
+                        serv = smtplib.SMTP_SSL(this_object.smtpserver, this_object.smtpport)
+                    else:
+                        serv = smtplib.SMTP(this_object.smtpserver, this_object.smtpport)
+                    if this_object.smtptls:
+                        serv.ehlo()
+                        serv.starttls()
+                        serv.ehlo()
+                except Exception, error:
+                    raise error
+                try:
+                    if serv.has_extn('AUTH') or this_object.smtpuname or this_object.smtppass:
+                        serv.login(this_object.smtpuname, this_object.smtppass)
+                except Exception, error:
+                    raise error
+                return serv
+            raise Exception(_("SMTP SERVER or PORT not specified"))
+        raise Exception(_("Core connection for the given ID does not exist"))
+    
+    def check_outgoing_connection(self, cursor, user, ids, context=None):
+        """
+        checks SMTP credentials and confirms if outgoing connection works
+        (Attached to button)
+        @param cursor: Database Cursor
+        @param user: ID of current user
+        @param ids: list of ids of current object for 
+                    which connection is required
+        @param context: Context
+        """
+        try:
+            self.get_outgoing_server(cursor, user, ids, context)
+            raise osv.except_osv(_("SMTP Test Connection Was Successful"), '')
+        except osv.except_osv, success_message:
+            raise success_message
+        except Exception, error:
+            raise osv.except_osv(
+                                 _("Out going connection test failed"),
+                                 _("Reason: %s") % error
+                                 )
+    
+    def do_approval(self, cr, uid, ids, context={}):
+        #TODO: Check if user has rights
+        self.write(cr, uid, ids, {'state':'approved'}, context=context)
+#        wf_service = netsvc.LocalService("workflow")
+
+    def smtp_connection(self, cursor, user, id, context=None):
+        """
+        This method should now wrap smtp_connection
+        """
+        #This function returns a SMTP server object
+        logger = netsvc.Logger()
+        core_obj = self.browse(cursor, user, id, context)
+        if core_obj.smtpserver and core_obj.smtpport and core_obj.state == 'approved':
+            try:
+                serv = self.get_outgoing_server(cursor, user, id, context)
+            except Exception, error:
+                logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed on login. Probable Reason:Could not login to server\nError: %s") % (id, error))
+                return False
+            #Everything is complete, now return the connection
+            return serv
+        else:
+            logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:Account not approved") % id)
+            return False
+                      
+#**************************** MAIL SENDING FEATURES ***********************#
+    def split_to_ids(self, ids_as_str):
+        """
+        Identifies email IDs separated by separators
+        and returns a list
+        TODO: Doc this
+        "a@b.com,c@bcom; d@b.com;e@b.com->['a@b.com',...]"
+        """
+        email_sep_by_commas = ids_as_str \
+                                    .replace('; ', ',') \
+                                    .replace(';', ',') \
+                                    .replace(', ', ',')
+        return email_sep_by_commas.split(',')
+    
+    def get_ids_from_dict(self, addresses={}):
+        """
+        TODO: Doc this
+        """
+        result = {'all':[]}
+        keys = ['To', 'CC', 'BCC']
+        for each in keys:
+            ids_as_list = self.split_to_ids(addresses.get(each, u''))
+            while u'' in ids_as_list:
+                ids_as_list.remove(u'')
+            result[each] = ids_as_list
+            result['all'].extend(ids_as_list)
+        return result
+    
+    def send_mail(self, cr, uid, ids, addresses, subject='', body=None, payload=None, context=None):
+        #TODO: Replace all this crap with a single email object
+        if body is None:
+            body = {}
+        if payload is None:
+            payload = {}
+        if context is None:
+            context = {}
+        logger = netsvc.Logger()
+        for id in ids:  
+            core_obj = self.browse(cr, uid, id, context)
+            serv = self.smtp_connection(cr, uid, id)
+            if serv:
+                try:
+                    msg = MIMEMultipart()
+                    if subject:
+                        msg['Subject'] = subject
+                    sender_name = Header(core_obj.name, 'utf-8').encode()
+                    msg['From'] = sender_name + " <" + core_obj.email_id + ">"
+                    msg['Organization'] = tools.ustr(core_obj.user.company_id.name)
+                    msg['Date'] = formatdate()
+                    addresses_l = self.get_ids_from_dict(addresses) 
+                    if addresses_l['To']:
+                        msg['To'] = u','.join(addresses_l['To'])
+                    if addresses_l['CC']:
+                        msg['CC'] = u','.join(addresses_l['CC'])
+#                    if addresses_l['BCC']:
+#                        msg['BCC'] = u','.join(addresses_l['BCC'])
+                    if body.get('text', False):
+                        temp_body_text = body.get('text', '')
+                        l = len(temp_body_text.replace(' ', '').replace('\r', '').replace('\n', ''))
+                        if l == 0:
+                            body['text'] = u'No Mail Message'
+                    # Attach parts into message container.
+                    # According to RFC 2046, the last part of a multipart message, in this case
+                    # the HTML message, is best and preferred.
+                    if core_obj.send_pref == 'text' or core_obj.send_pref == 'both':
+                        body_text = body.get('text', u'No Mail Message')
+                        body_text = tools.ustr(body_text)
+                        msg.attach(MIMEText(body_text.encode("utf-8"), _charset='UTF-8'))
+                    if core_obj.send_pref == 'html' or core_obj.send_pref == 'both':
+                        html_body = body.get('html', u'')
+                        if len(html_body) == 0 or html_body == u'':
+                            html_body = body.get('text', u'<p>No Mail Message</p>').replace('\n', '<br/>').replace('\r', '<br/>')
+                        html_body = tools.ustr(html_body)
+                        msg.attach(MIMEText(html_body.encode("utf-8"), _subtype='html', _charset='UTF-8'))
+                    #Now add attachments if any
+                    for file in payload.keys():
+                        part = MIMEBase('application', "octet-stream")
+                        part.set_payload(base64.decodestring(payload[file]))
+                        part.add_header('Content-Disposition', 'attachment; filename="%s"' % file)
+                        Encoders.encode_base64(part)
+                        msg.attach(part)
+                except Exception, error:
+                    logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:MIME Error\nDescription: %s") % (id, error))
+                    return error
+                try:
+                    #print msg['From'],toadds
+                    serv.sendmail(msg['From'], addresses_l['all'], msg.as_string())
+                except Exception, error:
+                    logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:Server Send Error\nDescription: %s") % (id, error))
+                    return error
+                #The mail sending is complete
+                serv.close()
+                logger.notifyChannel(_("Email Template"), netsvc.LOG_INFO, _("Mail from Account %s successfully Sent.") % (id))
+                return True
+            else:
+                logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:Account not approved") % id)
+                                
+    def extracttime(self, time_as_string):
+        """
+        TODO: DOC THis
+        """
+        logger = netsvc.Logger()
+        #The standard email dates are of format similar to:
+        #Thu, 8 Oct 2009 09:35:42 +0200
+        #print time_as_string
+        date_as_date = False
+        convertor = {'+':1, '-':-1}
+        try:
+            time_as_string = time_as_string.replace(',', '')
+            date_list = time_as_string.split(' ')
+            date_temp_str = ' '.join(date_list[1:5])
+            if len(date_list) >= 6:
+                sign = convertor.get(date_list[5][0], False)
+            else:
+                sign = False
+            try:
+                dt = datetime.datetime.strptime(
+                                            date_temp_str,
+                                            "%d %b %Y %H:%M:%S")
+            except:
+                try:
+                    dt = datetime.datetime.strptime(
+                                            date_temp_str,
+                                            "%d %b %Y %H:%M")
+                except:
+                    return False
+            if sign:
+                try:
+                    offset = datetime.timedelta(
+                                hours=sign * int(
+                                             date_list[5][1:3]
+                                                ),
+                                             minutes=sign * int(
+                                                            date_list[5][3:5]
+                                                                )
+                                                )
+                except Exception, e2:
+                    """Looks like UT or GMT, just forget decoding"""
+                    return False
+            else:
+                offset = datetime.timedelta(hours=0)
+            dt = dt + offset
+            date_as_date = dt.strftime('%Y-%m-%d %H:%M:%S')
+            #print date_as_date
+        except Exception, e:
+            logger.notifyChannel(
+                    _("Email Template"),
+                    netsvc.LOG_WARNING,
+                    _(
+                      "Datetime Extraction failed.Date:%s \
+                      \tError:%s") % (
+                                    time_as_string,
+                                    e)
+                      )
+        return date_as_date
+        
+    def send_receive(self, cr, uid, ids, context=None):
+        self.get_mails(cr, uid, ids, context)
+        for id in ids:
+            ctx = context.copy()
+            ctx['filters'] = [('account_id', '=', id)]
+            self.pool.get('email_template.mailbox').send_all_mail(cr, uid, [], context=ctx)
+        return True
+ 
+    def decode_header_text(self, text):
+        """ Decode internationalized headers RFC2822.
+            To, CC, BCC, Subject fields can contain 
+            text slices with different encodes, like:
+                =?iso-8859-1?Q?Enric_Mart=ED?= <enricmarti@company.com>, 
+                =?Windows-1252?Q?David_G=F3mez?= <david@company.com>
+            Sometimes they include extra " character at the beginning/
+            end of the contact name, like:
+                "=?iso-8859-1?Q?Enric_Mart=ED?=" <enricmarti@company.com>
+            and decode_header() does not work well, so we use regular 
+            expressions (?=   ? ?   ?=) to split the text slices
+        """
+        if not text:
+            return text        
+        p = re.compile("(=\?.*?\?.\?.*?\?=)")
+        text2 = ''
+        try:
+            for t2 in p.split(text):
+                text2 += ''.join(
+                            [s.decode(
+                                      t or 'ascii'
+                                    ) for (s, t) in decode_header(t2)]
+                                ).encode('utf-8')
+        except:
+            return text
+        return text2
+
+email_template_account()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
new file mode 100755
index 00000000000..573b03e7027
--- /dev/null
+++ b/addons/email_template/email_template_account_view.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+        <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
+        <menuitem name="Email Template" id="menu_email_template" parent="base.menu_tools"/>
+
+		<record model="ir.ui.view" id="email_template_account_form">
+			<field name="name">email_template.account.form</field>
+			<field name="model">email_template.account</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Email Account Configuration">
+					<group colspan="2">
+						<field name="name" select="1" />
+					</group>
+					<notebook colspan="4">
+						<page string="Outgoing">
+							<separator string="Server Information" colspan="4" />
+							<group colspan="4">
+								<field name="smtpserver" select="1" colspan="2" />
+								<field name="smtpport" select="2" colspan="2" />
+								<field name="smtpssl" select="2" colspan="2" />
+								<field name="smtptls" select="2" colspan="2" />
+							</group>
+							<button name="check_outgoing_connection" type="object" string="Check Outgoing Connection" />
+							<separator string="User Information" colspan="4" />
+							<group col="2" colspan="2">
+								<field name="email_id" select="1" on_change="on_change_emailid(name,email_id)" colspan="2" />
+								<field name="smtppass" password="True" colspan="2" />
+								<field name="company" select="2" colspan="2" />
+							</group>
+							<group col="2" colspan="2">
+								<field name="smtpuname" select="1" colspan="2" />
+								<field name="user" select="2" colspan="2" />
+								<field name="send_pref" colspan="2" />
+							</group>
+						</page>
+						<page string="security" attrs="{'invisible':[('company','!=','yes')]}">
+							<field name="allowed_groups" attrs="{'required':[('company','=','yes')]}" nolabel="1"/>
+						</page>
+					</notebook>
+					<group colspan="4" col="10">
+						<field name="state" select="1"/>
+						<button string="Approve Account" name="button_approval" states="draft" type="workflow"/>
+						<button string="Suspend Account" name="button_suspended" states="approved" type="workflow"  />
+						<button string="Request Re-activation" name="get_reapprove" states="suspended" type="workflow" />
+						<button string="Send/Receive" name="send_receive" states="approved" type="object" />
+					</group>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="email_template_account_tree">
+			<field name="name">email_template.account.tree</field>
+			<field name="model">email_template.account</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="SMTP Server">
+					<field name="name" select="2" />
+					<field name="email_id" select="2" />
+					<field name="smtpuname" select="2" />
+					<field name="user" select="2" />
+					<field name="smtpserver" select="2" />
+					<field name="smtpport" select="2" />
+					<field name="state" select="2" />
+				</tree>
+			</field>
+		</record>
+
+       <record id="view_email_template_account_search" model="ir.ui.view">
+           <field name="name">email_template.account.search</field>
+           <field name="model">email_template.account</field>
+           <field name="type">search</field>
+           <field name="arch" type="xml">
+               <search string="Accounts">
+                    <filter icon="terp-personal" string="My Accounts" name="my" domain="[('user','=',uid)]"/>
+                    <filter icon="terp-personal+" string="Personal Accounts" domain="[('company','=','no')]"/>
+                    <filter icon="terp-go-home" string="Company Accounts" domain="[('company','=','yes')]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-emblem-important" string="Suspended" domain="[('state','=','suspended')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="name" select="1"/>
+                    <field name="user" select="1"/>
+                    <field name="email_id" select="1"/>
+               </search>
+           </field>
+        </record>
+
+		<record model="ir.actions.act_window" id="action_email_template_account_tree_all">
+			<field name="name">Accounts</field>
+			<field name="res_model">email_template.account</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form,tree</field>
+			<field name="view_id" ref="email_template_account_tree" />
+            <field name="context">{'group_by': [], 'search_default_draft': 1, 'search_default_my': 1}</field>
+            <field name="search_view_id" ref="view_email_template_account_search"/>
+		</record>
+
+		<menuitem name="Configuration" id="menu_email_template_configuration" parent="menu_email_template" />
+
+		<menuitem name="All Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all" groups="res_groups_email_template_manager" />
+
+	</data>
+</openerp>
+
+
+
+
diff --git a/addons/email_template/email_template_engines.py b/addons/email_template/email_template_engines.py
new file mode 100755
index 00000000000..2fc58310e9b
--- /dev/null
+++ b/addons/email_template/email_template_engines.py
@@ -0,0 +1,84 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+from osv import fields,osv
+import pooler
+import netsvc
+import re
+
+class email_template_engines(osv.osv):
+    _name = "email_template.engines"
+    _description = "Email Template Engine"
+
+#    def __init__(self):
+#        print "Started Engine"
+
+    def check(self):
+        print "Start self check"
+        
+    def strip_html(self,text):
+        #Removes HTML, Have to check if still relevent
+        if text:
+            def fixup(m):
+                text = m.group(0)
+                if text[:1] == "<":
+                    return "" # ignore tags
+                if text[:2] == "&#":
+                    try:
+                        if text[:3] == "&#x":
+                            return unichr(int(text[3:-1], 16))
+                        else:
+                            return unichr(int(text[2:-1]))
+                    except ValueError:
+                        pass
+                elif text[:1] == "&":
+                    import htmlentitydefs
+                    entity = htmlentitydefs.entitydefs.get(text[1:-1])
+                    if entity:
+                        if entity[:2] == "&#":
+                            try:
+                                return unichr(int(entity[2:-1]))
+                            except ValueError:
+                                pass
+                        else:
+                            return unicode(entity, "iso-8859-1")
+                return text # leave as is
+            return re.sub("(?s)<[^>]*>|&#?\w+;", fixup, text)
+
+    def parsevalue(self,cr,uid,id,message,templateid,context):
+        #id: ID of the template's model's record to be used
+        #message: the complete text including placeholders
+        #templateid: the template id of the template
+        #context: TODO
+        #print cr,uid,id,message,templateid,context
+        if message:
+            logger = netsvc.Logger()
+            def merge(match):
+                template = self.pool.get("email.template").browse(cr,uid,templateid,context)
+                obj_pool = self.pool.get(template.object_name.model)
+                obj = obj_pool.browse(cr, uid, id, context)
+                exp = str(match.group()[2:-2]).strip()
+                #print "level 1:",exp
+                exp_spl = exp.split('/')
+                #print "level 2:",exp_spl
+                try:
+                    result = eval(exp_spl[0], {'object':obj,})
+                except:
+                    result = "Rendering Error"
+                #print "result:",result
+                try:
+                    if result in (None, False):
+                        if len(exp_spl)>1:
+                            return exp_spl[1]
+                        else:
+                            return 'Not Available'
+                    return str(result)
+                except:
+                    return "Rendering Error"
+            if message:
+                com = re.compile('(\[\[.+?\]\])')
+                retmessage = com.sub(merge, message)
+            else:
+                retmessage=""
+            return retmessage
+
+email_template_engines()
diff --git a/addons/email_template/email_template_mailbox.py b/addons/email_template/email_template_mailbox.py
new file mode 100755
index 00000000000..1934f4e0227
--- /dev/null
+++ b/addons/email_template/email_template_mailbox.py
@@ -0,0 +1,182 @@
+from osv import osv, fields
+import time
+import email_template_engines
+import netsvc
+from tools.translate import _
+import tools
+
+LOGGER = netsvc.Logger()
+
+class email_template_mailbox(osv.osv):
+    _name = "email_template.mailbox"
+    _description = 'Email Mailbox'
+    _rec_name = "subject"
+    _order = "date_mail desc"
+    
+    def run_mail_scheduler(self, cursor, user, context=None):
+        """
+        This method is called by Open ERP Scheduler
+        to periodically send emails
+        """
+        try:
+            self.send_all_mail(cursor, user, context)
+        except Exception, e:
+            LOGGER.notifyChannel(
+                                 _("Email Template"),
+                                 netsvc.LOG_ERROR,
+                                 _("Error sending mail: %s" % str(e)))
+        
+    def send_all_mail(self, cr, uid, ids=None, context=None):
+        if ids is None:
+            ids = []
+        if context is None:
+            context = {}
+        filters = [('folder', '=', 'outbox'), ('state', '!=', 'sending')]
+        if 'filters' in context.keys():
+            for each_filter in context['filters']:
+                filters.append(each_filter)
+        ids = self.search(cr, uid, filters, context=context)
+        self.write(cr, uid, ids, {'state':'sending'}, context)
+        self.send_this_mail(cr, uid, ids, context)
+        return True
+    
+    def send_this_mail(self, cr, uid, ids=None, context=None):
+        if ids is None:
+            ids = []
+        for id in ids:
+            try:
+                account_obj = self.pool.get('email_template.account')
+                values = self.read(cr, uid, id, [], context) 
+                payload = {}
+                if values['attachments_ids']:
+                    for attid in values['attachments_ids']:
+                        attachment = self.pool.get('ir.attachment').browse(cr, uid, attid, context)#,['datas_fname','datas'])
+                        payload[attachment.datas_fname] = attachment.datas
+                    print "233333333333333"
+                result = account_obj.send_mail(cr, uid,
+                              [values['account_id'][0]],
+                              {'To':values.get('email_to', u'') or u'', 'CC':values.get('email_cc', u'') or u'', 'BCC':values.get('email_bcc', u'') or u''},
+                              values['subject'] or u'',
+                              {'text':values.get('body_text', u'') or u'', 'html':values.get('body_html', u'') or u''},
+                              payload=payload, context=context)
+                
+                if result == True:
+                    self.write(cr, uid, id, {'folder':'sent', 'state':'na', 'date_mail':time.strftime("%Y-%m-%d %H:%M:%S")}, context)
+                    self.historise(cr, uid, [id], "Email sent successfully", context)
+                else:
+                    self.historise(cr, uid, [id], result, context)
+            except Exception, error:
+                logger = netsvc.Logger()
+                logger.notifyChannel(_("Power Email"), netsvc.LOG_ERROR, _("Sending of Mail %s failed. Probable Reason:Could not login to server\nError: %s") % (id, error))
+                self.historise(cr, uid, [id], error, context)
+            self.write(cr, uid, id, {'state':'na'}, context)
+        return True
+    
+    def historise(self, cr, uid, ids, message='', context=None):
+        for id in ids:
+            history = self.read(cr, uid, id, ['history'], context).get('history', '')
+            self.write(cr, uid, id, {'history':history or '' + "\n" + time.strftime("%Y-%m-%d %H:%M:%S") + ": " + tools.ustr(message)}, context)
+    
+    _columns = {
+            'email_from':fields.char(
+                            'From', 
+                            size=64),
+            'email_to':fields.char(
+                            'Recepient (To)', 
+                            size=250,),
+            'email_cc':fields.char(
+                            ' CC', 
+                            size=250),
+            'email_bcc':fields.char(
+                            ' BCC', 
+                            size=250),
+            'subject':fields.char(
+                            ' Subject', 
+                            size=200,),
+            'body_text':fields.text(
+                            'Standard Body (Text)'),
+            'body_html':fields.text(
+                            'Body (Text-Web Client Only)'),
+            'attachments_ids':fields.many2many(
+                            'ir.attachment', 
+                            'mail_attachments_rel', 
+                            'mail_id', 
+                            'att_id', 
+                            'Attachments'),
+            'account_id' :fields.many2one(
+                            'email_template.account',
+                            'User account', 
+                            required=True),
+            'user':fields.related(
+                            'account_id', 
+                            'user', 
+                            type="many2one", 
+                            relation="res.users", 
+                            string="User"),
+            'server_ref':fields.integer(
+                            'Server Reference of mail', 
+                            help="Applicable for inward items only"),
+            'mail_type':fields.selection([
+                            ('multipart/mixed', 
+                             'Has Attachments'),
+                            ('multipart/alternative', 
+                             'Plain Text & HTML with no attachments'),
+                            ('multipart/related', 
+                             'Intermixed content'),
+                            ('text/plain', 
+                             'Plain Text'),
+                            ('text/html', 
+                             'HTML Body'),
+                            ], 'Mail Contents'),
+            #I like GMAIL which allows putting same mail in many folders
+            #Lets plan it for 0.9
+            'folder':fields.selection([
+                            ('drafts', 'Drafts'),
+                            ('outbox', 'Outbox'),
+                            ('trash', 'Trash'),
+                            ('sent', 'Sent Items'),
+                            ], 'Folder', required=True),
+            'state':fields.selection([
+                            ('na', 'Not Applicable'),
+                            ('sending', 'Sending'),
+                            ], 'Status', required=True),
+            'date_mail':fields.datetime(
+                            'Rec/Sent Date'),
+            'history':fields.text(
+                            'History', 
+                            readonly=True, 
+                            store=True)
+        }
+
+    _defaults = {
+        'state': lambda * a: 'na',
+        'folder': lambda * a: 'outbox',
+    } 
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None:
+            context = {}
+        if context.get('company', False):
+            users_groups = self.pool.get('res.users').browse(cr, uid, uid, context).groups_id
+            group_acc_rel = {}
+            #get all accounts and get a table of {group1:[account1,account2],group2:[account1]}
+            for each_account_id in self.pool.get('email_template.account').search(cr, uid, [('state', '=', 'approved'), ('company', '=', 'yes')], context=context):
+                account = self.pool.get('email_template.account').browse(cr, uid, each_account_id, context)
+                for each_group in account.allowed_groups:
+                    if not account.id in group_acc_rel.get(each_group, []):
+                        groups = group_acc_rel.get(each_group, [])
+                        groups.append(account.id)
+                        group_acc_rel[each_group] = groups
+            users_company_accounts = []
+            for each_group in group_acc_rel.keys():
+                if each_group in users_groups:
+                    for each_account in group_acc_rel[each_group]:
+                        if not each_account in users_company_accounts:
+                            users_company_accounts.append(each_account)
+            args.append(('account_id', 'in', users_company_accounts))
+        return super(osv.osv, self).search(cr, uid, args, offset, limit,
+                order, context=context, count=count)
+
+email_template_mailbox()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/email_template_mailbox_view.xml b/addons/email_template/email_template_mailbox_view.xml
new file mode 100755
index 00000000000..f94fa886ee6
--- /dev/null
+++ b/addons/email_template/email_template_mailbox_view.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+		<!-- Email Template-->
+		<record model="ir.ui.view" id="email_template_mailbox_form">
+			<field name="name">email_template.mailbox.form</field>
+			<field name="model">email_template.mailbox</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Outbox">
+					<group col="4" colspan="2">
+						<field name="email_from" colspan="4" select="1"/>
+						<field name="email_cc" colspan="4" select="1"/>
+						<field name="date_mail" colspan="4" select="2"/>
+					</group>
+					<group col="4" colspan="2">
+						<field name="email_to" colspan="4" required="1" select="1" />
+						<field name="email_bcc" colspan="4" select="2"/>
+						<field name="subject" colspan="4" select="1"/>
+					</group>
+					<notebook colspan="4">
+						<page string="Standard Body">
+							<separator colspan="4" string="Standard Body" />
+							<notebook colspan="4">
+								<page string="Standard Body (Text)">
+									<field name="body_text" nolabel="1" colspan="4" select="1"/>
+								</page>
+								<page string="Body (HTML-Web Client Only)">
+									<field name="body_html" nolabel="1" colspan="4" />
+									<!--<label string="Note: HTML body can't be edited with GTK desktop client." colspan="4"/>
+								--></page>
+
+							</notebook>
+						</page>
+
+
+						<page string="Attachments">
+							<group col="4">
+								<separator colspan="4" string="Attachments" />
+								<field name="attachments_ids" colspan="4" nolabel="1" />
+							</group>
+						</page>
+						<page string="Advanced">
+							<group col="4">
+								<field name="account_id" colspan="2" />
+								<field name="server_ref" colspan="2" />
+								<field name="mail_type" colspan="2" />
+								<field name="folder" colspan="2" select="2"/>
+								<separator string="History" colspan="4" />
+								<field name="history" nolabel="1" colspan="4"/>
+							</group>
+						</page>
+					</notebook>
+					<separator colspan="4" string="" />
+					<group col="4" colspan="4">
+						<field name="state" colspan="2" readonly="1" />
+						<button name="complete_mail" type="object" string="Download Full Mail" colspan="2" states="read,unread" />
+						<button name="send_this_mail" type="object" string="Send Mail" />
+					</group>
+				</form>
+			</field>
+		</record>
+
+		<!--============================================= TREE VIEWS =============================================-->
+		<!--DRAFTS-->
+		<record model="ir.ui.view" id="email_template_drafts_tree">
+			<field name="name">email_template.mailbox.draftstree</field>
+			<field name="model">email_template.mailbox</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Drafts">
+					<field name="user" />
+					<field name="email_from" select="1" />
+					<field name="subject" select="1" />
+					<field name="attachments_ids" select="2" />
+					<field name="date_mail" select="2" />
+				</tree>
+			</field>
+		</record>
+		<!--OUTBOX-->
+		<record model="ir.ui.view" id="email_template_outbox_tree">
+			<field name="name">email_template.mailbox.outboxtree</field>
+			<field name="model">email_template.mailbox</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Outbox">
+					<field name="user" />
+					<field name="email_from" select="1" />
+					<field name="subject" select="1" />
+					<field name="attachments_ids" select="2" />
+					<field name="date_mail" select="2" />
+				</tree>
+			</field>
+		</record>
+		<!--SENT-->
+		<record model="ir.ui.view" id="email_template_sentbox_tree">
+			<field name="name">email_template.mailbox.sentboxtree</field>
+			<field name="model">email_template.mailbox</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Sent">
+					<field name="user" />
+					<field name="email_from" select="1" />
+					<field name="subject" select="1" />
+					<field name="attachments_ids" select="2" />
+					<field name="date_mail" select="2" />
+				</tree>
+			</field>
+		</record>
+		<!--TRASH-->
+		<record model="ir.ui.view" id="email_template_trashbox_tree">
+			<field name="name">email_template.mailbox.trashboxtree</field>
+			<field name="model">email_template.mailbox</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Trash">
+					<field name="user" />
+					<field name="email_from" select="1" />
+					<field name="subject" select="1" />
+					<field name="attachments_ids" select="2" />
+					<field name="date_mail" select="2" />
+				</tree>
+			</field>
+		</record>
+
+        <record id="view_email_template_mailbox_search" model="ir.ui.view">
+           <field name="name">email_template.mailbox.search</field>
+           <field name="model">email_template.mailbox</field>
+           <field name="type">search</field>
+           <field name="arch" type="xml">
+               <search string="Mailboxes">
+                    <filter icon="terp-mail-message-new" string="Drafts" name="draft" domain="[('folder','=','drafts']"/>
+                    <filter icon="terp-mail-" string="Outbox" name="outbox" domain="[('folder','=','outbox')]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="Sent" domain="[('folder','=','sent')]"/>
+                    <filter icon="terp-mail_delete" string="Trash" domain="[('folder','=','trash')]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-gtk-stop" string="Not Applicable" domain="[('state','=','na')]"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="Sending" domain="[('state','=','sending')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="email_from" select="1"/>
+                    <field name="email_to" select="1"/>
+                    <field name="subject" select="1"/>
+               </search>
+           </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_email_template_mailbox">
+            <field name="name">Mailbox</field>
+            <field name="res_model">email_template.mailbox</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="email_template_outbox_tree" />
+            <field name="context">{'group_by': [], 'search_default_draft': 1, 'search_default_outbox': 1}</field>
+            <field name="search_view_id" ref="view_email_template_mailbox_search"/>
+        </record>
+
+		<!--======================================== MENUS ========================================-->
+		<menuitem name="MailBox" id="menu_email_template_mailbox_all_main2" parent="menu_email_template" />
+		<menuitem name="Personal" id="menu_email_template_personal" parent="menu_email_template_mailbox_all_main2" />
+        <menuitem name="Mails" id="menu_email_template_personal_mails" parent="menu_email_template_personal" action="action_email_template_mailbox"/>
+		<menuitem name="Company" id="menu_email_template_company" parent="menu_email_template_mailbox_all_main2" />
+        <menuitem name="Mails" id="menu_email_template_company_mails" parent="menu_email_template_company" action="action_email_template_mailbox"/>
+
+	</data>
+</openerp>
+
+
+
+
diff --git a/addons/email_template/email_template_scheduler_data.xml b/addons/email_template/email_template_scheduler_data.xml
new file mode 100755
index 00000000000..30d69f99398
--- /dev/null
+++ b/addons/email_template/email_template_scheduler_data.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+ 	<record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
+            <field name="name">Email Template scheduler</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">hours</field>
+            <field name="numbercall">12</field>
+            <field eval="False" name="doall"/>
+            <field eval="'email_template.mailbox'" name="model"/>
+            <field eval="'run_mail_scheduler'" name="function"/>
+            <field eval="'()'" name="args"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
new file mode 100755
index 00000000000..8e14a861edc
--- /dev/null
+++ b/addons/email_template/email_template_view.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+		<!-- Email Template PReview -->
+		<record model="ir.ui.view" id="email_template_preview_form">
+			<field name="name">email_template.preview.form</field>
+			<field name="model">email_template.preview</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Email Preview">
+					<field name="rel_model" />
+					<newline />
+					<field name="rel_model_ref" on_change="on_change_ref(rel_model_ref, context)" />
+					<newline />
+					<field name="to" />
+					<newline />
+					<field name="cc" />
+					<newline />
+					<field name="bcc" />
+					<newline />
+					<field name="subject" />
+					<newline />
+					<field name="body_text" />
+					<newline />
+					<!-- <field name="body_html" widget="text_html" />-->
+					<!-- 
+					Removed text_html because it doesnt work in GTK
+					And TinyMCE messes up the HTML in Web Client
+					 -->
+					<field name="body_html"/>
+					<newline />
+					<field name="report" />
+					<group>
+						<button icon="gtk-ok" special="cancel" string="OK" />
+					</group>
+				</form>
+			</field>
+		</record>
+
+		<record id="wizard_email_template_preview" model="ir.actions.act_window">
+			<field name="name">Template Preview</field>
+			<field name="res_model">email_template.preview</field>
+			<field name="src_model">email_template.preview</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="auto_refresh" eval="1" />
+			<field name="target">new</field>
+			<field name="context">{'ids':active_id}</field>
+		</record>
+		<!--EMail client Form view  -->
+
+		<record model="ir.ui.view" id="email_template_form">
+			<field name="name">email.template.form</field>
+			<field name="model">email.template</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Email Templates">
+					<field name="name" />
+					<field name="object_name" required="1"
+						on_change="change_model(object_name)" />
+					<field name="model_int_name" invisible="1" />
+					<notebook colspan="4">
+						<page string="Mail Details">
+							<group col="4" colspan="2">
+								<field name="def_to" colspan="4" required="1" />
+								<field name="def_cc" colspan="4" />
+								<field name="def_bcc" colspan="4" />
+							</group>
+							<group col="2" colspan="2">
+								<field name="def_subject" colspan="4" required="1" />
+								<field name="use_sign" colspan="4" />
+								<field name="lang" colspan="4" />
+							</group>
+							<separator colspan="3" string="Standard Body" />
+							<separator colspan="1" string="Expression Builder" />
+
+							<notebook>
+								<page string="Body (Text)">
+									<field name="def_body_text" colspan="4" nolabel="1" />
+								</page>
+								<page string="Body (Raw HTML)">
+									<field name="def_body_html" colspan="4" nolabel="1" />
+									<label string="Note: This is Raw HTML." colspan="4" />
+								</page>
+							</notebook>
+							<group col="4">
+								<field name="template_language"
+									on_change="onchange_null_value(model_object_field,sub_model_object_field,null_value,template_language,context)" />
+								<notebook>
+									<page string="Insert Simple Field">
+
+										<field name="model_object_field"
+											domain="[('model_id','=',object_name),('ttype','!=','one2many'),('ttype','!=','many2many')]"
+											on_change="onchange_model_object_field(model_object_field, template_language,context)"
+											colspan="4" />
+										<field name="sub_object" readonly="1" colspan="4" />
+										<field name="sub_model_object_field"
+											domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
+											colspan="4"
+											attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
+											on_change="onchange_sub_model_object_field(model_object_field,sub_model_object_field,template_language,context)" />
+										<field name="null_value" colspan="4"
+											on_change="onchange_null_value(model_object_field,sub_model_object_field,null_value,template_language,context)" />
+										<field name="copyvalue" colspan="4" />
+									</page>
+								</notebook>
+								<button name="%(wizard_email_template_preview)d" string="Preview Template"
+									type="action" colspan="4" target="new" />
+							</group>
+						</page>
+						<page string="Security">
+							<separator colspan="4" string="Allowed User Groups" />
+							<field name="allowed_groups" string="Allowed User Groups"
+								nolabel="1" />
+						</page>
+						<page string="Advanced">
+							<separator string="Automatic Email" colspan="4" />
+							<field name="enforce_from_account" attrs="{'required':[('auto_email','=',True)]}" />
+							<newline/>
+							<field name="ref_ir_act_window" />
+							<field name="ref_ir_value" />
+							<separator string="Attachments (Report to attach)" colspan="4"/>
+							<field name="file_name" colspan="2" />
+							<field name="report_template" colspan="2"
+									domain="[('model','=',model_int_name)]" />
+						</page>
+					</notebook>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="email_template_tree">
+			<field name="name">email.template.tree</field>
+			<field name="model">email.template</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Email Templates">
+					<field name="name" select="1" />
+					<field name="object_name" required="1" select="1" />
+					<field name="def_to" colspan="4" select="2" />
+					<field name="def_cc" colspan="4" select="2" />
+					<field name="def_bcc" colspan="4" select="2" />
+					<field name="def_subject" colspan="4" select="2" />
+					<field name="use_sign" colspan="4" select="2" />
+					<field name="file_name" colspan="4" />
+					<field name="enforce_from_account" />
+				</tree>
+			</field>
+		</record>
+
+        <record id="view_email_template_search" model="ir.ui.view">
+           <field name="name">email.template.search</field>
+           <field name="model">email.template</field>
+           <field name="type">search</field>
+           <field name="arch" type="xml">
+               <search string="Templates">
+                    <separator orientation="vertical"/>
+                    <field name="name" select="1"/>
+                    <field name="object_name" select="1"/>
+                    <field name="def_to" select="1"/>
+                    <separator orientation="vertical"/>
+                    <field name="lang" select="1"/>
+                    <field name="def_subject" select="1"/>
+                    <field name="file_name" select="1"/>
+               </search>
+           </field>
+        </record>
+
+		<record model="ir.actions.act_window" id="action_email_template_tree_all">
+			<field name="name">Email Templates</field>
+			<field name="res_model">email.template</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form,tree</field>
+			<field name="view_id" ref="email_template_tree" />
+            <field name="search_view_id" ref="view_email_template_search"/>
+		</record>
+
+		<menuitem name="E-MAIL Templates" id="menu_email_template_all"
+			parent="menu_email_template_configuration" action="action_email_template_tree_all" />
+
+	</data>
+</openerp>
+
+
+
+
+
diff --git a/addons/email_template/email_template_workflow.xml b/addons/email_template/email_template_workflow.xml
new file mode 100755
index 00000000000..4d3176f0ae0
--- /dev/null
+++ b/addons/email_template/email_template_workflow.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="PE_ADMIN" model="res.roles">
+            <field name="name">Email Administrator</field>
+        </record>
+
+        <record id="wkf_email_template_setting" model="workflow">
+            <field name="name">Email Template Workflow</field>
+            <field name="osv">email_template.account</field>
+            <field name="on_create">True</field>
+        </record>
+        
+        <!--Activity -->
+        
+         <record id="act_draft" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_email_template_setting"/>
+            <field name="flow_start">True</field>
+            <field name="name">draft</field>
+	    <field name="kind">function</field>
+            <field name="action">write({'state':'draft'})</field>
+        </record>
+       
+        <record id="act_approved" model="workflow.activity">
+            <field name="name">approval</field>
+            <field name="wkf_id" ref="wkf_email_template_setting"/>
+            <field name="kind">function</field>
+            <field name="action">do_approval()</field>
+        </record>
+        
+        <record id="act_suspended" model="workflow.activity">
+            <field name="name">suspended</field>
+            <field name="wkf_id" ref="wkf_email_template_setting"/>
+            <field name="kind">function</field>
+            <field name="action">write({'state':'suspended'})</field>
+        </record>
+        <record id="act_dummy" model="workflow.activity">
+            <field name="name">dummy</field>
+            <field name="wkf_id" ref="wkf_email_template_setting"/>
+            <field name="flow_stop">True</field>
+        </record>
+        
+        <!-- Transition -->
+        
+        <record id="trans_awaiting_approved" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_approved"/>
+            <field name="signal">button_approval</field>
+            <field name="role_id" ref="PE_ADMIN"/>
+        </record>
+        
+        <record id="trans_approved_suspended" model="workflow.transition">
+            <field name="act_from" ref="act_approved"/>
+            <field name="act_to" ref="act_suspended"/>
+            <field name="signal">button_suspended</field>
+            <field name="role_id" ref="PE_ADMIN"/>
+        </record>
+        <record id="trans_suspended_reapproved" model="workflow.transition">
+            <field name="act_from" ref="act_suspended"/>
+            <field name="act_to" ref="act_draft"/>
+            <field name="signal">get_reapprove</field>
+            <field name="role_id" ref="PE_ADMIN"/>
+        </record>
+        <record id="trans_suspended_dummy" model="workflow.transition">
+            <field name="act_from" ref="act_suspended"/>
+            <field name="act_to" ref="act_dummy"/>
+            <field name="signal">get_never</field>
+            <field name="role_id" ref="PE_ADMIN"/>
+        </record>        
+    </data>
+</openerp>
diff --git a/addons/email_template/html2text.py b/addons/email_template/html2text.py
new file mode 100755
index 00000000000..f8be00adf0f
--- /dev/null
+++ b/addons/email_template/html2text.py
@@ -0,0 +1,455 @@
+#!/usr/bin/env python
+"""html2text: Turn HTML into equivalent Markdown-structured text."""
+__version__ = "2.36"
+__author__ = "Aaron Swartz (me@aaronsw.com)"
+__copyright__ = "(C) 2004-2008 Aaron Swartz. GNU GPL 3."
+__contributors__ = ["Martin 'Joey' Schulze", "Ricardo Reyes", "Kevin Jay North"]
+
+# TODO:
+#   Support decoded entities with unifiable.
+
+if not hasattr(__builtins__, 'True'): True, False = 1, 0
+import re, sys, urllib, htmlentitydefs, codecs, StringIO, types
+import sgmllib
+import urlparse
+sgmllib.charref = re.compile('&#([xX]?[0-9a-fA-F]+)[^0-9a-fA-F]')
+
+try: from textwrap import wrap
+except: pass
+
+# Use Unicode characters instead of their ascii psuedo-replacements
+UNICODE_SNOB = 0
+
+# Put the links after each paragraph instead of at the end.
+LINKS_EACH_PARAGRAPH = 0
+
+# Wrap long lines at position. 0 for no wrapping. (Requires Python 2.3.)
+BODY_WIDTH = 78
+
+# Don't show internal links (href="#local-anchor") -- corresponding link targets
+# won't be visible in the plain text file anyway.
+SKIP_INTERNAL_LINKS = False
+
+### Entity Nonsense ###
+
+def name2cp(k):
+    if k == 'apos': return ord("'")
+    if hasattr(htmlentitydefs, "name2codepoint"): # requires Python 2.3
+        return htmlentitydefs.name2codepoint[k]
+    else:
+        k = htmlentitydefs.entitydefs[k]
+        if k.startswith("&#") and k.endswith(";"): return int(k[2:-1]) # not in latin-1
+        return ord(codecs.latin_1_decode(k)[0])
+
+unifiable = {'rsquo':"'", 'lsquo':"'", 'rdquo':'"', 'ldquo':'"', 
+'copy':'(C)', 'mdash':'--', 'nbsp':' ', 'rarr':'->', 'larr':'<-', 'middot':'*',
+'ndash':'-', 'oelig':'oe', 'aelig':'ae',
+'agrave':'a', 'aacute':'a', 'acirc':'a', 'atilde':'a', 'auml':'a', 'aring':'a', 
+'egrave':'e', 'eacute':'e', 'ecirc':'e', 'euml':'e', 
+'igrave':'i', 'iacute':'i', 'icirc':'i', 'iuml':'i',
+'ograve':'o', 'oacute':'o', 'ocirc':'o', 'otilde':'o', 'ouml':'o', 
+'ugrave':'u', 'uacute':'u', 'ucirc':'u', 'uuml':'u'}
+
+unifiable_n = {}
+
+for k in unifiable.keys():
+    unifiable_n[name2cp(k)] = unifiable[k]
+
+def charref(name):
+    if name[0] in ['x','X']:
+        c = int(name[1:], 16)
+    else:
+        c = int(name)
+    
+    if not UNICODE_SNOB and c in unifiable_n.keys():
+        return unifiable_n[c]
+    else:
+        return unichr(c)
+
+def entityref(c):
+    if not UNICODE_SNOB and c in unifiable.keys():
+        return unifiable[c]
+    else:
+        try: name2cp(c)
+        except KeyError: return "&" + c
+        else: return unichr(name2cp(c))
+
+def replaceEntities(s):
+    s = s.group(1)
+    if s[0] == "#": 
+        return charref(s[1:])
+    else: return entityref(s)
+
+r_unescape = re.compile(r"&(#?[xX]?(?:[0-9a-fA-F]+|\w{1,8}));")
+def unescape(s):
+    return r_unescape.sub(replaceEntities, s)
+    
+def fixattrs(attrs):
+    # Fix bug in sgmllib.py
+    if not attrs: return attrs
+    newattrs = []
+    for attr in attrs:
+        newattrs.append((attr[0], unescape(attr[1])))
+    return newattrs
+
+### End Entity Nonsense ###
+
+def onlywhite(line):
+    """Return true if the line does only consist of whitespace characters."""
+    for c in line:
+        if c is not ' ' and c is not '  ':
+            return c is ' '
+    return line
+
+def optwrap(text):
+    """Wrap all paragraphs in the provided text."""
+    if not BODY_WIDTH:
+        return text
+    
+    assert wrap, "Requires Python 2.3."
+    result = ''
+    newlines = 0
+    for para in text.split("\n"):
+        if len(para) > 0:
+            if para[0] is not ' ' and para[0] is not '-' and para[0] is not '*':
+                for line in wrap(para, BODY_WIDTH):
+                    result += line + "\n"
+                result += "\n"
+                newlines = 2
+            else:
+                if not onlywhite(para):
+                    result += para + "\n"
+                    newlines = 1
+        else:
+            if newlines < 2:
+                result += "\n"
+                newlines += 1
+    return result
+
+def hn(tag):
+    if tag[0] == 'h' and len(tag) == 2:
+        try:
+            n = int(tag[1])
+            if n in range(1, 10): return n
+        except ValueError: return 0
+
+class _html2text(sgmllib.SGMLParser):
+    def __init__(self, out=sys.stdout.write, baseurl=''):
+        sgmllib.SGMLParser.__init__(self)
+        
+        if out is None: self.out = self.outtextf
+        else: self.out = out
+        self.outtext = u''
+        self.quiet = 0
+        self.p_p = 0
+        self.outcount = 0
+        self.start = 1
+        self.space = 0
+        self.a = []
+        self.astack = []
+        self.acount = 0
+        self.list = []
+        self.blockquote = 0
+        self.pre = 0
+        self.startpre = 0
+        self.lastWasNL = 0
+        self.abbr_title = None # current abbreviation definition
+        self.abbr_data = None # last inner HTML (for abbr being defined)
+        self.abbr_list = {} # stack of abbreviations to write later
+        self.baseurl = baseurl
+    
+    def outtextf(self, s): 
+        self.outtext += s
+    
+    def close(self):
+        sgmllib.SGMLParser.close(self)
+        
+        self.pbr()
+        self.o('', 0, 'end')
+        
+        return self.outtext
+        
+    def handle_charref(self, c):
+        self.o(charref(c))
+
+    def handle_entityref(self, c):
+        self.o(entityref(c))
+            
+    def unknown_starttag(self, tag, attrs):
+        self.handle_tag(tag, attrs, 1)
+    
+    def unknown_endtag(self, tag):
+        self.handle_tag(tag, None, 0)
+        
+    def previousIndex(self, attrs):
+        """ returns the index of certain set of attributes (of a link) in the
+            self.a list
+ 
+            If the set of attributes is not found, returns None
+        """
+        if not attrs.has_key('href'): return None
+        
+        i = -1
+        for a in self.a:
+            i += 1
+            match = 0
+            
+            if a.has_key('href') and a['href'] == attrs['href']:
+                if a.has_key('title') or attrs.has_key('title'):
+                        if (a.has_key('title') and attrs.has_key('title') and
+                            a['title'] == attrs['title']):
+                            match = True
+                else:
+                    match = True
+
+            if match: return i
+
+    def handle_tag(self, tag, attrs, start):
+        attrs = fixattrs(attrs)
+    
+        if hn(tag):
+            self.p()
+            if start: self.o(hn(tag)*"#" + ' ')
+
+        if tag in ['p', 'div']: self.p()
+        
+        if tag == "br" and start: self.o("  \n")
+
+        if tag == "hr" and start:
+            self.p()
+            self.o("* * *")
+            self.p()
+
+        if tag in ["head", "style", 'script']: 
+            if start: self.quiet += 1
+            else: self.quiet -= 1
+
+        if tag in ["body"]:
+            self.quiet = 0 # sites like 9rules.com never close <head>
+        
+        if tag == "blockquote":
+            if start: 
+                self.p(); self.o('> ', 0, 1); self.start = 1
+                self.blockquote += 1
+            else:
+                self.blockquote -= 1
+                self.p()
+        
+        if tag in ['em', 'i', 'u']: self.o("_")
+        if tag in ['strong', 'b']: self.o("**")
+        if tag == "code" and not self.pre: self.o('`') #TODO: `` `this` ``
+        if tag == "abbr":
+            if start:
+                attrsD = {}
+                for (x, y) in attrs: attrsD[x] = y
+                attrs = attrsD
+                
+                self.abbr_title = None
+                self.abbr_data = ''
+                if attrs.has_key('title'):
+                    self.abbr_title = attrs['title']
+            else:
+                if self.abbr_title != None:
+                    self.abbr_list[self.abbr_data] = self.abbr_title
+                    self.abbr_title = None
+                self.abbr_data = ''
+        
+        if tag == "a":
+            if start:
+                attrsD = {}
+                for (x, y) in attrs: attrsD[x] = y
+                attrs = attrsD
+                if attrs.has_key('href') and not (SKIP_INTERNAL_LINKS and attrs['href'].startswith('#')): 
+                    self.astack.append(attrs)
+                    self.o("[")
+                else:
+                    self.astack.append(None)
+            else:
+                if self.astack:
+                    a = self.astack.pop()
+                    if a:
+                        i = self.previousIndex(a)
+                        if i is not None:
+                            a = self.a[i]
+                        else:
+                            self.acount += 1
+                            a['count'] = self.acount
+                            a['outcount'] = self.outcount
+                            self.a.append(a)
+                        self.o("][" + `a['count']` + "]")
+        
+        if tag == "img" and start:
+            attrsD = {}
+            for (x, y) in attrs: attrsD[x] = y
+            attrs = attrsD
+            if attrs.has_key('src'):
+                attrs['href'] = attrs['src']
+                alt = attrs.get('alt', '')
+                i = self.previousIndex(attrs)
+                if i is not None:
+                    attrs = self.a[i]
+                else:
+                    self.acount += 1
+                    attrs['count'] = self.acount
+                    attrs['outcount'] = self.outcount
+                    self.a.append(attrs)
+                self.o("![")
+                self.o(alt)
+                self.o("]["+`attrs['count']`+"]")
+        
+        if tag == 'dl' and start: self.p()
+        if tag == 'dt' and not start: self.pbr()
+        if tag == 'dd' and start: self.o('    ')
+        if tag == 'dd' and not start: self.pbr()
+        
+        if tag in ["ol", "ul"]:
+            if start:
+                self.list.append({'name':tag, 'num':0})
+            else:
+                if self.list: self.list.pop()
+            
+            self.p()
+        
+        if tag == 'li':
+            if start:
+                self.pbr()
+                if self.list: li = self.list[-1]
+                else: li = {'name':'ul', 'num':0}
+                self.o("  "*len(self.list)) #TODO: line up <ol><li>s > 9 correctly.
+                if li['name'] == "ul": self.o("* ")
+                elif li['name'] == "ol":
+                    li['num'] += 1
+                    self.o(`li['num']`+". ")
+                self.start = 1
+            else:
+                self.pbr()
+        
+        if tag in ["table", "tr"] and start: self.p()
+        if tag == 'td': self.pbr()
+        
+        if tag == "pre":
+            if start:
+                self.startpre = 1
+                self.pre = 1
+            else:
+                self.pre = 0
+            self.p()
+            
+    def pbr(self):
+        if self.p_p == 0: self.p_p = 1
+
+    def p(self): self.p_p = 2
+    
+    def o(self, data, puredata=0, force=0):
+        if self.abbr_data is not None: self.abbr_data += data
+        
+        if not self.quiet: 
+            if puredata and not self.pre:
+                data = re.sub('\s+', ' ', data)
+                if data and data[0] == ' ':
+                    self.space = 1
+                    data = data[1:]
+            if not data and not force: return
+            
+            if self.startpre:
+                #self.out(" :") #TODO: not output when already one there
+                self.startpre = 0
+            
+            bq = (">" * self.blockquote)
+            if not (force and data and data[0] == ">") and self.blockquote: bq += " "
+            
+            if self.pre:
+                bq += "    "
+                data = data.replace("\n", "\n"+bq)
+            
+            if self.start:
+                self.space = 0
+                self.p_p = 0
+                self.start = 0
+
+            if force == 'end':
+                # It's the end.
+                self.p_p = 0
+                self.out("\n")
+                self.space = 0
+
+
+            if self.p_p:
+                self.out(('\n'+bq)*self.p_p)
+                self.space = 0
+                
+            if self.space:
+                if not self.lastWasNL: self.out(' ')
+                self.space = 0
+
+            if self.a and ((self.p_p == 2 and LINKS_EACH_PARAGRAPH) or force == "end"):
+                if force == "end": self.out("\n")
+
+                newa = []
+                for link in self.a:
+                    if self.outcount > link['outcount']:
+                        self.out("   ["+`link['count']`+"]: " + urlparse.urljoin(self.baseurl, link['href'])) 
+                        if link.has_key('title'): self.out(" ("+link['title']+")")
+                        self.out("\n")
+                    else:
+                        newa.append(link)
+
+                if self.a != newa: self.out("\n") # Don't need an extra line when nothing was done.
+
+                self.a = newa
+            
+            if self.abbr_list and force == "end":
+                for abbr, definition in self.abbr_list.items():
+                    self.out("  *[" + abbr + "]: " + definition + "\n")
+
+            self.p_p = 0
+            self.out(data)
+            self.lastWasNL = data and data[-1] == '\n'
+            self.outcount += 1
+
+    def handle_data(self, data):
+        if r'\/script>' in data: self.quiet -= 1
+        self.o(data, 1)
+    
+    def unknown_decl(self, data): pass
+
+def wrapwrite(text): sys.stdout.write(text.encode('utf8'))
+
+def html2text_file(html, out=wrapwrite, baseurl=''):
+    h = _html2text(out, baseurl)
+    h.feed(html)
+    h.feed("")
+    return h.close()
+
+def html2text(html, baseurl=''):
+    return optwrap(html2text_file(html, None, baseurl))
+
+if __name__ == "__main__":
+    baseurl = ''
+    if sys.argv[1:]:
+        arg = sys.argv[1]
+        if arg.startswith('http://'):
+            baseurl = arg
+            j = urllib.urlopen(baseurl)
+            try:
+                from feedparser import _getCharacterEncoding as enc
+            except ImportError:
+                   enc = lambda x, y: ('utf-8', 1)
+            text = j.read()
+            encoding = enc(j.headers, text)[0]
+            if encoding == 'us-ascii': encoding = 'utf-8'
+            data = text.decode(encoding)
+
+        else:
+            encoding = 'utf8'
+            if len(sys.argv) > 2:
+                encoding = sys.argv[2]
+	    f = open(arg, 'r')
+	    try:
+		    data = f.read().decode(encoding)
+	    finally:
+		    f.close()
+    else:
+        data = sys.stdin.read().decode('utf8')
+    wrapwrite(html2text(data, baseurl))
+
diff --git a/addons/email_template/security/email_template_security.xml b/addons/email_template/security/email_template_security.xml
new file mode 100755
index 00000000000..90067252eca
--- /dev/null
+++ b/addons/email_template/security/email_template_security.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data noupdate="0">
+
+		<record id="res_groups_email_template_manager" model="res.groups">
+			<field name="name">Email Template / Settings_Manager</field>
+		</record>
+
+		<record id="res_groups_email_template_userse" model="res.groups">
+			<field name="name">Email Template / External_users</field>
+		</record>
+
+		<record id="res_groups_email_template_usersi" model="res.groups">
+			<field name="name">Email Template / Internal_users</field>
+		</record>
+
+
+	</data>
+</openerp>
diff --git a/addons/email_template/wizard/__init__.py b/addons/email_template/wizard/__init__.py
new file mode 100755
index 00000000000..ea6fcfbcd86
--- /dev/null
+++ b/addons/email_template/wizard/__init__.py
@@ -0,0 +1 @@
+import email_template_send_wizard
diff --git a/addons/email_template/wizard/email_template_send_wizard.py b/addons/email_template/wizard/email_template_send_wizard.py
new file mode 100755
index 00000000000..7d27eab9adf
--- /dev/null
+++ b/addons/email_template/wizard/email_template_send_wizard.py
@@ -0,0 +1,235 @@
+from osv import osv, fields
+from mako.template import Template
+from mako import exceptions
+import netsvc
+import base64
+import time
+from tools.translate import _
+import tools
+from email_template.email_template import get_value
+
+class email_template_send_wizard(osv.osv_memory):
+    _name = 'email_template.send.wizard'
+    _description = 'This is the wizard for sending mail'
+    _rec_name = "subject"
+
+    def _get_accounts(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+
+        template = self._get_template(cr, uid, context)
+        if not template:
+            return []
+
+        logger = netsvc.Logger()
+
+        if template.enforce_from_account:
+            return [(template.enforce_from_account.id, '%s (%s)' % (template.enforce_from_account.name, template.enforce_from_account.email_id))]
+        else:
+            account_id = self.pool.get('email_template.account').search(cr,uid,[('company','=','no'),('user','=',uid)], context=context)
+            if account_id:
+                account = self.pool.get('email_template.account').browse(cr,uid,account_id, context)
+                return [(r.id,r.name + " (" + r.email_id + ")") for r in account]
+            else:
+               logger.notifyChannel(_("Power Email"), netsvc.LOG_ERROR, _("No personal email accounts are configured for you. \nEither ask admin to enforce an account for this template or get yourself a personal power email account."))
+               raise osv.except_osv(_("Power Email"),_("No personal email accounts are configured for you. \nEither ask admin to enforce an account for this template or get yourself a personal power email account."))
+
+    def get_value(self, cursor, user, template, message, context=None, id=None):
+        """Gets the value of the message parsed with the content of object id (or the first 'src_rec_ids' if id is not given)"""
+        if not message:
+            return ''
+        if not id:
+            id = context['src_rec_ids'][0]
+        return get_value(cursor, user, id, message, template, context)
+    
+    def _get_template(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        if not 'template' in context and not 'template_id' in context:
+            return None
+        if 'template_id' in context.keys():
+            template_ids = self.pool.get('email.template').search(cr, uid, [('id','=',context['template_id'])], context=context)
+        elif 'template' in context.keys():
+            # Old versions of email_template used the name of the template. This caused
+            # problems when the user changed the name of the template, but we keep the code
+            # for compatibility with those versions.
+            template_ids = self.pool.get('email.template').search(cr, uid, [('name','=',context['template'])], context=context)
+        if not template_ids:
+            return None
+
+        template = self.pool.get('email.template').browse(cr, uid, template_ids[0], context)
+
+        lang = self.get_value(cr, uid, template, template.lang, context)
+        if lang:
+            # Use translated template if necessary
+            ctx = context.copy()
+            ctx['lang'] = lang
+            template = self.pool.get('email.template').browse(cr, uid, template.id, ctx)
+        return template
+
+    def _get_template_value(self, cr, uid, field, context=None):
+        template = self._get_template(cr, uid, context)
+        if not template:
+            return False
+        if len(context['src_rec_ids']) > 1: # Multiple Mail: Gets original template values for multiple email change
+            return getattr(template, field)
+        else: # Simple Mail: Gets computed template values
+            return self.get_value(cr, uid, template, getattr(template, field), context)
+
+    _columns = {
+        'state':fields.selection([
+                        ('single','Simple Mail Wizard Step 1'),
+                        ('multi','Multiple Mail Wizard Step 1'),
+                        ('done','Wizard Complete')
+                                  ],'Status',readonly=True),
+        'ref_template':fields.many2one('email.template','Template',readonly=True),
+        'rel_model':fields.many2one('ir.model','Model',readonly=True),
+        'rel_model_ref':fields.integer('Referred Document',readonly=True),
+        'from':fields.selection(_get_accounts,'From Account',select=True),
+        'to':fields.char('To',size=250,required=True),
+        'cc':fields.char('CC',size=250,),
+        'bcc':fields.char('BCC',size=250,),
+        'subject':fields.char('Subject',size=200),
+        'body_text':fields.text('Body',),
+        'body_html':fields.text('Body',),
+        'report':fields.char('Report File Name',size=100,),
+        'signature':fields.boolean('Attach my signature to mail'),
+        #'filename':fields.text('File Name'),
+        'requested':fields.integer('No of requested Mails',readonly=True),
+        'generated':fields.integer('No of generated Mails',readonly=True), 
+        'full_success':fields.boolean('Complete Success',readonly=True),
+        'attachment_ids': fields.many2many('ir.attachment','send_wizard_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
+    }
+
+    _defaults = {
+        'state': lambda self,cr,uid,ctx: len(ctx['src_rec_ids']) > 1 and 'multi' or 'single',
+        'rel_model': lambda self,cr,uid,ctx: self.pool.get('ir.model').search(cr,uid,[('model','=',ctx['src_model'])],context=ctx)[0],
+        'rel_model_ref': lambda self,cr,uid,ctx: ctx['active_id'],
+        'to': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'def_to', ctx),
+        'cc': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'def_cc', ctx),
+        'bcc': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'def_bcc', ctx),
+        'subject':lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'def_subject', ctx),
+        'body_text':lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'def_body_text', ctx),
+        'body_html':lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'def_body_html', ctx),
+        'report': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'file_name', ctx),
+        'signature': lambda self,cr,uid,ctx: self._get_template(cr, uid, ctx).use_sign,
+        'ref_template':lambda self,cr,uid,ctx: self._get_template(cr, uid, ctx).id,
+        'requested':lambda self,cr,uid,ctx: len(ctx['src_rec_ids']),
+        'full_success': lambda *a: False
+    }
+
+    def fields_get(self, cr, uid, fields=None, context=None, read_access=True):
+        result = super(email_template_send_wizard, self).fields_get(cr, uid, fields, context, read_access)
+        if 'attachment_ids' in result and 'src_model' in context:
+            result['attachment_ids']['domain'] = [('res_model','=',context['src_model']),('res_id','=',context['active_id'])]
+        return result
+
+    def sav_to_drafts(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        mailid = self.save_to_mailbox(cr, uid, ids, context)
+        if self.pool.get('email_template.mailbox').write(cr, uid, mailid, {'folder':'drafts'}, context):
+            return {'type':'ir.actions.act_window_close' }
+
+    def send_mail(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        mailid = self.save_to_mailbox(cr, uid, ids, context)
+        if self.pool.get('email_template.mailbox').write(cr, uid, mailid, {'folder':'outbox'}, context):
+            return {'type':'ir.actions.act_window_close' }
+
+    def get_generated(self, cr, uid, ids=None, context=None):
+        if ids is None:
+            ids = []
+        if context is None:
+            context = {}
+        logger = netsvc.Logger()
+        if context['src_rec_ids'] and len(context['src_rec_ids'])>1:
+            #Means there are multiple items selected for email.
+            mail_ids = self.save_to_mailbox(cr, uid, ids, context)
+            if mail_ids:
+                self.pool.get('email_template.mailbox').write(cr, uid, mail_ids, {'folder':'outbox'}, context)
+                logger.notifyChannel(_("Power Email"), netsvc.LOG_INFO, _("Emails for multiple items saved in outbox."))
+                self.write(cr, uid, ids, {
+                    'generated':len(mail_ids),
+                    'state':'done'
+                }, context)
+            else:
+                raise osv.except_osv(_("Power Email"),_("Email sending failed for one or more objects."))
+        return True
+     
+    def save_to_mailbox(self, cr, uid, ids, context=None):
+        def get_end_value(id, value):
+            if len(context['src_rec_ids']) > 1: # Multiple Mail: Gets value from the template
+                return self.get_value(cr, uid, template, value, context, id)
+            else:
+                return value
+
+        mail_ids = []
+        template = self._get_template(cr, uid, context)
+        for id in context['src_rec_ids']:
+            print "@22222222222222222222222",ids
+            screen_vals = self.read(cr, uid, ids[0], [],context)
+            account = self.pool.get('email_template.account').read(cr, uid, screen_vals['from'], context=context)
+            vals = {
+                'email_from': tools.ustr(account['name']) + "<" + tools.ustr(account['email_id']) + ">",
+                'email_to': get_end_value(id, screen_vals['to']),
+                'email_cc': get_end_value(id, screen_vals['cc']),
+                'email_bcc': get_end_value(id, screen_vals['bcc']),
+                'subject': get_end_value(id, screen_vals['subject']),
+                'body_text': get_end_value(id, screen_vals['body_text']),
+                'body_html': get_end_value(id, screen_vals['body_html']),
+                'account_id': screen_vals['from'],
+                'state':'na',
+                'mail_type':'multipart/alternative' #Options:'multipart/mixed','multipart/alternative','text/plain','text/html'
+            }
+            if screen_vals['signature']:
+                signature = self.pool.get('res.users').read(cr, uid, uid, ['signature'], context)['signature']
+                if signature:
+                    vals['body_text'] = tools.ustr(vals['body_text'] or '') + signature
+                    vals['body_html'] = tools.ustr(vals['body_html'] or '') + signature
+
+            attachment_ids = []
+
+            #Create partly the mail and later update attachments
+            mail_id = self.pool.get('email_template.mailbox').create(cr, uid, vals, context)
+            mail_ids.append(mail_id)
+            if template.report_template:
+                reportname = 'report.' + self.pool.get('ir.actions.report.xml').read(cr, uid, template.report_template.id, ['report_name'], context)['report_name']
+                data = {}
+                data['model'] = self.pool.get('ir.model').browse(cr, uid, screen_vals['rel_model'], context).model
+
+                # Ensure report is rendered using template's language
+                ctx = context.copy()
+                if template.lang:
+                    ctx['lang'] = self.get_value(cr, uid, template, template.lang, context, id)
+                service = netsvc.LocalService(reportname)
+                (result, format) = service.create(cr, uid, [id], data, ctx)
+                attachment_id = self.pool.get('ir.attachment').create(cr, uid, {
+                    'name': _('%s (Email Attachment)') % tools.ustr(vals['subject']),
+                    'datas': base64.b64encode(result),
+                    'datas_fname': tools.ustr(get_end_value(id, screen_vals['report']) or _('Report')) + "." + format,
+                    'description': vals['body_text'] or _("No Description"),
+                    'res_model': 'email_template.mailbox',
+                    'res_id': mail_id
+                }, context)
+                attachment_ids.append( attachment_id )
+
+            # Add document attachments
+            for attachment_id in screen_vals.get('attachment_ids',[]):
+                new_id = self.pool.get('ir.attachment').copy(cr, uid, attachment_id, {
+                    'res_model': 'email_template.mailbox',
+                    'res_id': mail_id,
+                }, context)
+                attachment_ids.append( new_id )
+
+            if attachment_ids:
+                self.pool.get('email_template.mailbox').write(cr, uid, mail_id, {
+                    'attachments_ids': [[6, 0, attachment_ids]],
+                    'mail_type': 'multipart/mixed'
+                }, context)
+
+        return mail_ids
+email_template_send_wizard()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/wizard/email_template_send_wizard_view.xml b/addons/email_template/wizard/email_template_send_wizard_view.xml
new file mode 100755
index 00000000000..5f2f1641e31
--- /dev/null
+++ b/addons/email_template/wizard/email_template_send_wizard_view.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+		<record model="ir.ui.view" id="email_template_send_wizard_form">
+			<field name="name">email_template.send.wizard.form</field>
+			<field name="model">email_template.send.wizard</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Send mail Wizard">
+					<group col="4" colspan="4">
+						<field name="rel_model" colspan="2" />
+						<field name="from" required="1" colspan="2" />
+					</group>
+					<group col="4" colspan="4">
+						<group col="6" colspan="4">
+							<field name="to" select="1" colspan="4" />
+							<newline />
+							<field name="cc" select="2" colspan="4" />
+							<newline />
+							<field name="bcc" select="2" colspan="4" />
+							<newline />
+							<field name="subject" select="2" colspan="4" attrs="{'required':[('state','=','single')]}" />
+							<newline />
+							<field name="report" colspan="4" />
+						</group>
+						<separator string="" colspan="4" />
+						<notebook colspan="4">
+							<page string="Body (Plain Text)">
+								<field name="body_text" select="2" colspan="4" nolabel="1" />
+							</page>
+							<page string="Body (HTML)">
+								<field name="body_html" select="2" colspan="4" nolabel="1" />
+								<!--<label string="Note: HTML body can't be edited with GTK desktop client." colspan="4"/>
+							--></page>
+							<page string="Attachments">
+								<label string="Add here all attachments of the current document you want to include in the e-mail." colspan="4"/>
+								<field name="attachment_ids" colspan="4" nolabel="1"/>
+							</page>
+						</notebook>
+						<field name="signature" colspan="4" />
+					</group>
+					<group col="4" colspan="4" attrs="{'invisible':[('state','!=','single')]}">
+						<button icon="gtk-apply" name="sav_to_drafts" string="Save in Drafts" type="object" />
+						<button icon="gtk-ok" name="send_mail" string="Send now" type="object" />
+						<button icon="gtk-cancel" special="cancel" string="Discard Mail" />
+					</group>
+					<group col="4" colspan="4" attrs="{'invisible':[('state','=','single')]}">
+					    <label string="Tip: Multiple emails are sent in the same language (the first one is proposed). We suggest you send emails in groups according to language." colspan="4"/>
+						<field name="requested" />
+						<field name="generated" />
+						<button icon="gtk-ok" name="get_generated" string="Send all mails" type="object" states="multi" colspan="2" />
+						<button icon="gtk-cancel" special="cancel" string="Discard Mail" colspan="2" states="multi" />
+					</group>
+					<button icon="gtk-ok" special="cancel" string="Close" colspan="4" states="done" />
+					<field name="state" />
+					<newline />
+					<label string="After clicking send all mails, mails will be sent to outbox and cleared in next Send/Recieve" colspan="4"/>
+				</form>
+			</field>
+		</record>
+	</data>
+</openerp>
+
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 37ac26ac7b4..a238f637dad 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -127,8 +127,8 @@
                 <search string="Events">
                     <group col="10" colspan="4">
                         <separator orientation="vertical"/>
-                        <filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/>
-                        <filter icon="terp-calendar" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/>
+                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
                         <separator orientation="vertical"/>
                         <field name="name" string="Event" select="1"/>
                         <field name="user_id" select="1"/>
@@ -223,25 +223,32 @@
                     <page string="History">
                         <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
 	                        <form string="Communication history">
-							    <group col="6" colspan="4">
-							        <field name="date"/>
-							        <field name="email_to"/>
-							        <field name="email_from"/>
-								</group>
-							   <newline/>
-							   <field name="description" colspan="4" nolabel="1"/>
-							   <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="description"/>
-							   <field name="email_to"/>
-							   <field name="date"/>
-							</tree>
-                        </field>
+                                    <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'}"
+                                    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>
                         <field name="log_ids" nolabel="1" colspan="4" mode="tree,form" readonly="1">
                             <tree string="Actions">
                                 <separator string="Action Information" colspan="4"/>
@@ -275,8 +282,8 @@
                 <search string="Event Registration">
                     <group col="12" colspan="4">
                         <separator orientation="vertical"/>
-                        <filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
-                        <filter icon="terp-calendar" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
+                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
                         <separator orientation="vertical"/>
                         <field name="event_id" select="1"/>
                         <field name="user_id" select="1"/>
diff --git a/addons/event/wizard/event_make_invoice.py b/addons/event/wizard/event_make_invoice.py
index 1e8505a74e9..e4eacf99d3c 100644
--- a/addons/event/wizard/event_make_invoice.py
+++ b/addons/event/wizard/event_make_invoice.py
@@ -69,7 +69,7 @@ class event_make_invoice(osv.osv_memory):
                 inv_rej_reason += "ID "+str(reg.id)+": Registration doesn't have any partner to invoice. \n"
                 continue
             else:
-                val_invoice = pool_obj.get('account.invoice').onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
+                val_invoice = inv_obj.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
                 val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
                 partner_address_id = val_invoice['value']['address_invoice_id']
                 
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 6419cc8a18d..aa403cc0090 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -1,22 +1,20 @@
-#!/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
-#    mga@tinyerp.com
+#    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/>.
 #
 ##############################################################################
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 3ce73f07b12..6859150e855 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -15,9 +15,9 @@
             <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']"
+                <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>
@@ -31,7 +31,7 @@
             <field name="hr_attendance"/>
           </group>
           <xpath expr="//button[@string='Install Modules']" position="attributes">
-          	<attribute name="string">Configure</attribute>
+              <attribute name="string">Configure</attribute>
           </xpath>
         </data>
       </field>
@@ -56,11 +56,11 @@
     <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>
-	</record>
+    <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>
+    </record>
   </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 36524395355..75da20cef20 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -106,7 +106,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <filter icon="terp-partner" domain="[('active','=',False)]" string="Unactive"
+                    <filter icon="terp-personal-" domain="[('active','=',False)]" string="Unactive"
                         groups="base.group_extended"/>
                     <separator orientation="vertical" />
                     <field name="name"/>
@@ -114,12 +114,12 @@
                     <field name="job_id" widget="selection"/>
                     <field name="parent_id" widget="selection" />
                     <newline />
-                    <group expand="1" string="Group By...">
-                        <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <filter string="Coach" icon="terp-sale" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/>
+                    <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-sale" domain="[]" context="{'group_by':'department_id'}"/>
-                        <filter string="Job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
+                        <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>
@@ -358,15 +358,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Jobs">
-                    <filter icon="terp-crm"
+                    <filter icon="terp-check"
                         domain="[('state','in',('open','recruit'))]"
                         string="Current"
                         help="Open and in recruitment positions"/>
-                    <filter icon="terp-crm"
+                    <filter icon="terp-personal+"
                         domain="[('state','=','recruit')]"
                         string="Recruitment"
                         help="In Recruitment"/>
-                    <filter icon="terp-crm"
+                    <filter icon="terp-camera_test"
                         domain="[('state','=','open')]"
                         string="Open"
                         help="Open Positions"/>
@@ -374,7 +374,7 @@
                     <separator orientation="vertical"/>
                     <field name="name"/>
                      <field name="department_id" widget="selection">
-                            <filter icon="terp-crm"
+                            <filter icon="terp-gtk-select-all"
                             domain="[('department_id','=',context.get('department_id',False))]"
                             help="My Departments Jobs"/>
                     </field>
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index 28004486e04..d342519af6c 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -1,162 +1,163 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr
-#
+# * hr
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-06-07 21:48+0000\n"
+"Last-Translator: Drazen Bosak <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-04-17 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Openerp user"
-msgstr ""
+msgstr "OpenERP korisnik"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.edit_workgroup
 #: model:ir.ui.menu,name:hr.menu_edit_workgroup
 msgid "Working Time Categories"
-msgstr ""
+msgstr "Kategorije radnog vremena"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivne odjele!"
 
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr ""
+msgstr "SIN No"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr ""
+msgstr "Ljudski Resursi"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Sunday"
-msgstr ""
+msgstr "Nedjelja"
 
 #. module: hr
 #: view:res.users:0
 msgid "Parents"
-msgstr ""
+msgstr "Roditelji"
 
 #. module: hr
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: hr
 #: view:hr.department:0
 msgid "Department"
-msgstr ""
+msgstr "Odjel"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Contact  of employee"
-msgstr ""
+msgstr "Kontakt Djelatnika"
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work Email"
-msgstr ""
+msgstr "Poslovni Email"
 
 #. module: hr
 #: field:hr.timesheet.group,name:0
 msgid "Group name"
-msgstr ""
+msgstr "Ime Grupe"
 
 #. module: hr
 #: field:hr.department,company_id:0
 #: field:hr.employee,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Tvrtka"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Friday"
-msgstr ""
+msgstr "Petak"
 
 #. module: hr
 #: field:hr.department,parent_id:0
 msgid "Parent Department"
-msgstr ""
+msgstr "Ishodni Odjel"
 
 #. module: hr
 #: view:hr.department:0
 #: view:hr.employee:0
 #: field:hr.employee,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: hr
 #: field:hr.timesheet,hour_from:0
 msgid "Work from"
-msgstr ""
+msgstr "Posao od"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr ""
+msgstr "Hijerarhija Djelatnika"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracija"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Unmaried"
-msgstr ""
+msgstr "Nije u braku"
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Female"
-msgstr ""
+msgstr "Žensko"
 
 #. module: hr
 #: view:hr.timesheet.group:0
 msgid "Working Time Category"
-msgstr ""
+msgstr "Kategorija radnog vremena"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_tree
 msgid "Employees Structure"
-msgstr ""
+msgstr "Struktura Djelatnika"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr ""
+msgstr "Osobni ID brojevi"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
-msgstr ""
+msgstr "Poslovni telefon"
 
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Slijedne Kategorije"
 
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr ""
+msgstr "Lokacija ureda"
 
 #. module: hr
 #: view:hr.employee:0
@@ -164,52 +165,52 @@ msgstr ""
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
-msgstr ""
+msgstr "Djelatnik"
 
 #. module: hr
 #: field:hr.timesheet.group,manager:0
 msgid "Workgroup manager"
-msgstr ""
+msgstr "Voditelj Radne Grupe"
 
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
-msgstr ""
+msgstr "Podređeni Djelatnici"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Izvještavanje"
 
 #. module: hr
 #: field:hr.department,member_ids:0
 msgid "Members"
-msgstr ""
+msgstr "Članovi"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr ""
+msgstr "SSN No"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
 msgid "Fill up contact information"
-msgstr ""
+msgstr "Ispunite kontakt podatke"
 
 #. module: hr
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Divorced"
-msgstr ""
+msgstr "Razveden-a"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Ishodna Kategorija"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
@@ -217,276 +218,277 @@ msgstr ""
 #: model:ir.ui.menu,name:hr.menu_department_def
 #: model:ir.ui.menu,name:hr.menu_department_tree
 msgid "Departments"
-msgstr ""
+msgstr "Odjeli"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr ""
+msgstr "Kontakt Djelatnika"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Maried"
-msgstr ""
+msgstr "U braku"
 
 #. module: hr
 #: field:hr.timesheet,tgroup_id:0
 msgid "Employee's timesheet group"
-msgstr ""
+msgstr "Grupa kontrolnih kartica Djelatnika"
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Male"
-msgstr ""
+msgstr "Muško"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
 msgid "Create openerp user"
-msgstr ""
+msgstr "Kreiraj OpenERP Korisnika"
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr ""
+msgstr "Kategorija Djelatnika"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Utorak"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr ""
+msgstr "Odjel Ljudskih Resursa"
 
 #. module: hr
 #: field:hr.employee,user_id:0
 msgid "Related User"
-msgstr ""
+msgstr "Povezani Korisnik"
 
 #. module: hr
 #: field:hr.employee,category_id:0
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
-msgstr ""
+msgstr "Bilješka"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr ""
+msgstr "Kontakt podaci"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Monday"
-msgstr ""
+msgstr "Ponedjeljak"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
 msgid "Categories structure"
-msgstr ""
+msgstr "Struktura Kategorija"
 
 #. module: hr
 #: field:hr.timesheet,dayofweek:0
 msgid "Day of week"
-msgstr ""
+msgstr "Dan u tjednu"
 
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Birthday"
-msgstr ""
+msgstr "Rođendan"
 
 #. module: hr
 #: field:hr.employee,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivnu Hijerarhiju Djelatnika"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract Process"
-msgstr ""
+msgstr "Proces rada s Ugovorom Djelatnika"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Create OpenERP User"
-msgstr ""
+msgstr "Kreiraj OpenERP Korisnika"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee Complete Form"
-msgstr ""
+msgstr "Cjelovit formular Djelatnika"
 
 #. module: hr
 #: view:hr.department:0
 msgid "Companies"
-msgstr ""
+msgstr "Tvrtke"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Srijeda"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Categories of Employee"
-msgstr ""
+msgstr "Kategorije djelatnika"
 
 #. module: hr
 #: field:hr.timesheet,date_from:0
 msgid "Starting date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: hr
 #: field:res.users,parent_id:0
 msgid "Parent Users"
-msgstr ""
+msgstr "Ishodni korisnici"
 
 #. module: hr
 #: field:hr.employee,address_id:0
 msgid "Working Address"
-msgstr ""
+msgstr "Poslovna adresa"
 
 #. module: hr
 #: field:hr.employee,marital:0
 msgid "Marital Status"
-msgstr ""
+msgstr "Bračni status"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Niz Kontrolne kartice"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Personal Information"
-msgstr ""
+msgstr "Osobni podaci"
 
 #. module: hr
 #: constraint:ir.model:0
 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
 #: view:hr.timesheet:0
 #: field:hr.timesheet.group,timesheet_id:0
 #: model:ir.model,name:hr.model_hr_timesheet_group
 msgid "Working Time"
-msgstr ""
+msgstr "Radno vrijeme"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Thursday"
-msgstr ""
+msgstr "Četvrtak"
 
 #. module: hr
 #: field:hr.timesheet,hour_to:0
 msgid "Work to"
-msgstr ""
+msgstr "Rad do"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Other"
-msgstr ""
+msgstr "Drugi"
 
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr ""
+msgstr "Kategorije Djelatnika"
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr ""
+msgstr "Kućna adresa"
 
 #. module: hr
 #: view:hr.department:0
 msgid "department"
-msgstr ""
+msgstr "Odjel"
 
 #. module: hr
 #: field:hr.employee,country_id:0
 msgid "Nationality"
-msgstr ""
+msgstr "Narodnost"
 
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other ID"
-msgstr ""
+msgstr "Drugi ID broj"
 
 #. module: hr
 #: field:hr.timesheet,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: hr
 #: field:hr.employee,gender:0
 msgid "Gender"
-msgstr ""
+msgstr "Spol"
 
 #. module: hr
 #: view:hr.employee:0
 #: model:ir.actions.act_window,name:hr.open_view_employee_list
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list
 msgid "Employees"
-msgstr ""
+msgstr "Djelatnici"
 
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
-msgstr ""
+msgstr "Ime Odjela"
 
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr ""
+msgstr "Slijedni Odjeli"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Job Information"
-msgstr ""
+msgstr "Poslovni podaci"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Fill up employee's contact information"
-msgstr ""
+msgstr "Ispunite kontakt podatke Djelatnika"
 
 #. module: hr
 #: field:hr.department,manager_id:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr ""
+msgstr "Voditelj"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_list_my
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
 msgid "All Employees"
-msgstr ""
+msgstr "Svi Djelatnici"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Saturday"
-msgstr ""
+msgstr "Subota"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_new
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_new
 msgid "New Employee"
-msgstr ""
+msgstr "Novi Djelatnik"
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 8b9a68575b0..e3db974ebb5 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -48,16 +48,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Hr Attendance Search">
-                    <filter icon="terp-sale" string="My Attendances" domain="[('employee_id.user_id.id', '=', uid)]" />
-                    <filter icon="terp-sale" string="Today" domain="[('name::date','=',current_date)]" />
+                    <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" />
                     <newline/>
-                    <group expand="1" string="Group By...">
-                        <filter name="employee" string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/>
-                        <filter string="Day" icon="terp-sale" domain="[]" context="{'group_by':'day'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter name="employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter string="Day" icon="terp-go-month" domain="[]" context="{'group_by':'day'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index e4e8259bda4..40cebb98ef2 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -133,21 +133,21 @@
             </field>
         </record>
 
-		<record id="hr_contract_view_search" model="ir.ui.view">
+        <record id="hr_contract_view_search" model="ir.ui.view">
             <field name="name">hr.contract.view.search</field>
             <field name="model">hr.contract</field>
             <field name="type">search</field>
             <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="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Wage Type" icon="terp-project" domain="[]" context="{'group_by':'wage_type_id'}"/>
+                   <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'}"/>
                     </group>
                </search>
             </field>
@@ -217,7 +217,7 @@
             <field name="search_view_id" ref="hr_contract_view_search"/>
         </record>
 
-		<record id="hr_contract_type_view_form" model="ir.ui.view">
+        <record id="hr_contract_type_view_form" model="ir.ui.view">
             <field name="name">hr.contract.type.view.form</field>
             <field name="model">hr.contract.type</field>
             <field name="type">form</field>
@@ -228,7 +228,7 @@
             </field>
         </record>
 
-		 <record id="hr_contract_type_view_tree" model="ir.ui.view">
+         <record id="hr_contract_type_view_tree" model="ir.ui.view">
             <field name="name">hr.contract.type.view.tree</field>
             <field name="model">hr.contract.type</field>
             <field name="type">tree</field>
@@ -250,7 +250,7 @@
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_root" 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"/>
+        <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>
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index 2ad9629d61a..83776dde4cd 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -7,6 +7,7 @@
             <field eval="[(6,0,[])]" name="users"/>
             <field name="type" ref="survey.survey_type1"/>
             <field name="responsible_id" ref="base.user_demo"/>
+            <field name="response_user">5</field>
         </record>
     </data>
     <data>
@@ -16,6 +17,7 @@
             <field eval="[(6,0,[])]" name="users"/>
             <field name="type" ref="survey.survey_type1"/>
             <field name="responsible_id" ref="base.user_root"/>
+            <field name="response_user">5</field>
         </record>
     </data>
     <data>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index d02c76bc44c..a3e4cac2a5f 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -13,8 +13,8 @@
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." groups="base.group_multi_company">
-                        <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}"/>
+                   <group expand="0" string="Group By..." groups="base.group_multi_company">
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                     </group>
                </search>
             </field>
@@ -243,15 +243,15 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-hr" string="Draft" domain="[('state','=','draft')]"/>
-                        <filter icon="terp-crm" string="In progress" domain="[('state','=','wait')]"/>
-                        <filter icon="terp-mrp" string="Final Step" domain="[('state','=','progress')]"/>
+                        <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="gtk-media-rewind" string="7 Days"
+                        <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="gtk-media-rewind" string="Overpassed"
+                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Overpassed"
                             help="Evaluations that overpassed the deadline"
                             domain="[('date','&gt;=',(datetime.date.today()))]"
                         />
@@ -261,12 +261,12 @@
                         <field name="plan_id" widget="selection" select="1"/>
                         </group>
                         <newline/>
-                        <group expand='1' string='Group by...'>
-                        <filter string='Employee' icon="terp-stock" domain="[]" context="{'group_by' : 'employee_id'}" />
-                        <filter string='Plan' icon="terp-stock" domain="[]" context="{'group_by' : 'plan_id'}" />
-                        <filter string='State' icon="terp-stock" domain="[]" context="{'group_by' : 'state'}" />
+                        <group expand='0' string='Group by...'>
+                        <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
+                        <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
+                        <filter string='State' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
                         <separator orientation="vertical"/>
-                        <filter string='Date' icon="terp-stock" domain="[]" context="{'group_by' : 'date'}" />
+                        <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
                    </group>
                </search>
             </field>
@@ -344,10 +344,10 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-crm" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
+                        <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-stock" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
                         <field name="user_to_review_id" widget="selection"/>
                         <field name="user_id" string="Interviewer" widget="selection"/>
diff --git a/addons/hr_evaluation/i18n/hr.po b/addons/hr_evaluation/i18n/hr.po
new file mode 100644
index 00000000000..4c93f32f7de
--- /dev/null
+++ b/addons/hr_evaluation/i18n/hr.po
@@ -0,0 +1,277 @@
+# Croatian 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-06 23:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian <hr@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-08 03:41+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 ""
+
+#. module: hr_evaluation
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Schedule next evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_bad:0
+msgid "Bad Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,value_ids:0
+msgid "Values"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_good:0
+msgid "Good Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,state:0
+msgid "State"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Informal Data"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_improve:0
+msgid "To Improve"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,evaluation_id:0
+msgid "Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type.value,type_id:0
+msgid "Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Apply to categories"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid "Ability to create employees evaluation."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,name:0
+msgid "Quote"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Choices Results"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Date"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
+msgid "Configuration"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
+msgid "Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
+msgid "Evaluation Criterions"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
+msgid "My Preceeding Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
+msgid "HR Responsible"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,value_id:0
+#: field:hr_evaluation.type.value,name:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
+msgid "Employee Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Quotations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
+msgid "Next Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,type_id:0
+msgid "Type"
+msgstr ""
+
+#. 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/i18n/id.po b/addons/hr_evaluation/i18n/id.po
new file mode 100644
index 00000000000..e8766d233f0
--- /dev/null
+++ b/addons/hr_evaluation/i18n/id.po
@@ -0,0 +1,278 @@
+# Indonesian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 12:18+0000\n"
+"PO-Revision-Date: 2010-05-28 10:50+0000\n"
+"Last-Translator: Abdul Munif Hanafi <Unknown>\n"
+"Language-Team: Indonesian <id@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+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 "Informasi"
+
+#. module: hr_evaluation
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Nama Objek harus berawalan dengan x_ dan tidak mengandung karakter khusus !"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Schedule next evaluation"
+msgstr "Jadwal evaluasi berikutnya"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_bad:0
+msgid "Bad Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,value_ids:0
+msgid "Values"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_good:0
+msgid "Good Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,state:0
+msgid "State"
+msgstr ""
+
+#. 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 "Skor"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Informal Data"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nama model tidak sah di definsi aksi"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_improve:0
+msgid "To Improve"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,evaluation_id:0
+msgid "Evaluation"
+msgstr "Evaluasi"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type.value,type_id:0
+msgid "Evaluation Type"
+msgstr "Tipe Evaluasi"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Status"
+msgstr "Status"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Apply to categories"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid "Ability to create employees evaluation."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,name:0
+msgid "Quote"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Choices Results"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Date"
+msgstr "Tanggal"
+
+#. 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 "Evaluasi"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
+msgid "Configuration"
+msgstr "Konfigurasi"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
+msgid "Next Evaluations"
+msgstr "Evaluasi Berikutnya"
+
+#. module: hr_evaluation
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
+msgid "Evaluation Criterions"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
+msgid "My Preceeding Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
+msgid "HR Responsible"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,value_id:0
+#: field:hr_evaluation.type.value,name:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,active:0
+msgid "Active"
+msgstr "Aktif"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Notes"
+msgstr "Catatan"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
+msgid "Employee Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Quotations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
+msgid "Next Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,type_id:0
+msgid "Type"
+msgstr "Jenis"
+
+#. 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 "Selesai"
+
+#. 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/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 6ccd1e80ab9..5406a7a3fbd 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -42,32 +42,32 @@
         <field name="arch" type="xml">
             <search string="Evaluations Analysis">
             	<group>
-            		<filter icon="gtk-media-rewind" string="365 Days"
+            		<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="gtk-media-rewind" string="30 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="gtk-media-rewind"
+	                <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-hr"
+                    	icon="terp-document-new"
                     	domain="[('state','=','draft')]"
                     	help = "Draft Evaluations"/>
 	                <filter string="Plan In Progress"
-	                	icon="terp-hr"
+	                	icon="terp-camera_test"
 	                	domain="[('state', '=' ,'wait')]"
 	                	help = "In progress Evaluations"/>
                    	<filter string="Final Validation"
-                   		icon="terp-hr"
+                   		icon="terp-check"
                    		domain="[('state','=','progress')]"
                    		help = "Final Validation Evaluations"/>
-                   	<filter icon="terp-hr"
+                   	<filter icon="terp-dialog-close"
                         string="Done"
                         domain="[('state','=','done')]"/>
   					<separator orientation="vertical"/>
@@ -75,16 +75,16 @@
 	                <field name="plan_id" widget="selection"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Employee" name="employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
-                    <filter string="Rating" icon="terp-hr" context="{'group_by':'rating'}"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
+                    <filter string="Rating" icon="terp-rating-rated" context="{'group_by':'rating'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Plan" icon="terp-hr" context="{'group_by':'plan_id'}"/>
-                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
+                    <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-hr" context="{'group_by':'create_date'}"/>
-                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
+                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <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/>
 				<group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 83113558c43..08103af1b68 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -40,7 +40,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['hr', 'account', 'account_tax_include'],
+    'depends': ['hr', 'account'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 820d3467660..e0d55bee5fe 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -153,7 +153,6 @@ class hr_expense_expense(osv.osv):
                 'address_contact_id': exp.employee_id.address_id.id,
                 'origin': exp.name,
                 'invoice_line': lines,
-                'price_type': 'tax_included',
                 'currency_id': exp.currency_id.id,
                 'payment_term': payment_term_id,
                 'fiscal_position': exp.employee_id.address_id.partner_id.property_account_position.id
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index c69afa943d9..148ab026a0f 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -2,7 +2,7 @@
 <openerp>
 	<data noupdate="1">
 
-	    <record id="product_product_expense_0" model="product.product">
+	    <record id="product_product_expense_air" model="product.product">
             <field name="list_price">1.0</field>
             <field name="standard_price">1.0</field>
             <field name="uom_id" ref="product.product_uom_unit"/>
@@ -10,11 +10,11 @@
             <field name="type">service</field>
             <field name="name">Air Ticket</field>
             <field name="default_code">AT</field>
-            <field name="categ_id" ref="product.product_category_7"/>
+            <field name="categ_id" ref="product.cat2"/>
             <field name="hr_expense_ok" eval="True" />
         </record>
 
-        <record id="product_product_expense_2" model="product.product">
+        <record id="product_product_expense_hotel" model="product.product">
             <field name="list_price">1.0</field>
             <field name="standard_price">1.0</field>
             <field name="uom_id" ref="product.product_uom_unit"/>
@@ -22,7 +22,19 @@
             <field name="type">service</field>
             <field name="name">Hotel Accommodation</field>
             <field name="default_code">HA0</field>
-            <field name="categ_id" ref="product.product_category_7"/>
+            <field name="categ_id" ref="product.cat2"/>
+            <field name="hr_expense_ok" eval="True" />
+        </record>
+
+        <record id="product_product_expense_car" model="product.product">
+            <field name="list_price">0.30</field>
+            <field name="standard_price">0.30</field>
+            <field name="uom_id" ref="product.product_uom_km"/>
+            <field name="uom_po_id" ref="product.product_uom_km"/>
+            <field name="type">consu</field>
+            <field name="name">Car Travel</field>
+            <field name="default_code">CAR</field>
+            <field name="categ_id" ref="product.cat2"/>
             <field name="hr_expense_ok" eval="True" />
         </record>
 
@@ -30,29 +42,29 @@
 			<field name="currency_id" ref="base.EUR"/>
 			<field name="employee_id" ref="hr.employee1"/>
 			<field name="user_id" ref="base.user_root"/>
-			<field name="name">September Expenses</field>
+			<field name="name">May Expenses</field>
 			<field name="company_id" ref="base.main_company"/>
 			<field name="date">2010-05-03</field>
 			<field name="state">draft</field>
 		</record>
 
 		<record id="hr_expense_line_travelbycarcustomerseagatedouble0" model="hr.expense.line">
-			<field name="name">Travel by Air - Customer Seagate 2 - Double</field>
+			<field name="name">Travel by Air</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_0"/>
-			<field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'September Expenses')]"/>
+			<field name="analytic_account" ref="account.analytic_consultancy"/>
+			<field name="product_id" ref="product_product_expense_air"/>
+			<field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
 			<field eval="700.0" name="unit_amount"/>
 			<field name="uom_id" ref="product.product_uom_unit"/>
-			<field eval="200.0" name="unit_quantity"/>
+			<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>
 			<field name="analytic_account" ref="account.analytic_seagate_p2"/>
-			<field name="product_id" ref="product.product_product_25"/>
-			<field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'September Expenses')]"/>
-			<field eval="35.5" name="unit_amount"/>
+			<field name="product_id" ref="product.product_product_pc4"/>
+			<field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
+			<field eval="1200.0" name="unit_amount"/>
 			<field name="uom_id" ref="product.product_uom_unit"/>
 			<field eval="1.0" name="unit_quantity"/>
 		</record>
@@ -62,7 +74,7 @@
 			<field name="currency_id" ref="base.EUR"/>
 			<field name="employee_id" ref="hr.employee1"/>
 			<field name="user_id" ref="base.user_root"/>
-			<field name="name">Hotel Expenses</field>
+			<field name="name">Travel Expenses</field>
 			<field name="company_id" ref="base.main_company"/>
 			<field name="date">2010-04-20</field>
 			<field name="state">draft</field>
@@ -71,12 +83,23 @@
 			<field name="name">Hotel Expenses - Thymbra</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_2"/>
-			<field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Hotel Expenses')]"/>
+			<field name="product_id" ref="product_product_expense_hotel"/>
+			<field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
 			<field eval="400.0" name="unit_amount"/>
 			<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>
+
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_expense/hr_expense_report.xml b/addons/hr_expense/hr_expense_report.xml
index bad8e790801..9d5f0c3e2c1 100644
--- a/addons/hr_expense/hr_expense_report.xml
+++ b/addons/hr_expense/hr_expense_report.xml
@@ -1,6 +1,6 @@
 <?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="Print HR expenses"/>
+        <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_view.xml b/addons/hr_expense/hr_expense_view.xml
index abce10e80f3..35ffc931831 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -127,18 +127,18 @@
                 <search string="Expense">
                     <group>
                       <filter
-                        icon="terp-hr"
+                        icon="terp-document-new"
                         domain="[('state','=','draft')]"
                         string="Draft"
                         help="Draft Expense"/>
                       <separator orientation="vertical"/>
                       <filter
-                        icon="terp-hr"
+                        icon="terp-gtk-go-back-rtl"
                         domain="[('state','=','confirm')]"
                         string="To Validate"
                         help="Confirmed Expense"/>
                       <filter
-                        icon="terp-hr"
+                        icon="terp-gtk-go-back-rtl"
                         domain="[('state','=','accepted')]"
                         string="To Pay"
                         help="Expenses to Invoice"/>
@@ -146,18 +146,18 @@
                       <field name="name" select='1'/>
                       <field name="date" select='1'/>
                       <field name="user_id" select="1" widget="selection" string="User">
-                      		<filter icon="terp-hr"
+                      		<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"/>
                 </group>
                 <newline />
-                <group expand="1" string="Group By...">
-                    <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/>
+                    <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                 </group>
                 </search>
             </field>
diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index 2b0f6b4addf..85fa541ec10 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -29,7 +29,7 @@ class hr_expense_report(osv.osv):
     _auto = False
     _rec_name = 'date'
     _columns = {
-        'date': fields.date('Date', readonly=True),
+        'date': fields.date('Date ', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
@@ -44,9 +44,11 @@ class hr_expense_report(osv.osv):
         'invoice_id': fields.many2one('account.invoice', 'Invoice',readonly=True),
         'department_id':fields.many2one('hr.department','Department',readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'user_id':fields.many2one('res.users', 'Validation User', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
         'price_total':fields.float('Total Price', readonly=True),
+        'delay_valid':fields.float('Delay Valid', readonly=True),
+        'delay_confirm':fields.float('Delay Confirm', readonly=True),
         'analytic_account': fields.many2one('account.analytic.account','Analytic account',readonly=True),
         'price_average':fields.float('Average Price', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
@@ -75,20 +77,22 @@ class hr_expense_report(osv.osv):
                      to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_confirm,
                      to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_valid,
                      s.invoice_id,
+                     s.user_valid as user_id,
                      s.department_id,
                      to_char(date_trunc('day',s.create_date), 'YYYY') as year,
                      to_char(date_trunc('day',s.create_date), 'MM') as month,
                      to_char(date_trunc('day',s.create_date), 'YYYY-MM-DD') as day,
+                     avg(extract('epoch' from age(s.date_valid,s.date)))/(3600*24) as  delay_valid,
+                     avg(extract('epoch' from age(s.date_valid,s.date_confirm)))/(3600*24) as  delay_confirm,
                      l.product_id as product_id,
                      l.analytic_account as analytic_account,
                      sum(l.unit_quantity * u.factor) as product_qty,
-                     s.user_id as user_id,
                      s.company_id as company_id,
                      sum(l.unit_quantity*l.unit_amount) as price_total,
                      (sum(l.unit_quantity*l.unit_amount)/sum(l.unit_quantity * u.factor))::decimal(16,2) as price_average,
                      count(*) as nbr,
                      (select unit_quantity from hr_expense_line where id=l.id and product_id is not null) as no_of_products,
-                     (select count(analytic_account) from hr_expense_line where id=l.id and analytic_account is not null) as no_of_account,
+                     (select analytic_account from hr_expense_line where id=l.id and analytic_account is not null) as no_of_account,
                      s.state
                  from hr_expense_line l
                  left join hr_expense_expense s on (s.id=l.expense_id)
@@ -104,10 +108,10 @@ class hr_expense_report(osv.osv):
                      l.analytic_account,
                      s.invoice_id,
                      s.currency_id,
+                     s.user_valid,
                      s.department_id,
                      l.uom_id,
                      l.id,
-                     s.user_id,
                      s.state,
                      s.journal_id,
                      s.company_id,
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 6507ff87342..bcc560573ab 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -9,7 +9,6 @@
             <tree string="Expenses Analysis">
                 <field name="date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
-                <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
@@ -21,12 +20,13 @@
                 <field name="currency_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="product_qty" invisible="1"/>
+                <field name="state" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="no_of_products" sum="# of Products"/>
-                <field name="no_of_account" sum="# of Accounts"/>
+                <field name="delay_valid"/>
+                <field name="delay_confirm"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
-                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -37,7 +37,7 @@
          <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Expenses Analysis" type="bar">
-                 <field name="user_id"/>
+                 <field name="employee_id"/>
                  <field name="state" group="True"/>
                  <field name="nbr" operator="+"/>
              </graph>
@@ -51,73 +51,74 @@
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
             	<group>
-            		<filter icon="gtk-media-rewind" string="  365 Days  "
+            		<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="Expenses during last 7 year"/>
-	                <filter icon="gtk-media-rewind" string="   30 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="Expenses during last month"/>
-		            <filter icon="gtk-media-rewind"
+		            <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-hr"
+	                    icon="terp-document-new"
 	                    domain="[('state','=','draft')]"
 	                    help = "Draft Expenses"/>
 		            <filter string="Waiting"
-		                icon="terp-hr"
+		                icon="terp-gtk-media-pause"
 		                domain="[('state', '=' ,'confirm')]"
 		                help = "Confirm Expenses"/>
 	                <filter string="Accepted"
-	                    icon="terp-hr"
+	                    icon="terp-camera_test"
 	                    domain="[('state','=','accepted')]"
 	                    help = "Accepted Expenses"/>
+	                <filter string="Cancelled"
+	                    icon="terp-dialog-close"
+	                    domain="[('state','=','cancelled')]"
+	                    help = "Cancelled Expenses"/>
 	  				<separator orientation="vertical"/>
-                    <field name="product_id"/>
-                    <field name="employee_id" widget="selection"/>
-                    <field name="user_id" widget="selection">
-                        <filter icon="terp-hr"
-                            string="My Expenses"
-                            help="My Expenses"
-                            domain="[('user_id','=',uid)]"/>
-                    </field>
+                    <field name="employee_id"/>
 				</group>
 				<newline/>
                 <group expand="1" string="Group By...">
-                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
-                    <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
-                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <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"/>
-                    <filter string="Analytic account" icon="terp-hr" context="{'group_by':'analytic_account'}"/>
-                    <filter string="Currency" icon="terp-hr" context="{'group_by':'currency_id'}"/>
-                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
-                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
-                    <filter string="Force Journal" icon="terp-hr" context="{'group_by':'journal_id'}"/>
+                    <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}"/>
+                    <filter string="Force Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-go-month" 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>
-				<newline/>
-				<group expand="0" string="Extended filters..." groups="base.group_extended">
-				    <field name="state"/>
-				    <separator orientation="vertical"/>
-				    <field name="date_confirm"/>
-				    <separator orientation="vertical"/>
-				    <field name="journal_id" widget="selection"/>
-				    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-				    <newline/>
-                    <field name="department_id" widget="selection"/>
+                <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"/>
-                    <separator orientation="vertical"/>
-                    <field name="currency_id" widget="selection"/>
+
                 </group>
             </search>
         </field>
@@ -128,7 +129,7 @@
         <field name="res_model">hr.expense.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 74546ff1388..fc9626d831d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -8,27 +8,27 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <group col='8' colspan='4'>
-                        <filter icon="terp-hr" domain="[('state','=','draft')]" string="To Confirm"/>
-                        <filter icon="terp-hr" domain="[('state','=','confirm')]" string="To Validate"/>
-                        <filter icon="terp-hr" domain="[('state','=','validate')]" string="Validated"
+                        <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','draft')]" string="To Confirm"/>
+                        <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','confirm')]" string="To Validate"/>
+                        <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"
                             default="context.get('report', False)"/>
                         <separator orientation="vertical"/>
                         <field name="user_id" widget="selection"/>
                         <field name="department_id" widget="selection">
-                            <filter icon="terp-hr" help="My Department Holidays"
+                            <filter icon="terp-personal+" help="My Department Holidays"
                                 domain="[('department_id.manager_id','=',uid)]"
                                 />
                         </field>
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
                     <newline />
-                    <group expand="1" string="Group By...">
-                        <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
-                        <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'manager_id'}"/>
-                        <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Type" icon="terp-sale" domain="[]" context="{'group_by':'holiday_status_id'}"
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"
                             default="context.get('report', False)"/>
                     </group>
                 </search>
diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po
index eda0c0e6363..1f38bf9219a 100644
--- a/addons/hr_holidays/i18n/id.po
+++ b/addons/hr_holidays/i18n/id.po
@@ -7,29 +7,29 @@ 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-09 13:50+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-05-28 11:15+0000\n"
+"Last-Translator: Abdul Munif Hanafi <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-04-17 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "New Holidays Request"
-msgstr ""
+msgstr "Permintaan Hari Libur Baru"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday
 msgid "All Holidays Requests"
-msgstr ""
+msgstr "Semua Permintaan Hari Libur"
 
 #. module: hr_holidays
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nama model tidak sah di definsi aksi"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,remaining_leaves:0
@@ -44,12 +44,12 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
-msgstr ""
+msgstr "Biru Cerah"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Brown"
-msgstr ""
+msgstr "Coklat"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -66,7 +66,7 @@ msgstr ""
 #: view:hr.holidays.per.user:0
 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0
 msgid "Employee Holidays"
-msgstr ""
+msgstr "Hari Libur Karyawan"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -79,7 +79,7 @@ msgstr ""
 #: model:ir.model,name:hr_holidays.model_hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidays0
 msgid "Holidays"
-msgstr ""
+msgstr "Hari Libur"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -94,7 +94,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Green"
-msgstr ""
+msgstr "Hijau Cerah"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_employeedeclaration0
@@ -111,51 +111,51 @@ msgstr ""
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_refusedrequest0
 msgid "Refused Request"
-msgstr ""
+msgstr "Permintaan yang Ditolak"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_approved0
 msgid "Approved"
-msgstr ""
+msgstr "Disetujui"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Both"
-msgstr ""
+msgstr "Keduanya"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Refuse"
-msgstr ""
+msgstr "Tolak"
 
 #. module: hr_holidays
 #: wizard_button:hr.holidays.summary,notify,end:0
 #: wizard_button:hr.holidays.summary.employee,notify,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Setuju"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday
 msgid "My Holidays Requests"
-msgstr ""
+msgstr "Permintaan Hari Libur Saya"
 
 #. module: hr_holidays
 #: field:hr.holidays,notes:0
 #: field:hr.holidays.per.user,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Catatan"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status:0
 #: field:hr.holidays.log,holiday_status:0
 #: field:hr.holidays.per.user,holiday_status:0
 msgid "Holiday's Status"
-msgstr ""
+msgstr "Status Hari Libur"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_refusedrequest0
 msgid "Request is refused."
-msgstr ""
+msgstr "Permintaan Ditolak."
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
@@ -180,12 +180,12 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Holiday status"
-msgstr ""
+msgstr "Status Hari Libur"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 msgid "Holidays Status"
-msgstr ""
+msgstr "Status Hari Libur"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
@@ -195,7 +195,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 msgid "Holidays Allowed"
-msgstr ""
+msgstr "Hari Libur Diizinkan"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_legaldeclaration0
@@ -210,7 +210,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_per_user
 msgid "Holidays Per User"
-msgstr ""
+msgstr "Hari Libur Per Pengguna"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -221,19 +221,19 @@ msgstr ""
 #: selection:hr.holidays.summary,init,holiday_type:0
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Dikonfirmasi"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,date_from:0
 #: wizard_field:hr.holidays.summary.employee,init,date_from:0
 msgid "From"
-msgstr ""
+msgstr "Dari"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:process.transition.action,name:hr_holidays.process_transition_action_confirm0
 msgid "Confirm"
-msgstr ""
+msgstr "Konfirmasi"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting
@@ -256,7 +256,7 @@ msgstr ""
 #: field:hr.holidays.log,employee_id:0
 #: field:hr.holidays.per.user,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "Karyawan"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -266,7 +266,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_employeeholidays0
 msgid "Employee get holidays"
-msgstr ""
+msgstr "Karyawan mendapatkan hari libur"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -281,36 +281,36 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays.log,nb_holidays:0
 msgid "Number of Holidays Requested"
-msgstr ""
+msgstr "Jumlah Permintaan Hari Libur"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
 msgid "My Holiday Requests"
-msgstr ""
+msgstr "Permintaan Hari Libur Saya"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.per.user:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Jumlah Hari"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,name:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Holiday Status"
-msgstr ""
+msgstr "Status Hari Libur"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,init:0
 #: wizard_view:hr.holidays.summary.employee,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "Pilihan Laporan"
 
 #. module: hr_holidays
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_approved0
@@ -335,7 +335,7 @@ msgstr ""
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary.employee,init,emp:0
 msgid "Employee(s)"
-msgstr ""
+msgstr "Karyawan"
 
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days:0
@@ -347,7 +347,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user
 #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user
 msgid "Holidays Per Employee"
-msgstr ""
+msgstr "Hari Libur Per Karyawan"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
@@ -367,7 +367,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_log
 msgid "hr.holidays.log"
-msgstr ""
+msgstr "hr.holidays.log"
 
 #. module: hr_holidays
 #: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
@@ -377,7 +377,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_calendar0
 msgid "Calendar"
-msgstr ""
+msgstr "Kalender"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
@@ -425,12 +425,12 @@ msgstr ""
 #: wizard_view:hr.holidays.summary,notify:0
 #: wizard_view:hr.holidays.summary.employee,notify:0
 msgid "Notification"
-msgstr ""
+msgstr "Pemberitahuan"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidaysrequest0
 msgid "Employee fills in a request for holidays"
-msgstr ""
+msgstr "Karyawan mengisi di dalam sebuah permintaan untuk hari libur"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_setholiday0
@@ -451,7 +451,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Black"
-msgstr ""
+msgstr "Hitam"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse
@@ -476,7 +476,7 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -486,12 +486,12 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday
 msgid "My Holidays Request"
-msgstr ""
+msgstr "Permintaan Hari Libur Saya"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color of the status"
-msgstr ""
+msgstr "Warna dari status"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
@@ -506,7 +506,7 @@ msgstr ""
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "holidays."
-msgstr ""
+msgstr "hari libur."
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -516,22 +516,22 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays.per.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Pengguna"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0
 msgid "Document for employee"
-msgstr ""
+msgstr "Dokumen untuk karyawan"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,date:0
 msgid "Date"
-msgstr ""
+msgstr "Tanggal"
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
 msgid "Reufse"
-msgstr ""
+msgstr "Tolak"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,section_id:0
@@ -547,7 +547,7 @@ msgstr ""
 #: field:hr.holidays.per.user,active:0
 #: field:hr.holidays.status,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktif"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
@@ -557,12 +557,12 @@ msgstr ""
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
 msgid "Approved Request"
-msgstr ""
+msgstr "Permintaan yang Disetujui"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidaysrequest0
 msgid "Holidays Request"
-msgstr ""
+msgstr "Permintaan Hari Libur"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting
@@ -572,12 +572,12 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "General"
-msgstr ""
+msgstr "Umum"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 msgid "General Information"
-msgstr ""
+msgstr "Informasi Umum"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -585,7 +585,7 @@ msgstr ""
 #: wizard_button:hr.holidays.summary,init,end:0
 #: wizard_button:hr.holidays.summary.employee,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Batal"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_holidaysdefrequest0
@@ -601,25 +601,26 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse
 msgid "My Holidays Request Refused"
-msgstr ""
+msgstr "Permintaan Hari Libur Saya Ditolak"
 
 #. module: hr_holidays
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Nama Objek harus berawalan dengan x_ dan tidak mengandung karakter khusus !"
 
 #. module: hr_holidays
 #: wizard_button:hr.holidays.summary,init,checkdept:0
 #: wizard_button:hr.holidays.summary.employee,init,checkemp:0
 msgid "Print"
-msgstr ""
+msgstr "Cetak"
 
 #. module: hr_holidays
 #: model:ir.actions.wizard,name:hr_holidays.holidays_summary
 #: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary
 msgid "Print Summary of Holidays"
-msgstr ""
+msgstr "Cetak Rangkuman dari Hari Libur"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,depts:0
@@ -635,12 +636,12 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: model:process.node,name:hr_holidays.process_node_refused0
 msgid "Refused"
-msgstr ""
+msgstr "Ditolak"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_approvedrequest0
 msgid "Request is approved."
-msgstr ""
+msgstr "Permintaan Disetujui."
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidaysdefinition0
@@ -651,7 +652,7 @@ msgstr ""
 #: wizard_field:hr.holidays.summary,init,holiday_type:0
 #: wizard_field:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Select Holiday Type"
-msgstr ""
+msgstr "Pilih Jenis Hari Libur"
 
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
@@ -661,7 +662,7 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_user_id:0
 msgid "Holiday per user"
-msgstr ""
+msgstr "Hari libur per pengguna"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidays0
@@ -681,7 +682,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Red"
-msgstr ""
+msgstr "Merah"
 
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
@@ -691,7 +692,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:process.process,name:hr_holidays.process_process_holidaysprocess0
 msgid "Holidays Process"
-msgstr ""
+msgstr "Proses Hari Libur"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,notify:0
@@ -711,7 +712,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Yellow"
-msgstr ""
+msgstr "Kuning Cerah"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 34f14271758..5fd9a9c0199 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -48,21 +48,21 @@
 	        <field name="arch" type="xml">
 	            <search string="Leaves">
 	            	<group>
-	                    <filter icon="terp-hr" string="Employee"
+	                    <filter icon="terp-personal" string="Employee"
 	                            domain="[('category_id', '=', False)]"
 	                            help="Leaves by empolyee"/>
-	                    <filter icon="terp-hr" string="Category"
+	                    <filter icon="terp-stock_symbol-selection" string="Category"
 	                            domain="[('employee_id', '=', False)]"
 	                            help="Leaves by category"/>
                         <separator orientation="vertical"/>
-		            	<filter icon="terp-hr" string="This Year"
+		            	<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-hr" string="This Month"
+		                <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="gtk-media-rewind"
+			            <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'))]"
@@ -71,7 +71,7 @@
 
 						<field name="employee_id"/>
 		                <field name="user_id" widget="selection">
-		                    <filter icon="terp-hr"
+		                    <filter icon="terp-personal"
 		                        string="My Leaves"
 		                        domain="[('user_id','=',uid)]"/>
 		                </field>
@@ -82,15 +82,15 @@
 	                	<field name="department_id" widget="selection"/>
 	                </group>
 	                <newline/>
-	                <group expand="1" string="Group By..." colspan="10" col="12">
-	                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+	                <group expand="0" string="Group By..." colspan="10" col="12">
+	                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="Type" icon="terp-hr" context="{'group_by':'holiday_status_id'}"/>
-	                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
+	                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
+	                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-	                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
-	                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
+	                    <filter string="Day" icon="terp-go-month" 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>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index b6afe32fb25..24ea6745270 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -45,36 +45,36 @@
         <field name="arch" type="xml">
             <search string="Leaves">
             	<group>
-                    <filter icon="terp-hr" string="Employee"
+                    <filter icon="terp-personal" string="Employee"
                             domain="[('category_id', '=', False)]"
                             help="Leaves by empolyee"/>
-                    <filter icon="terp-hr" string="Category"
+                    <filter icon="terp-stock_symbol-selection" string="Category"
                             domain="[('employee_id', '=', False)]"
                             help="Leaves by category"/>
 	            	<separator orientation="vertical"/>
-	            	<filter icon="terp-hr" string="This Year"
+	            	<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-hr" string="This Month"
+	                <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="gtk-media-rewind"
+		            <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-hr"
+	                	icon="terp-document-new"
 	                	domain="[('state','=','draft')]"
 	                	help = "Draft Leaves"/>
 	                <filter string="Waiting Validation"
-	                	icon="terp-hr"
+	                	icon="terp-gtk-media-pause"
 	                	domain="[('state', '=' ,'confirm')]"
 	                	help = "In progress Leaves"/>
 	               	<filter string="Validated"
-	               		icon="terp-hr"
+	               		icon="terp-camera_test"
 	               		domain="[('state','=','validate')]"
 	               		help = "Pending Leaves"/>
 					<separator orientation="vertical"/>
@@ -83,20 +83,20 @@
 	                </field>
 	            </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+                <group expand="0" string="Group By..." colspan="10" col="12">
+                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Type" icon="terp-hr" context="{'group_by':'holiday_status_id'}"/>
-                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
-                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
+                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
+                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-hr" context="{'group_by':'date'}"/>
-                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
+                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." colspan="10" col="12">
-                    <filter icon="terp-hr"
+                    <filter icon="terp-gtk-stop"
                             string="Refused"
                         name="done"
                             domain="[('state','=','refuse')]"/>
@@ -105,7 +105,7 @@
                     <separator orientation="vertical"/>
                     <field name="holiday_status_id" widget="selection"/>
                     <newline/>
-                    <filter icon="terp-hr"
+                    <filter icon="terp-gtk-stop"
                             string="Cancelled"
                             domain="[('state','=','cancel')]"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_payroll/__init__.py b/addons/hr_payroll/__init__.py
new file mode 100644
index 00000000000..9ea0d7eb8c4
--- /dev/null
+++ b/addons/hr_payroll/__init__.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+#-*- 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
+import report
+import wizard
\ No newline at end of file
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
new file mode 100644
index 00000000000..5828ce15389
--- /dev/null
+++ b/addons/hr_payroll/__openerp__.py
@@ -0,0 +1,59 @@
+#-*- 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',
+    'version': '1.0',
+    'category': 'Generic Modules/Human Resources',
+    'description': """Generic Payroll system
+    * Employee Details
+    * Employee Contracts
+    * Passport based Contract
+    * Allowances / Deductions
+    * Allow to configure Basic / Grows / Net Salary
+    * Employee Payslip
+    * Monthly Payroll Register
+    * Integrated with Holiday Management
+    """,
+    'author':'Tiny/Axelor',
+    'website':'http://www.openerp.com',
+    'depends': [
+        'hr',
+        'account',
+        'hr_contract', 
+        'hr_holidays',
+        'hr_expense'
+    ],
+    'init_xml': [
+    ],
+    'update_xml': [
+        'hr_payroll_view.xml',
+#        'hr_payroll_workflow.xml',
+#        'hr_payroll_sequence.xml',
+#        'hr_paroll_report.xml',
+#        'hr_payroll_data.xml',
+#        'hr_payroll_wizard.xml'
+    ],
+    'demo_xml': [
+    ],
+    'installable': True,
+    'active': False,
+}
diff --git a/addons/hr_payroll/hr_paroll_report.xml b/addons/hr_payroll/hr_paroll_report.xml
new file mode 100755
index 00000000000..1355a42ff5b
--- /dev/null
+++ b/addons/hr_payroll/hr_paroll_report.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+	     <report 
+          	auto="False" 
+          	id="salary_payslip" 
+          	model="hr.payslip" 
+          	name="payslip.pdf" 
+          	rml="hr_payroll/report/payslip.rml" 
+          	string="Employee PaySlip" />
+          	
+	     <report 
+          	auto="False" 
+          	id="payroll_advice" 
+          	model="hr.payroll.advice" 
+          	name="payroll.advice" 
+          	rml="hr_payroll/report/report_payroll_advice.rml" 
+          	string="Bank Payment Advice" />
+
+	     <report 
+          	auto="False" 
+          	id="year_salary_report" 
+          	model="hr.payslip" 
+          	name="year.salary" 
+          	rml="hr_payroll/report/report_year_report.rml"
+          	menu = "False" 
+          	string="Year Salary Report" />
+          	
+      	<report 
+          	auto="False" 
+          	id="year_payroll_register" 
+          	model="hr.payroll.register" 
+          	name="hr.payroll.register.sheet" 
+          	rml="hr_payroll/report/payroll_register.rml"
+          	menu = "True" 
+          	string="Print Statement" />
+
+	     <report 
+          	auto="False" 
+          	id="year_employees_detail" 
+          	model="hr.payslip" 
+          	name="employees.salary" 
+          	rml="hr_payroll/report/report_employees_detail.rml"
+          	menu = "False" 
+          	string="Employees Salary Detail" />
+          	
+      	<report 
+          	auto="False" 
+          	id="salary_structure_register" 
+          	model="hr.employee" 
+          	name="salary.structure" 
+          	rml="hr_payroll/report/report_emp_salary_structure.rml"
+          	menu = "True" 
+          	string="Print Salary Structure" />
+  
+	</data>
+</openerp>
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
new file mode 100644
index 00000000000..d6653b0d456
--- /dev/null
+++ b/addons/hr_payroll/hr_payroll.py
@@ -0,0 +1,1881 @@
+#-*- 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 _
+
+class hr_contract_wage_type(osv.osv):
+    """
+    Wage types
+    Basic = Basic Salary
+    Grows = Basic + Allowances
+    New = Grows - Deductions
+    """
+    
+    _inherit = 'hr.contract.wage.type'
+    _columns = {
+        'type' : fields.selection([('basic','Basic'), ('gross','Gross'), ('net','Net')], 'Type', required=True),
+    }
+hr_contract_wage_type()
+
+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),
+        'country_id':fields.many2one('res.country', 'Country of Issue', required=True),
+        'address_id':fields.many2one('res.partner.address', 'Address', required=False),
+        'date_issue': fields.date('Passport Issue Date', required=True),
+        'date_expire': fields.date('Passport Expire Date', required=True),
+        'contracts_ids':fields.one2many('hr.contract', 'passport_id', 'Contracts', required=False, readonly=True),
+        'note': fields.text('Description'),
+    }
+hr_passport()
+
+class hr_payroll_structure(osv.osv):
+    """
+    Salary structure used to defined
+    * Basic
+    * Allowlance
+    * Deductions
+    """
+    
+    _name = 'hr.payroll.structure'
+    _description = 'Salary Structure'
+
+    _columns = {
+        'name':fields.char('Name', size=256, required=True, readonly=False),
+        'code':fields.char('Code', size=64, required=True, readonly=False),
+        'line_ids':fields.one2many('hr.payslip.line', 'function_id', 'Salary Structure', required=False),
+        'account_id':fields.many2one('account.analytic.account', 'Analytic Account', required=False),
+        'company_id':fields.many2one('res.company', 'Company', required=False),
+        'note': fields.text('Description'),
+    }
+    _defaults = {
+        'company_id': lambda self, cr, uid, context: \
+                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
+        @param cr: cursor to database
+        @param user: id of current user
+        @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
+        default = {
+            'code':code+"(copy)",
+            'company_id':self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+        }
+        res_id = super(hr_payroll_structure, self).copy(cr, uid, id, default, context)
+        return res_id
+    
+hr_payroll_structure()
+
+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),
+        'visa_no':fields.char('Visa No', size=64, required=False, readonly=False),
+        'visa_expire': fields.date('Visa Expire Date'),
+        'struct_id' : fields.many2one('hr.payroll.structure', 'Salary Structure'),
+    }
+hr_contract()
+
+class payroll_register(osv.osv):
+    '''
+    Payroll Register
+    '''
+    _name = 'hr.payroll.register'
+    _description = 'Payroll Register'
+    
+    def _calculate(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        allounce = 0.0
+        deduction = 0.0
+        net = 0.0
+        grows = 0.0
+        for register in self.browse(cr, uid, ids, context):
+            for slip in register.line_ids:
+                allounce += slip.allounce
+                deduction += slip.deduction
+                net += slip.net
+                grows += slip.grows
+                
+            res[register.id] = {
+                'allounce':allounce,
+                'deduction':deduction,
+                'net':net,
+                'grows':grows
+            }
+        return res
+        
+    _columns = {
+        'name':fields.char('Name', size=64, required=True, readonly=False),
+        'date': fields.date('Date', required=True),
+        'number':fields.char('Number', size=64, required=False, readonly=True),
+        'line_ids':fields.one2many('hr.payslip', 'register_id', 'Payslips', required=False),
+        'state':fields.selection([
+            ('new','New Slip'),
+            ('draft','Wating for Verification'),
+            ('hr_check','Wating for HR Verification'),
+            ('accont_check','Wating for Account Verification'),
+            ('confirm','Confirm Sheet'),
+            ('done','Paid Salary'),
+            ('cancel','Reject'),
+        ],'State', select=True, readonly=True),
+        'journal_id': fields.many2one('account.journal', 'Expanse Journal', required=True),
+        'bank_journal_id': fields.many2one('account.journal', 'Bank Journal', required=True),
+        'active':fields.boolean('Active', required=False),
+#        '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']))),        
+        'note': fields.text('Description'),
+    }
+    
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'state': lambda *a: 'new',
+        'active': lambda *a: True,
+        'company_id': lambda self, cr, uid, context: \
+                self.pool.get('res.users').browse(cr, uid, uid,
+                    context=context).company_id.id,
+    }
+
+    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')
+        wf_service = netsvc.LocalService("workflow")
+        
+        vals = self.read(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'])])
+            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()
+
+            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')])
+            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:
+                pid = False
+                if accs.get(slip.employee_id.property_bank_account.code, False) == False:
+                    advice = {
+                        'name': 'Payment Advice from %s / Bank Account %s' % (self.pool.get('res.users').browse(cr, uid, uid).company_id.name, slip.employee_id.property_bank_account.name),
+                        'number': self.pool.get('ir.sequence').get(cr, uid, 'payment.advice'),
+                        'register_id':reg.id,
+                        'account_id':slip.employee_id.property_bank_account.id
+                    }
+                    pid = advice_pool.create(cr, uid, advice)
+                    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,
+                    'employee_id':slip.employee_id.id,
+                    'amount':slip.other_pay + slip.net,
+                    '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
+
+    def process_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','=','confirm')])
+            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
+
+payroll_register()
+
+class payroll_advice(osv.osv):
+    '''
+    Bank Advice Note
+    '''
+    _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),
+        'note': fields.text('Description'),
+        'date': fields.date('Date'),
+        'state':fields.selection([
+            ('draft','Draft Sheet'),
+            ('confirm','Confirm Sheet'),
+            ('cancel','Reject'),
+        ],'State', select=True, readonly=True),
+        'number':fields.char('Number', size=64, required=False, readonly=True),
+        'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', required=False),
+        'chaque_nos':fields.char('Chaque Nos', size=256, required=False, readonly=False),
+        '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',
+        'company_id': lambda self, cr, uid, context: \
+                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
+
+    def cancel_sheet(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'cancel'})
+        return True
+
+payroll_advice()
+
+from datetime import date, datetime, timedelta
+def prev_bounds(cdate=False):
+    when = datetime.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 payroll_advice_line(osv.osv):
+    '''
+    Bank Advice Lines
+    '''
+    _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']))),
+        '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')        
+        if employee_id:
+            dates = prev_bounds(ddate)
+            sids = False
+            sids = slip_pool.search(cr, uid, [('paid','=',False),('state','=','confirm'),('date','>=',dates[0]), ('employee_id','=',employee_id), ('date','<=',dates[1])])
+            if sids:
+                slip = slip_pool.browse(cr, uid, sids[0])
+                vals['name'] = slip.employee_id.otherid
+                vals['amount'] = slip.net + slip.other_pay
+                vals['bysal'] = slip.net
+        return {
+            'value':vals
+        }
+payroll_advice_line()
+
+class contrib_register(osv.osv):
+    '''
+    Contribution Register
+    '''
+    _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]
+        fiscalyear_id = self.pool.get('account.period').browse(cr, uid, period_id).fiscalyear_id
+        res = {}
+        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 = {
+        'company_id':fields.many2one('res.company', 'Company', required=False),
+        'account_id': fields.many2one('account.account', 'Account', required=True),
+        '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']))),        
+        'note': fields.text('Description'),
+    }
+    _defaults = {
+        'company_id': lambda self, cr, uid, context: \
+                self.pool.get('res.users').browse(cr, uid, uid,
+                    context=context).company_id.id,
+    }
+contrib_register()
+
+class contrib_register_line(osv.osv):
+    '''
+    Contribution Register Line
+    '''
+    _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']))),    
+    }
+contrib_register_line()
+
+class payment_category(osv.osv):
+    '''
+    Open ERP Model
+    '''
+    _name = 'hr.allounce.deduction.categoty'
+    _description = 'Allowance Deduction Categoty'
+    
+    _columns = {
+        'name':fields.char('Categoty Name', size=64, required=True, readonly=False),
+        'code':fields.char('Categoty Code', size=64, required=True, readonly=False),
+        'type':fields.selection([
+            ('allow','Allowance'),
+            ('deduct','Deduction'),
+            ('other','Others'),
+        ],'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':fields.boolean('Contribe by Company ?', help='Is company contribute on this deduction, like Provident Fund'),
+        'include_in_salary':fields.boolean('Included in Salary ?', help='If company contribute on this deduction then should company contribution is also deducted from Employee Salary'),
+        'gratuity':fields.boolean('Use for Gratuity ?', required=False),
+        'line_ids':fields.one2many('hr.allounce.deduction.categoty.line', 'category_id', 'Calculations', required=False),
+        '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'),
+        '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'),
+        'register_id':fields.property(
+            'hr.contibution.register',
+            type='many2one',
+            relation='hr.contibution.register',
+            string="Contribution Register",
+            method=True,
+            view_load=True,
+            help="Contribution register based on company",
+            required=False
+        ),
+        '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),
+        'amount_type':fields.selection([
+#            ('per','Percentage (%)'),
+            ('fix','Fixed Amount'),
+            ('func','Function Calculation'),
+        ],'Amount Type', select=True),
+        'account_id':fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Account",
+            method=True,
+            view_load=True,
+            help="Expanse account where company expanse will be encoded",
+            required=False
+        ),
+    }
+    _defaults = {
+        'condition': lambda *a: 'True',
+        'base': lambda *a:'basic',
+        'sequence': lambda *a:5,
+        'amount_type': lambda *a:'fix',
+        'company_id': lambda self, cr, uid, context: \
+                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('hr.allounce.deduction.categoty.line')
+        res = 0
+        ids = line_pool.search(cr, uid, [('category_id','=',id), ('to_val','>=',value),('from_val','<=',value)])
+        if not ids:
+            ids = line_pool.search(cr, uid, [('category_id','=',id), ('from','<=',value)])
+        if not ids:
+            res = 0
+        else:
+            res = line_pool.browse(cr, uid, ids)[0].value
+        return res
+        
+payment_category()
+
+class payment_category_line(osv.osv):
+    '''
+    Allowance Deduction Categoty
+    '''
+    _name = 'hr.allounce.deduction.categoty.line'
+    _description = 'Allowance Deduction Categoty'
+    _order = 'sequence'
+    
+    _columns = {
+        'category_id':fields.many2one('hr.allounce.deduction.categoty', 'Category', 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']))),
+        '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']))),
+    }
+payment_category_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'), 
+            ('halfpaid','Half-Pay Holiday')
+            ], string='Payment'),
+        'account_id': fields.many2one('account.account', 'Account', required=False),
+        'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account', required=False),
+        'head_id': fields.many2one('hr.allounce.deduction.categoty', 'Payroll Head', domain=[('type','=','deduct')]),
+        'code':fields.char('Code', size=64, required=False, readonly=False),
+    }
+    _defaults = {
+        'type': lambda *args: 'unpaid',
+        'company_id': lambda self, cr, uid, context: \
+                self.pool.get('res.users').browse(cr, uid, uid,
+                    context=context).company_id.id,
+    }
+hr_holidays_status()
+
+class hr_expense_expense(osv.osv):
+    _inherit = "hr.expense.expense"
+    _description = "Expense"
+    _columns = {
+        'category_id':fields.many2one('hr.allounce.deduction.categoty', 'Payroll Head', domain=[('type','=','other')]),
+    }
+hr_expense_expense()
+
+class hr_payslip(osv.osv):
+    '''
+    Pay Slip
+    '''
+    _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}
+            
+            for line in rs.line_ids:
+                amount = 0.0
+                
+                if line.amount_type == 'per':
+                    amount = line.amount * eval(line.category_id.base, obj)
+                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
+                
+                if line.type == 'allounce':
+                    allow += amount
+                    others += contrib
+                    amount -= contrib
+                elif line.type == 'deduction':
+                    deduct += amount
+                    others -= contrib
+                    amount += contrib
+                elif line.type == 'advance':
+                    others += amount
+                elif line.type == 'loan':
+                    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),
+                'grows': round(rs.basic + allow),
+                'net': round(rs.basic + allow - deduct),
+                'other_pay':others,
+                'total_pay': round(rs.basic + allow - deduct + others)
+            }
+            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),
+        'journal_id': fields.many2one('account.journal', 'Expanse Journal', required=True),
+        'bank_journal_id': fields.many2one('account.journal', 'Bank Journal', required=True),
+        'name':fields.char('Name', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}),
+        'number':fields.char('Number', size=64, required=False, readonly=True),
+        'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
+        'date': fields.date('Date'),
+        'state':fields.selection([
+            ('new','New Slip'),
+            ('draft','Wating for Verification'),
+            ('hr_check','Wating for HR Verification'),
+            ('accont_check','Wating for Account Verification'),
+            ('confirm','Confirm Sheet'),
+            ('done','Paid Salary'),
+            ('cancel','Reject'),
+        ],'State', select=True, readonly=True),
+        'basic_before_leaves': fields.float('Basic Salary', readonly=True,  digits=(16, 2)),
+        'leaves': fields.float('Leaved Deduction', readonly=True,  digits=(16, 2)),
+        'basic': fields.float('Basic Salary - Leaves', readonly=True,  digits=(16, 2)),
+        'grows': fields.function(_calculate, method=True, store=True, multi='dc', string='Gross Salary', type='float', digits=(16, 2)),
+        'net': fields.function(_calculate, method=True, store=True, multi='dc', string='Net Salary', digits=(16, 2)),
+        'allounce': fields.function(_calculate, method=True, store=True, multi='dc', string='Allowance', digits=(16, 2)),
+        'deduction': fields.function(_calculate, method=True, store=True, multi='dc', string='Deduction', digits=(16, 2)),
+        '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)
+    }
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'state': lambda *a: 'new',
+        'company_id': lambda self, cr, uid, context: \
+                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 = {
+            'line_ids': False,
+            'move_ids': False,
+            'move_line_ids': False,
+            'move_payment_ids': False,
+            'company_id':company_id,
+            'period_id': False,
+            'basic_before_leaves':0,
+            'basic':0
+        }
+        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:
+            res = {
+                'slip_id':slip,
+                'move_id':voucher,
+                'sequence':sequence,
+                '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])
+            
+        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 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)
+            
+        return True
+    
+    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')
+        
+        vals = self.read(cr, uid, ids)[0]
+        emp_ids = ids
+        
+        for slip in self.browse(cr, uid, ids):
+            allow = 0.0
+            #for emp in emp_pool.browse(cr, uid, [vals['employee_id'][0]]):
+            emp = slip.employee_id
+            sql_req= '''
+                SELECT c.id as id, c.wage as wage, function 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_id = cr.dictfetchone()
+            
+            if not contract_id:
+                continue
+            
+            contract = self.pool.get('hr.contract').browse(cr, uid, contract_id['id'])
+            
+            sal_type = contract.wage_type_id.type
+            
+            function = contract.function.id
+            
+            lines = []
+            if function:
+                func = func_pool.read(cr, uid, function, ['line_ids'])
+                lines = slip_line_pool.browse(cr, uid, func['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}
+            if contract.wage_type_id.type == 'gross':
+                obj['gross'] = contract.wage
+            if contract.wage_type_id.type == 'net':
+                obj['net'] = contract.wage
+            if contract.wage_type_id.type == 'basic':
+                obj['basic'] = contract.wage
+            
+            c_type = {
+            
+            }
+            for line in lines:
+                cd = line.code.lower()
+                obj[cd] = line.amount
+            
+            for line in lines:
+            
+                if line.category_id.code in ad:
+                    continue
+                ad.append(line.category_id.code)
+                
+                cd = line.category_id.code.lower()
+                
+                goto_next = True
+                try:
+                    exp = line.category_id.condition
+                    calculate = eval(exp, obj)
+                except Exception, e:
+                    raise osv.except_osv(_('Variable Error !'), _('Variable Error : %s ' % (e)))
+                    pass
+
+                if not calculate:
+                    continue
+                
+                amt = 0.0
+                value = 0.0
+                base = False
+                company_contrib = 0.0
+                com_value = 0.0
+                if sal_type in ('gross', 'net'):
+
+                    if line.amount_type == 'per':
+                        base = line.category_id.base
+                        value = line.amount
+                        try:
+                            amt = eval(base, obj)
+                        except Exception, e:
+                            raise osv.except_osv(_('Variable Error !'), _('Variable Error : %s ' % (e)))
+                        
+                        if amt > 1:
+                            com_value = line.amount * amt
+                            amt = line.amount
+                        elif amt >= 0 and amt <= 1:
+                            amt =  line.amount + (amt * line.amount)
+                        
+                        if line.category_id.contribute and line.category_id.amount_type == 'fix':
+                            company_contrib = line.category_id.contribute_per
+                        elif line.category_id.contribute and line.category_id.amount_type == 'func':
+                            company_contrib = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, contract.wage, context)
+
+                    elif line.amount_type == 'fix':
+                    
+                        value = line.amount
+                        if line.category_id.contribute and line.category_id.amount_type == 'fix':
+                            company_contrib = line.category_id.contribute_per
+                        elif line.category_id.contribute and line.category_id.amount_type == 'func':
+                            company_contrib = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, contract.wage, context)
+                            
+                    elif line.amount_type == 'func':
+                    
+                        value = self.pool.get('hr.payslip.line').execute_function(cr, uid, line.id, contract.wage, context)
+                        if line.category_id.contribute and line.category_id.amount_type == 'fix':
+                            company_contrib = line.category_id.contribute_per
+                        elif line.category_id.contribute and line.category_id.amount_type == 'func':
+                            company_contrib = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, contract.wage, context)
+                        
+                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, contract.wage, context)
+                    
+                if line.type == 'allounce':
+                    all_per += amt
+                    all_fix += com_value
+                    all_fix += value
+                elif line.type == 'deduction':
+                    ded_per += amt
+                    ded_fix += com_value
+                    ded_fix += value
+                
+                if line.category_id.include_in_salary:
+                    if line.type == 'allounce':
+                        all_fix += company_contrib
+                    elif line.type == 'deduction':
+                        ded_fix += company_contrib
+                    
+                vals = {
+                    'company_contrib':company_contrib, 
+                    'amount':value, 
+                    'slip_id':slip.id, 
+                    'employee_id':False, 
+                    'function_id':False,
+                    'base':base
+                }
+                slip_line_pool.copy(cr, uid, line.id, vals, {})
+
+            for line in emp.line_ids:
+           
+                if line.category_id.code in ad:
+                    continue
+                ad.append(line.category_id.code)
+                
+                cd = line.category_id.code.lower()
+                
+                goto_next = True
+                try:
+                    exp = line.category_id.condition
+                    calculate = eval(exp, obj)
+                except Exception, e:
+                    raise osv.except_osv(_('Variable Error !'), _('Variable Error : %s ' % (e)))
+                    pass
+
+                if not calculate:
+                    continue
+                
+                amt = 0.0
+                value = 0.0
+                base = False
+                company_contrib = 0.0
+                com_value = 0.0
+                if sal_type in ('gross', 'net'):
+
+                    if line.amount_type == 'per':
+                        base = line.category_id.base
+                        value = line.amount
+                        try:
+                            amt = eval(base, obj)
+                        except Exception, e:
+                            raise osv.except_osv(_('Variable Error !'), _('Variable Error : %s ' % (e)))
+                        
+                        if amt > 1:
+                            com_value = line.amount * amt
+                            amt = line.amount
+                        elif amt >= 0 and amt <= 1:
+                            amt =  line.amount + (amt * line.amount)
+                        
+                        if line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
+                            company_contrib = line.category_id.contribute_per
+                        elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'func':
+                            company_contrib = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, contract.wage, context)
+
+                    elif line.amount_type == 'fix':
+                    
+                        value = line.amount
+                        if line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
+                            company_contrib = line.category_id.contribute_per
+                        elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'func':
+                            company_contrib = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, contract.wage, context)
+                            
+                    elif line.amount_type == 'func':
+                    
+                        value = self.pool.get('hr.payslip.line').execute_function(cr, uid, line.id, contract.wage, context)
+                        if line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'fix':
+                            company_contrib = line.category_id.contribute_per
+                        elif line.category_id.contribute and line.category_id.include_in_salary and line.category_id.amount_type == 'func':
+                            company_contrib = self.pool.get('hr.allounce.deduction.categoty').execute_function(cr, uid, line.category_id.id, contract.wage, context)
+                        
+                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, contract.wage, context)
+                    
+                if line.type == 'allounce':
+                    all_per += amt
+                    all_fix += com_value
+                    all_fix += value
+                    all_fix += company_contrib
+                elif line.type == 'deduction':
+                    ded_per += amt
+                    ded_fix += com_value
+                    ded_fix += value
+                    ded_fix += company_contrib
+                
+                vals = {
+                    'company_contrib':company_contrib, 
+                    'amount':value, 
+                    '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':
+                    sal += ded_fix
+                sal -= all_fix
+                per = 0.0
+                if sal_type == 'net':
+                    per = (all_per - ded_per)
+                else:
+                    per = all_per
+                if per <=0 :
+                    per *= -1
+                final = (per * 100) + 100
+                basic = (sal * 100) / final
+            else:
+                basic = contract.wage
+
+            basic_before_leaves = basic
+
+            #Check for the Holidays
+            def get_days(start, end, month, year, calc_day):
+                count = 0
+                for day in range(start, end):
+                    if date(year, month, day).weekday() == calc_day:
+                        count += 1
+                return count
+            
+            dates = prev_bounds(slip.date)
+            sql = '''select id from hr_holidays
+                        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()
+            
+            working_day = 0
+            off_days = 0
+            
+            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 = basic / working_day
+            total = 0.0
+            leave = 0.0
+            if res:
+                holi_ids = [x[0] for x in res]
+                total_leave = 0.0
+                paid_leave = 0.0
+                for hday in holiday_pool.browse(cr, uid, holi_ids):
+                    res = {
+                        'slip_id':slip.id,
+                        'name':hday.holiday_status.name + '-%s' % (hday.number_of_days),
+                        'code':hday.holiday_status.code,
+                        'amount_type':'fix',
+                        'category_id':hday.holiday_status.head_id.id,
+                        'account_id':hday.holiday_status.account_id.id,
+                        'analytic_account_id':hday.holiday_status.analytic_account_id.id
+                    }
+                    total_leave += hday.number_of_days
+                    if hday.holiday_status.type == 'paid':
+                        paid_leave += hday.number_of_days
+                        continue
+                    elif hday.holiday_status.type == 'halfpaid':
+                        paid_leave += (hday.number_of_days / 2)
+                        res['name'] = hday.holiday_status.name + '-%s/2' % (hday.number_of_days)
+                        res['amount'] = perday * (hday.number_of_days/2)
+                        total += perday * (hday.number_of_days/2)
+                        leave += hday.number_of_days / 2
+                        res['type'] = 'leaves'
+                    else:
+                        res['name'] = hday.holiday_status.name + '-%s' % (hday.number_of_days)
+                        res['amount'] = perday * hday.number_of_days
+                        res['type'] = 'leaves'
+                        leave += hday.number_of_days
+                        total += perday * hday.number_of_days
+                    
+                    slip_line_pool.create(cr, uid, res)
+                basic = basic - total
+                leaves = total
+            
+            number = self.pool.get('ir.sequence').get(cr, uid, 'salary.slip')
+            ttyme = datetime.fromtimestamp(time.mktime(time.strptime(slip.date,"%Y-%m-%d")))
+
+            updt = {
+                'deg_id':function,
+                'number':number, 
+                'basic': round(basic),
+                'basic_before_leaves': round(basic_before_leaves),
+                'name':'Salary Slip of %s for %s' % (emp.name, ttyme.strftime('%B-%Y')), 
+                'state':'draft',
+                'leaves':total,
+                'holiday_days':leave,
+                'worked_days':working_day - leave,
+                'working_days':working_day,
+                'contract_id':contract.id,
+                'company_id':slip.employee_id.company_id.id
+            }
+            self.write(cr, uid, [slip.id], updt)
+            
+        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()
+
+class line_condition(osv.osv):
+    '''
+    Line Condition
+    '''
+    _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'),
+        'date_end': fields.date('End Date'),
+        'state':fields.selection([
+            ('total','Override By'),
+            ('add','Add to Structure')
+        ],'Condition', select=True, readonly=False),
+    }
+line_condition()
+
+class hr_payslip_line(osv.osv):
+    '''
+    Payslip Line
+    '''
+    _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)
+#            elif line.amount_type in ('fix', 'func'):
+#                amount = line.amount
+
+#            cd = line.category_id.code.lower()
+#            obj[cd] = amount
+#            print 'XXXXXXXXXXXXXXXXXX : ', cd
+#            
+#            res[line.id] = amount
+#        print 'XXXXXXXXXXXX : ', obj
+#        return res
+
+    def onchange_category(self, cr, uid, ids, category_id):
+        seq = 0
+        if category_id:
+            seq = self.pool.get('hr.allounce.deduction.categoty').browse(cr, uid, category_id).sequence
+            
+        return {'value':{'sequence':seq}}
+    
+    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),
+        'function_id':fields.many2one('hr.payroll.structure', 'Function', required=False),
+        'employee_id':fields.many2one('hr.employee', 'Employee', required=False),
+        'name':fields.char('Name', size=256, required=True, readonly=False),
+        'base':fields.char('Formula', size=1024, required=False, readonly=False),
+        'code':fields.char('Code', size=64, required=False, readonly=False),
+        'type':fields.selection([
+            ('allounce','Allowance'),
+            ('deduction','Deduction'),
+            ('leaves','Leaves'),
+            ('advance','Advance'),
+            ('loan','Loan'),
+            ('installment','Loan Installment'),
+            ('otherpay','Other Payment'),
+            ('otherdeduct','Other Deduction'),
+        ],'Type', select=True, required=True),
+        'category_id':fields.many2one('hr.allounce.deduction.categoty', 'Category', required=True),
+        'amount_type':fields.selection([
+            ('per','Percentage (%)'),
+            ('fix','Fixed Amount'),
+            ('func','Function Value'),
+        ],'Amount Type', select=True),
+        '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.function(_calculate, method=True, type='float', string='Label', store=True),
+        'company_contrib': fields.float('Company Contribution', readonly=True, digits=(16, int(config['price_accuracy']))),
+        '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 0
+        
+        res = line_pool.browse(cr, uid, ids)[-1].value
+        return res
+        
+hr_payslip_line()
+
+class hr_payslip_line_line(osv.osv):
+    '''
+    Function Line
+    '''
+    _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']))),
+        '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']))),
+    }
+hr_payslip_line_line()
+
+class hr_employee(osv.osv):
+    '''
+    Employee
+    '''
+    _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),
+        'pf_account':fields.char('PF Account', size=64, required=False, readonly=False),
+        'pg_joining': fields.date('PF Join Date'),
+        'esi_account':fields.char('ESI Account', size=64, required=False, readonly=False),
+        '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),
+        '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(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Bank Account",
+            method=True,
+            view_load=True,
+            help="Select Bank Account from where Salary Expanse will be Paid",
+            required=True),
+        'salary_account':fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Salary Account",
+            method=True,
+            view_load=True,
+            help="Expanse account when Salary Expanse will be recorded",
+            required=True),
+        'employee_account':fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Employee Account",
+            method=True,
+            view_load=True,
+            help="Employee Payable Account",
+            required=True),
+        'analytic_account':fields.property(
+            'account.analytic.account',
+            type='many2one',
+            relation='account.analytic.account',
+            string="Analytic Account",
+            method=True,
+            view_load=True,
+            help="Analytic Account for Salary Analysis",
+            required=False),
+    }
+hr_employee()
+
diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml
new file mode 100644
index 00000000000..61bd7e624f8
--- /dev/null
+++ b/addons/hr_payroll/hr_payroll_data.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="HRA" model="hr.allounce.deduction.categoty">
+            <field name="code">HRA</field>
+            <field name="type">allow</field>
+            <field name="name">House Rant Allowance</field>
+        </record>
+        
+        <record id="CA" model="hr.allounce.deduction.categoty">
+            <field name="code">CA</field>
+            <field name="type">allow</field>
+            <field name="name">Convance Allowance</field>
+        </record>
+        
+        <record id="MA" model="hr.allounce.deduction.categoty">
+            <field name="code">MA</field>
+            <field name="type">allow</field>
+            <field name="name">Meducal Allowance</field>
+        </record>
+
+        <record id="TELA" model="hr.allounce.deduction.categoty">
+            <field name="code">TELA</field>
+            <field name="type">allow</field>
+            <field name="name">Telephone Allowance</field>
+        </record>
+        
+        <record id="LTA" model="hr.allounce.deduction.categoty">
+            <field name="code">LTA</field>
+            <field name="type">allow</field>
+            <field name="name">Leave Travel Allowance</field>
+        </record>
+        
+        <record id="NA" model="hr.allounce.deduction.categoty">
+            <field name="code">NA</field>
+            <field name="type">allow</field>
+            <field name="name">Newspaper Allowance</field>
+        </record>
+        
+        <record id="TA" model="hr.allounce.deduction.categoty">
+            <field name="code">TA</field>
+            <field name="type">allow</field>
+            <field name="name">Traveling Allowance</field>
+        </record>
+        
+        <record id="DA" model="hr.allounce.deduction.categoty">
+            <field name="code">DA</field>
+            <field name="type">allow</field>
+            <field name="name">Dearness Allowance</field>
+        </record>
+        
+        <record id="PF" model="hr.allounce.deduction.categoty">
+            <field name="code">PF</field>
+            <field name="type">deduct</field>
+            <field name="name">Provident Fund</field>
+        </record>
+        
+        <record id="PT" model="hr.allounce.deduction.categoty">
+            <field name="code">PT</field>
+            <field name="type">deduct</field>
+            <field name="name">Professional Tax</field>
+        </record>
+        
+        <record id="WF" model="hr.allounce.deduction.categoty">
+            <field name="code">WF</field>
+            <field name="type">deduct</field>
+            <field name="name">Welfare</field>
+        </record>
+        
+        <record id="TDS" model="hr.allounce.deduction.categoty">
+            <field name="code">TDS</field>
+            <field name="type">deduct</field>
+            <field name="name">Tax Deduct at Source</field>
+        </record>
+        
+        <record id="ESI" model="hr.allounce.deduction.categoty">
+            <field name="code">ESI</field>
+            <field name="type">deduct</field>
+            <field name="name">Employee's State Insurance</field>
+        </record>
+        
+        <record id="OTHER" model="hr.allounce.deduction.categoty">
+            <field name="code">OTHER</field>
+            <field name="type">deduct</field>
+            <field name="name">Others - Allowances / Deduction</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/hr_payroll/hr_payroll_sequence.xml b/addons/hr_payroll/hr_payroll_sequence.xml
new file mode 100644
index 00000000000..e1c27bbad27
--- /dev/null
+++ b/addons/hr_payroll/hr_payroll_sequence.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="seq_type_salary_slip" model="ir.sequence.type">
+            <field name="name">Salary Slip</field>
+            <field name="code">salary.slip</field>
+        </record>
+        <record id="seq_salary_slip" model="ir.sequence">
+            <field name="name">Salary Slip</field>
+            <field name="code">salary.slip</field>
+            <field name="prefix">SLIP/</field>
+            <field name="padding">3</field>
+        </record>
+        
+        <record id="seq_type_salary_register" model="ir.sequence.type">
+            <field name="name">Salary Register</field>
+            <field name="code">salary.register</field>
+        </record>
+        <record id="seq_salary_register" model="ir.sequence">
+            <field name="name">Salary Register</field>
+            <field name="code">salary.register</field>
+            <field name="prefix">REG/</field>
+            <field name="padding">3</field>
+        </record>
+        
+        <record id="seq_type_payment_advice" model="ir.sequence.type">
+            <field name="name">Payment Advice</field>
+            <field name="code">payment.advice</field>
+        </record>
+        <record id="seq_payment_advice" model="ir.sequence">
+            <field name="name">Payment Advice</field>
+            <field name="code">payment.advice</field>
+            <field name="prefix">PAY/</field>
+            <field name="padding">3</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
new file mode 100644
index 00000000000..30e793df2a6
--- /dev/null
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -0,0 +1,1015 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- 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"/>
+        
+        <!-- Passport Views    -->
+        <record id="hr_passport_form" model="ir.ui.view">
+            <field name="name">hr.passport.form</field>
+            <field name="model">hr.passport</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Passport">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1" colspan="4"/>
+                        <field name="employee_id" select="1"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Country &amp; Address" colspan="4"/>
+                        <field name="country_id" select="1"/>
+                        <field name="address_id" select="1"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Valid From" colspan="2"/>
+                        <field name="date_issue" select="1"/>
+                        <field name="date_expire" select="1"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Description">
+                            <separator string="Description" colspan="2"/>
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="Contracts">
+                            <field name="contracts_ids" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+         <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"/>
+                </tree>
+            </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"/>
+        </record>
+        <menuitem id="passport_configure" parent="hr.menu_hr_configuration" name="Passport"/>
+        <menuitem
+            id="menu_action_hr_passport_tree" 
+            action="action_hr_passport_tree" 
+            parent="passport_configure" 
+        />
+        <!-- End Passport Views -->
+        
+        <!-- Employee View -->
+        <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
+            <field name="name">hr.hr.employee.view.form2</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Contracts">
+                        <field colspan="4" mode="form,tree" name="contract_ids" nolabel="1">
+                            <tree string="Contracts">
+                                <field name="name"/>
+                                <field name="job_id"/>
+                                <field name="date_start"/>
+                                <field name="date_end"/>
+                                <field name="working_hours"/>
+                                <field name="wage_type_id"/>
+                                <field name="wage"/>
+                            </tree>
+                            <form string="Contract">
+                                <group colspan="4" col="6">
+                                    <field name="name" select="1"/>
+                                    <field name="job_id"/>
+                                    <newline/>
+                                    <field name="wage"/>
+                                    <field name="wage_type_id" widget="selection"/>
+                                    <field name="type_id" widget="selection"/>
+                                </group>
+                                <notebook colspan="4">
+                                    <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"/>
+                                        </group>
+                                        <group col="2" colspan="2">
+                                            <separator colspan="2" string="Advantages"/>
+                                            <field name="struct_id" select="1"/>
+                                            <field name="advantages_net"/>
+                                            <field name="advantages_gross"/>
+                                            <field name="advantages" nolabel="1" colspan="2"/>
+                                        </group>
+                                    </page>
+                                    <page string="Work Permit">
+                                        <group col="2" colspan="2">
+                                            <separator colspan="2" string="Passport"/>
+                                            <field name="passport_id"/>
+                                        </group>
+                                        <group col="2" colspan="2">
+                                            <separator colspan="2" string="Valid for"/>
+                                            <field name="visa_no"/>
+                                            <field name="permit_no"/>
+                                            <field name="visa_expire"/>
+                                        </group>
+                                    </page>
+                                </notebook>
+                                <separator colspan="4" string="Notes"/>
+                                <field colspan="4" name="notes" nolabel="1"/>
+                            </form>
+                        </field>
+                    </page>
+                    <page string="Miscelleanous">
+                        <group colspan="2" col="2">
+                            <separator string="Personal Info" colspan="2"/>
+                            <field name="pan_no" select="1"/>
+                            <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"/>
+                            <field name="medic_exam" select="1"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator colspan="2" string="ESI Information"/>
+                            <field name="esi_account" string="Account"/>
+                            <field name="hospital_id" string="Hospital"/>
+                            <field name="medic_exam" select="1" string="Medical Examination"/>
+                            <field name="esp_account" select="1"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator colspan="2" string="Providend Fund"/>
+                            <field name="pf_account" string="Account"/>
+                            <field name="pg_joining" string="Join Date"/>
+                        </group>
+                    </page>
+                    <page string="Salary Structure">
+                        <field name="line_ids" nolabel="1" colspan="4" string="Salary Structure">
+                            <tree string="Salary Structure" editable="bottom">
+                                <field name="sequence"/>
+                                <field name="analytic_account_id"/>
+                                <field name="name"/>
+                                <field name="code"/>
+                                <field name="amount_type"/>
+                                <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
+                                <field name="type"/>
+                                <field name="category_id" on_change="onchange_category(category_id)"/>
+                                <field name="account_id"/>
+                            </tree>
+                        </field>
+                    </page>
+                    <page string="Accounting">
+                        <field name="property_bank_account"/>
+                        <field name="salary_account"/>
+                        <field name="employee_account"/>
+                        <field name="analytic_account"/>
+                        <field name="slip_ids" colspan="4" nolabel="1"/>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+        
+        <record id="view_employee_passport_form" model="ir.ui.view">
+            <field name="name">hr.employee.passport.form</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <field name="otherid" position="after">
+                    <field name="passport_id"/>
+                </field>
+            </field>
+        </record>
+        <!-- End Employee View -->
+        
+        <!-- Contract View -->
+        <record id="hr_contract.hr_contract_view_form" model="ir.ui.view">
+            <field name="name">hr.contract.view.form</field>
+            <field name="model">hr.contract</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Contract">
+                    <group colspan="4" 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"/>
+                    </group>
+                    <notebook colspan="4">
+                        <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"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Advantages"/>
+                                <field name="struct_id" select="1"/>
+                                <field name="advantages_net"/>
+                                <field name="advantages_gross"/>
+                                <field name="advantages" nolabel="1" colspan="2"/>
+                            </group>
+                        </page>
+                        <page string="Work Permit">
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Passport"/>
+                                <field name="passport_id"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Valid for"/>
+                                <field name="visa_no"/>
+                                <field name="permit_no"/>
+                                <field name="visa_expire"/>
+                            </group>
+                        </page>
+                    </notebook>
+                    <separator colspan="4" string="Notes"/>
+                    <field colspan="4" name="notes" nolabel="1"/>
+                </form>
+            </field>
+        </record>
+        <!-- End Contract View-->
+        
+        <!--
+            <record id="hr_hr_employee_view_form3" model="ir.ui.view">
+            <field name="name">hr.hr.employee.view.form3</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr_contract.hr_hr_employee_view_form2"/>
+            <field name="arch" type="xml">
+                <field name="contract_ids" position="replace">
+                    <field colspan="4" name="contract_ids" nolabel="1">
+                        <tree string="Contracts">
+                            <field name="name"/>
+                            <field name="function"/>
+                            <field name="date_start"/>
+                            <field name="date_end"/>
+                            <field name="working_hours_per_day"/>
+                            <field name="wage_type_id"/>
+                            <field name="wage"/>
+                        </tree>
+                        <form string="Contract">
+                            <separator colspan="4" string="Generalities"/>
+                            <field colspan="4" name="name" select="1"/>
+                            <newline/>
+                            <separator colspan="4" string="Contract Duration"/>
+                            <field name="function"/>
+                            <field name="working_hours_per_day"/>
+                            <field name="working_days_per_week"/>
+                            <newline/>
+                            <field name="date_start" select="1"/>
+                            <field name="date_end" select="1"/>
+                            <separator colspan="4" string="Salary"/>
+                            <field name="wage_type_id"/>
+                            <field name="wage"/>
+                            <separator colspan="4" string="Notes"/>
+                            <field colspan="4" name="notes" nolabel="1"/>
+                            <separator colspan="4" string="Passport and Visa"/>
+                            <field name="permit_no"/>
+                            <field name="passport_id"/>
+                            <field name="visa_no"/>
+                            <field name="visa_expire"/>
+                        </form>
+                    </field>
+                </field>
+            </field>
+        </record>
+        
+        <record id="hr_hr_employee_view_form4" model="ir.ui.view">
+            <field name="name">hr.hr.employee.view.form4</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr_hr_employee_view_form3"/>
+            <field name="arch" type="xml">
+                <page string="Miscelleanous" position="replace">
+                    <page string="Miscelleanous / Statutory" position="replace">
+                        <group col="2" colspan="2">
+                            <separator colspan="2" string="Miscelleanous"/>
+                            <field name="manager" select="1"/>
+                            <field name="medic_exam" select="1"/>
+                            <field name="audiens_num"/>
+                            <field name="place_of_birth"/>
+                            <field name="marital_status"/>
+                            <field name="children"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator colspan="2" string="Statutory Information"/>
+                            <field name="pan_no" select="1"/>
+                            <field name="esp_account" select="1"/>
+                            <field name="pf_account"/>
+                            <field name="pg_joining"/>
+                            <field name="esi_account"/>
+                            <field name="hospital_id"/>
+                        </group>
+                        <separator colspan="4" string="Special Allowance and Deductions for Employee"/>
+                        <field name="line_ids" nolabel="1" colspan="4">
+                            <tree string="Salary Structure" editable="bottom">
+                                <field name="sequence"/>
+                                <field name="analytic_account_id"/>
+                                <field name="name"/>
+                                <field name="code"/>
+                                <field name="amount_type"/>
+                                <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
+                                <field name="condition_id">
+                                    <form string="Condition">
+                                        <field name="name"/>
+                                        <field name="date_start"/>
+                                        <field name="date_end"/>
+                                        <field name="state"/>
+                                    </form>
+                                </field>
+                                <field name="type"/>
+                                <field name="category_id" on_change="onchange_category(category_id)"/>
+                                <field name="account_id"/>
+                            </tree>
+                        </field>
+                    </page>
+                </page>
+            </field>
+        </record>
+        
+        <record id="hr_hr_employee_view_form5" model="ir.ui.view">
+            <field name="name">hr.hr.employee.view.form5</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr_hr_employee_view_form4"/>
+            <field name="arch" type="xml">
+                <page string="Miscelleanous / Statutory" position="after">
+                    <page string="Accounting Information">
+                        <field name="property_bank_account"/>
+                        <field name="salary_account"/>
+                        <field name="employee_account"/>
+                        <field name="analytic_account"/>
+                        <field name="slip_ids" colspan="4" nolabel="1"/>
+                    </page>
+                </page>
+            </field>
+        </record>
+        
+        <record id="view_employee_form5" model="ir.ui.view">
+            <field name="name">hr.employee.form5</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <field name="otherid" position="after">
+                    <field name="passport_id"/>
+                </field>
+            </field>
+        </record>
+        -->
+        <!--
+            Holiday Status inheritancy
+        -->
+        <record model="ir.ui.view" id="view_holiday_status_form1">
+            <field name="name">hr.holidays.status.inherit</field>
+            <field name="model">hr.holidays.status</field>
+            <field name="inherit_id" ref="hr_holidays.edit_holiday_status_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="color_name" position="after">
+                    <group col="2" colspan="2">
+                        <separator colspan="4" string="Payroll Accounting"/>
+                        <field name="company_id" select="2"/>
+                        <field name="code"/>
+                        <field name="analytic_account_id"/>
+                        <field name="account_id"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="4" string="Payroll Configurtion"/>
+                        <field name="type"/>
+                        <field name="head_id"/>
+                    </group>
+                </field>
+            </field>
+        </record>
+        <!--
+            Employee Expanse
+        -->
+        <record id="view_expenses_form" model="ir.ui.view">
+            <field name="name">hr.expense.form</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_expense.view_expenses_form"/>
+            <field name="model">hr.expense.expense</field>
+            <field name="arch" type="xml">
+                <field name="ref" position="after">
+                    <field name="category_id"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_hr_payslip_line_tree" model="ir.ui.view">
+            <field name="name">hr.payslip.line.tree</field>
+            <field name="model">hr.payslip.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Salary Structure" editable="bottom">
+                    <field name="sequence"/>
+                    <field name="analytic_account_id"/>
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="amount_type"/>
+                    <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
+                    <field name="total"/>
+                    <field name="type"/>
+                    <field name="category_id" on_change="onchange_category(category_id)"/>
+                    <field name="account_id"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_hr_payslip_line_form" model="ir.ui.view">
+            <field name="name">hr.payslip.line.form</field>
+            <field name="model">hr.payslip.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Payslip Line">
+                    <group col="6" colspan="4">
+                        <field name="name" colspan="4" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="slip_id" select="1"/>
+                        <field name="employee_id"/>
+                        <field name="function_id"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="4" string="Calculations"/>
+                        <field name="category_id" on_change="onchange_category(category_id)"/>
+                        <field name="type"/>
+                        <field name="amount_type"/>
+                        <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
+                        <field name="sequence"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="4" string="Accounting Informations"/>
+                        <field name="account_id"/>
+                        <field name="analytic_account_id"/>
+                        <separator colspan="4" string="Reambusement Informations"/>
+                        <field name="expanse_id"/>
+                        <separator colspan="4" string="Company contribution"/>
+                        <field name="company_contrib"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Function">
+                            <field name="line_ids" colspan="4" nolabel="1" attrs="{'readonly':[('amount_type','!=','func')]}">
+                                <tree string="Function Arguments" editable="bottom">
+                                    <field name="name"/>
+                                    <field name="sequence"/>
+                                    <field name="from_val"/>
+                                    <field name="to_val"/>
+                                    <field name="amount_type"/>
+                                    <field name="value"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Description">
+                            <separator colspan="4" string="Description"/>
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_hr_payslip_tree" model="ir.ui.view">
+            <field name="name">hr.payslip.tree</field>
+            <field name="model">hr.payslip</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Payslip">
+                    <field name="number"/>
+                    <field name="employee_id"/>
+                    <field name="name"/>
+                    <field name="date"/>
+                    <field name="grows"/>
+                    <field name="net"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="view_hr_payslip_form" model="ir.ui.view">
+            <field name="name">hr.payslip.form</field>
+            <field name="model">hr.payslip</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Payslip">
+                    <group col="6" colspan="4">
+                        <field name="employee_id"/>
+                        <field name="name"/>
+                        <field name="number" select="1"/>
+                        <field name="journal_id"/>
+                        <field name="bank_journal_id" domain="[('type','=','cash')]"/>
+                        <field name="date"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Salary Detail">
+                            <field name="line_ids" colspan="4" nolabel="1"/>
+                            <group col="6" colspan="4">
+                                <field name="working_days"/>
+                                <field name="holiday_days"/>
+                                <field name="worked_days"/>
+                                
+                                <field name="basic_before_leaves"/>
+                                <field name="leaves"/>
+                                <field name="basic"/>
+                                
+                                <field name="allounce"/>
+                                <field name="deduction"/>
+                                <field name="other_pay"/>
+                                
+                                <field name="grows"/>
+                                <field name="net"/>
+                                <field name="total_pay"/>
+                            </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"/>
+                                <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 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">
+                        <field name="state"/>
+                        <button string="Compute Sheet" name="compute_sheet" states="new" />
+                        <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"/>
+                    </group>
+                </form>
+            </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"/>
+        </record>
+        
+        <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
+        
+        
+        
+        <record id="view_hr_employee_grade_tree" model="ir.ui.view">
+            <field name="name">hr.payroll.structure.tree</field>
+            <field name="model">hr.payroll.structure</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Employee Function">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="line_ids"/>
+                    <field name="company_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_hr_employee_grade_form" model="ir.ui.view">
+            <field name="name">hr.payroll.structure.form</field>
+            <field name="model">hr.payroll.structure</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Employee Function">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="account_id" select="1"/>
+                        <field name="company_id"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Salary Structure">
+                            <field name="line_ids" nolabel="1" colspan="4"/>
+                        </page>
+                        <page string="Job Profile">
+                            <separator colspan="4" string="Job Profile"/>
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+        
+        <record id="action_view_hr_employee_grade_form" model="ir.actions.act_window">
+            <field name="name">Employee Functions</field>
+            <field name="res_model">hr.payroll.structure</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_hr_employee_grade_tree"/>
+        </record>
+        <menuitem 
+            id="menu_hr_employee_function" 
+            action="action_view_hr_employee_grade_form" 
+            parent="payroll_configure" 
+        />
+        
+        <record id="hr_allounce_deduction_categoty_form" model="ir.ui.view">
+            <field name="name">hr.allounce.deduction.categoty.form</field>
+            <field name="model">hr.allounce.deduction.categoty</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Allowance / Deduction Category">
+                    <group col="6" colspan="6">
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="type" select="1"/>
+                        <group col="2" colspan="4">
+                            <separator colspan="4" string="Dynamic Computation"/>
+                            <field name="base"/>
+                            <field name="condition"/>
+                            <field name="sequence"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator colspan="2" string="Contributions Configuration"/>
+                            <field name="contribute"/>
+                            <field name="amount_type" attrs="{'required': [('contribute','=',True)]}"/>
+                            <field name="contribute_per" attrs="{'required': [('contribute','=',True)], 'readonly':[(('amount_type','=','func'))]}"/>
+                            <field name="register_id" attrs="{'required': [('contribute','=',True)]}"/>
+                            <field name="include_in_salary" />
+                            <field name="account_id" attrs="{'required': [('contribute','=',True), ('include_in_salary','=',True)]}"/>
+                        </group>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Function" attrs="{'invisible': [('amount_type','!=','func')]}">
+                            <field name="line_ids" colspan="4" nolabel="1">
+                                <tree string="Function Arguments" editable="bottom">
+                                    <field name="name"/>
+                                    <field name="sequence"/>
+                                    <field name="from_val"/>
+                                    <field name="to_val"/>
+                                    <field name="amount_type"/>
+                                    <field name="value"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Description">
+                            <separator colspan="4" string="Description"/>
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+         <record id="hr_allounce_deduction_categoty_tree" model="ir.ui.view">
+            <field name="name">hr.allounce.deduction.categoty.tree</field>
+            <field name="model">hr.allounce.deduction.categoty</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Allowance / Deduction Category">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="type"/>
+                </tree>
+            </field>
+        </record>
+        <record id="hr_allounce_deduction_tree" model="ir.actions.act_window">
+            <field name="name">Allowance/Deduction 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"/>
+        </record>
+        <menuitem 
+            id="menu_hr_allounce_deduction_tree" 
+            action="hr_allounce_deduction_tree" 
+            parent="payroll_configure" 
+        />
+        
+        <!-- Contract Form-->
+<!--        <record id="hr_contract.hr_contract_view_form" model="ir.ui.view">-->
+<!--            <field name="name">hr.contract.view.form</field>-->
+<!--            <field name="model">hr.contract</field>-->
+<!--            <field name="type">form</field>-->
+<!--            <field name="arch" type="xml">-->
+<!--                <form string="Contract">-->
+<!--                    <field name="employee_id"/>-->
+<!--                    <separator colspan="4" string="General Information"/>-->
+<!--                    <field colspan="4" name="name" select="1"/>-->
+<!--                    <newline/>-->
+<!--                    <separator colspan="4" string="Contract Duration"/>-->
+<!--                    <field name="function"/>-->
+<!--                    <field name="working_hours_per_day"/>-->
+<!--                    <field name="working_days_per_week"/>-->
+<!--                    <field name="date_start" select="1"/>-->
+<!--                    <field name="date_end" select="1"/>-->
+<!--                    -->
+<!--                    <separator colspan="4" string="Salary"/>-->
+<!--                    <field name="wage_type_id"/>-->
+<!--                    <field name="wage"/>-->
+<!--                    -->
+<!--                    <separator colspan="4" string="Notes"/>-->
+<!--                    <field colspan="4" name="notes" nolabel="1"/>-->
+<!--                    -->
+<!--                    <separator colspan="4" string="Passport and Visa"/>-->
+<!--                    <field name="permit_no"/>-->
+<!--                    <field name="passport_id"/>-->
+<!--                    <field name="visa_no"/>-->
+<!--                    <field name="visa_expire"/>-->
+<!--                </form>-->
+<!--            </field>-->
+<!--        </record>-->
+<!--        <record id="action_hr_contract" model="ir.actions.act_window">-->
+<!--            <field name="name">Employee Contract</field>-->
+<!--            <field name="res_model">hr.contract</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">form,tree</field>-->
+<!--        </record>-->
+<!--        <menuitem -->
+<!--            action="action_hr_contract" -->
+<!--            name="Employee Contract" -->
+<!--            id="hr_menu_contract" -->
+<!--            parent="payroll_configure"-->
+<!--        />-->
+        
+        <record id="view_hr_bank_advice_tree" model="ir.ui.view">
+            <field name="name">hr.payroll.advice.tree</field>
+            <field name="model">hr.payroll.advice</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Bank Advice">
+                    <field name="name" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="number" select="1"/>
+                    <field name="company_id"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="view_hr_bank_advice_form" model="ir.ui.view">
+            <field name="name">hr.payroll.advice.form</field>
+            <field name="model">hr.payroll.advice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bank Advice">
+                    <group col="6" colspan="4">
+                        <field name="name" colspan="4" select="1"/>
+                        <field name="account_id" select="1"/>
+                        <newline/>
+                        <field name="date" select="1"/>
+                        <field name="number" select="1"/>
+                        <field name="register_id"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Paymeny Lines">
+                            <field name="line_ids" colspan="4" nolabel="1">
+                                <tree string="Payment Lines" editable="bottom">
+                                    <field name="employee_id" on_change="onchange_employee_id(parent.date, employee_id)"/>
+                                    <field name="name"/>
+                                    <field name="amount"/>
+                                    <field name="bysal"/>
+                                    <field name="flag"/>
+                                </tree>
+                            </field>
+                            <field name="company_id"/>
+                            <field name="chaque_nos"/>
+                        </page>
+                        <page string="Letter Content">
+                            <separator colspan="4" string="Letter Details"/>
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </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"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_view_hr_bank_advice_tree" model="ir.actions.act_window">
+            <field name="name">Payment Advice</field>
+            <field name="res_model">hr.payroll.advice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_hr_bank_advice_tree"/>
+        </record>
+        <menuitem 
+            action="action_view_hr_bank_advice_tree" 
+            id="hr_menu_payment_advice" 
+            parent="menu_hr_root_payroll"
+        />
+        
+        <record id="view_hr_payroll_register_tree" model="ir.ui.view">
+            <field name="name">hr.payroll.register.tree</field>
+            <field name="model">hr.payroll.register</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Payroll Register">
+                    <field name="number"/>
+                    <field name="name"/>
+                    <field name="date"/>
+                    <field name="journal_id"/>
+                    <field name="bank_journal_id"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_hr_payroll_register_form" model="ir.ui.view">
+            <field name="name">hr.payroll.register.form</field>
+            <field name="model">hr.payroll.register</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Payroll Register">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="date" select="1"/>
+                        <field name="number" select="1"/>
+                        <field name="journal_id"/>
+                        <field name="bank_journal_id"/>
+                        <field name="active"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Payslips">
+                            <field name="line_ids" colspan="4" nolabel="1">
+                                <tree string="Payslip">
+                                    <field name="number"/>
+                                    <field name="employee_id"/>
+                                    <field name="name"/>
+                                    <field name="date"/>
+                                    <field name="basic"/>
+                                    <field name="allounce"/>
+                                    <field name="grows"/>
+                                    <field name="deduction"/>
+                                    <field name="net"/>
+                                    <field name="state"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="2">
+                                <separator colspan="4" string="Allowance / Deduction"/>
+                                <field name="allounce"/>
+                                <field name="deduction"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator colspan="4" string="Salary Information"/>
+                                <field name="grows"/>
+                                <field name="net"/>
+                            </group>
+                        </page>
+                    </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"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_view_hr_payroll_register_form" model="ir.actions.act_window">
+            <field name="name">Payroll Register</field>
+            <field name="res_model">hr.payroll.register</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem 
+            action="action_view_hr_payroll_register_form" 
+            id="hr_menu_payroll_register" 
+            parent="menu_hr_root_payroll"
+        />
+        
+        <!--
+        Contribution Register
+        -->
+        <record id="hr_contibution_register_tree" model="ir.ui.view">
+            <field name="name">hr.contibution.register.tree</field>
+            <field name="model">hr.contibution.register</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Contribution Registers">
+                    <field name="name" select="1"/>
+                    <field name="company_id" select="1"/>
+                    <field name="monthly_total_by_emp"/>
+                    <field name="monthly_total_by_comp"/>
+                    <field name="yearly_total_by_emp"/>
+                    <field name="yearly_total_by_comp"/>
+                </tree>
+            </field>
+        </record>
+        <record id="hr_contibution_register_form" model="ir.ui.view">
+            <field name="name">hr.contibution.register.form</field>
+            <field name="model">hr.contibution.register</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Contribution">
+                    <field name="name" select="1"/>
+                    <field name="account_id"/>
+                    <field name="analytic_account_id"/>
+                    <field name="company_id" select="1"/>
+                    <notebook colspan="4">
+                        <page string="Contribution Lines">
+                            <field colspan="4" name="register_line_ids" nolabel="1" select="1">
+                                <tree string="Register Lines" editable="top">
+                                    <field name="code"/>
+                                    <field name="employee_id"/>
+                                    <field name="period_id"/>    
+                                    <field name="emp_deduction"/>
+                                    <field name="comp_deduction"/>    
+                                    <field name="total"/>                        
+                                </tree>
+                             </field>
+                         </page>
+                         <page string="Description">
+                            <separator colspan="4" string="Description"/>
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <group col="2" colspan="2">
+                        <separator colspan="4" string="Year"/>
+                        <field name="yearly_total_by_emp"/>
+                        <field name="yearly_total_by_comp"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="Month"/>
+                        <field name="monthly_total_by_emp"/>
+                        <field name="monthly_total_by_comp"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_contibution_register_form" model="ir.actions.act_window">
+            <field name="name">Contibution Register</field>
+            <field name="res_model">hr.contibution.register</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="hr_contibution_register_tree"/>
+        </record>
+        <menuitem
+            id="menu_action_hr_contibution_register_form" 
+            action="action_contibution_register_form" 
+            parent="payroll_configure" 
+        />
+        <record id="hr_contibution_register_line_form" model="ir.ui.view">
+            <field name="name">hr.contibution.register.line.form</field>
+            <field name="model">hr.contibution.register.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Contribution">
+                      <field name="name"/>
+                      <field name="code"/>
+                      <field name="employee_id"/>    
+                      <field name="period_id"/>    
+                      <field name="emp_deduction"/>
+                      <field name="comp_deduction"/>    
+                      <field name="total"/>                    
+                </form>
+            </field>
+        </record>
+        
+        <record id="hr_payslip_line_condition_tree" model="ir.ui.view">
+            <field name="name">hr.payslip.line.condition.tree</field>
+            <field name="model">hr.payslip.line.condition</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <form string="Condition">
+                    <field name="name"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>    
+                    <field name="state"/>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>
+
diff --git a/addons/hr_payroll/hr_payroll_wizard.xml b/addons/hr_payroll/hr_payroll_wizard.xml
new file mode 100644
index 00000000000..acc1646a8b5
--- /dev/null
+++ b/addons/hr_payroll/hr_payroll_wizard.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" ?>
+<openerp>
+	<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"/>
+        <menuitem  id="menu_wizard_print_year_salary"
+            icon="STOCK_PRINT"
+            action="wizard_print_year_salary"  
+            parent="menu_hr_payroll_reporting" 
+            name="Employee Year Salary"
+            type="wizard"/>
+
+        <wizard id="wizard_print_employees_detail"
+            menu="False" 
+            model="hr.payslip" 
+            name="wizard.employees.detail" 
+            string="Employees Salary Detail"/>
+        <menuitem  id="menu_wizard_print_employees_detail" 
+            icon="STOCK_PRINT"
+            action="wizard_print_employees_detail" 
+            parent="menu_hr_payroll_reporting" 
+            name="Employees Salary Detail"
+            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>
+</openerp>
diff --git a/addons/hr_payroll/hr_payroll_workflow.xml b/addons/hr_payroll/hr_payroll_workflow.xml
new file mode 100644
index 00000000000..0e5ccfe091f
--- /dev/null
+++ b/addons/hr_payroll/hr_payroll_workflow.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="wkf" model="workflow">
+            <field name="name">hr.payslip.basic</field>
+            <field name="osv">hr.payslip</field>
+            <field name="on_create">True</field>
+        </record>
+        
+        <record id="act_new" model="workflow.activity">
+            <field name="wkf_id" ref="wkf"/>
+            <field name="flow_start">True</field>
+            <field name="name">new</field>
+        </record>
+        
+        <record id="act_draft" model="workflow.activity">
+            <field name="wkf_id" ref="wkf"/>
+            <field name="name">draft</field>
+            <field name="action">compute_sheet()</field>
+            <field name="split_mode">OR</field>
+            <field name="kind">function</field>
+        </record>
+        
+        <record id="act_hr_check" model="workflow.activity">
+            <field name="wkf_id" ref="wkf"/>
+            <field name="name">hr_check</field>
+            <field name="action">hr_check_sheet()</field>
+            <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>
+            <field name="action">verify_sheet()</field>
+            <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">cancel_sheet()</field>
+            <field name="kind">function</field>
+        </record>
+        
+        <record id="act_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf"/>
+            <field name="name">done</field>
+            <field name="action">process_sheet()</field>
+            <field name="kind">function</field>
+            <field name="flow_stop">True</field>
+        </record>
+        
+        <record id="t1" model="workflow.transition">
+            <field name="act_from" ref="act_new"/>
+            <field name="act_to" ref="act_draft"/>
+            <field name="signal">compute_sheet</field>
+        </record>
+        
+        <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">
+            <field name="act_from" ref="act_confirm"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="signal">process_sheet</field>
+        </record>
+        
+        <record id="t7" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel_sheet</field>
+        </record>
+        
+        <record id="t8" model="workflow.transition">
+            <field name="act_from" ref="act_hr_check"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel_sheet</field>
+        </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>
+        </record>
+        
+        <record id="t11" model="workflow.transition">
+            <field name="act_from" ref="act_done"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel_sheet</field>
+        </record>
+        
+        <record id="t12" model="workflow.transition">
+            <field name="act_from" ref="act_cancel"/>
+            <field name="act_to" ref="act_draft"/>
+            <field name="signal">set_to_draft</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/hr_payroll/i18n/fr_BE.po b/addons/hr_payroll/i18n/fr_BE.po
new file mode 100644
index 00000000000..a4466114f51
--- /dev/null
+++ b/addons/hr_payroll/i18n/fr_BE.po
@@ -0,0 +1,1435 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-25 13:16:10+0000\n"
+"PO-Revision-Date: 2009-11-25 13:16:10+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: hr_payroll
+#: rml:employees.salary:0
+msgid "E-mail Address"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "(Based on type Payroll will calculate basic salary)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,net:0
+#: field:hr.payslip,net:0
+msgid "Net Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,working_days:0
+msgid "Working Days"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "New Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Axis Bank"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,esp_account:0
+msgid "EPS Account"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Department"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,gratuity:0
+msgid "Use for Gratuity ?"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Employee No"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Salary Payment Register"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Paid ? "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
+msgid "Year Salary Report"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Paid Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,flag:0
+msgid "D/C"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,company_id:0
+#: field:hr.payslip,company_id:0
+#: wizard_field:payroll.analysis,init,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid ","
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Half-Pay Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,other_pay:0
+msgid "Others"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,slip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip
+#: rml:payslip.pdf:0
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Calculations Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,description:hr_payroll.module_meta_information
+msgid "\n"
+"    The Payroll system - India, Manages and depends on,\n"
+"    * HR Details\n"
+"    * HR Contracts\n"
+"    * HR Payslip\n"
+"    * HR Paysheet\n"
+"    * HR Attendance\n"
+"    * HR Holidays\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: rml:salary.structure:0
+msgid "Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Payment From"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Miscelleanous / Statutory"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,register_id:0
+msgid "Register"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:wizard.year.salary,init,salary_on:0
+msgid "Next Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,value:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Name of the Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,amount:0
+#: rml:payroll.advice:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,line_ids:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,country_id:0
+msgid "Country of Issue"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please Confirm all Expanse Invoice appear for Reimbursement"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Other Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_expire:0
+msgid "Passport Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Special Allowance and Deductions for Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Un-Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,type:0
+msgid "Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,analytic_account:0
+#: field:hr.employee.grade,account_id:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+#: rml:salary.structure:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Expanse To"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,base:0
+msgid "Based on"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Bank"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,move_id:0
+msgid "Expanse Entries"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
+msgid "Human Resource Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,esi_account:0
+msgid "ESI Account"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_passport
+msgid "Passport Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please defined the Employee Home Address Along with Partners !!"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,total:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,from:0
+msgid "From"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+msgid "By Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
+msgid "Employee Year Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+msgid "Employee PaySlip"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+#: rml:payroll.advice:0
+msgid "Authorised Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,umo_id:0
+msgid "Unite"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Notes:"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "End Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Amount Information"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,passport_id:0
+#: field:hr.employee,passport_id:0
+#: view:hr.passport:0
+msgid "Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,employee_id:0
+#: field:hr.payroll.advice.line,employee_id:0
+#: field:hr.payslip,employee_id:0
+#: field:hr.payslip.line,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,type:0
+#: field:hr.payslip.line,type:0
+#: wizard_field:payroll.analysis,init,type:0
+#: rml:salary.structure:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "#"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Miscelleanous"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Verify Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,pan_no:0
+msgid "PAN No"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_button:wizard.employees.detail,init,report:0
+#: wizard_button:wizard.year.salary,init,report:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Contributions Configuration"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,grows:0
+#: field:hr.payslip,grows:0
+msgid "Gross Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Total Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Other Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,basic:0
+msgid "Basic Salary - Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:payroll.analysis,init,type:0
+msgid "By Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.wizard,name:hr_payroll.wizard_print_year_salary
+msgid "Year Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Pay Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Gross SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please defined the Partner in Home Address !!"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+#: rml:payslip.pdf:0
+msgid "For the month of"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,deduction:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,deduction:0
+#: selection:hr.payslip.line,type:0
+msgid "Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Passport List"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,payment_id:0
+msgid "Payment Entries"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "YTD"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,expanse_id:0
+msgid "Expense"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+msgid "Fided Value"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Loan Installment"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Complete HR Checking"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Allowances"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Net Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.payroll.advice,state:0
+#: field:hr.payroll.register,state:0
+#: field:hr.payslip,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Salary Structure:"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
+#: model:ir.actions.wizard,name:hr_payroll.wizard_print_employees_detail
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_employees_detail
+msgid "Employees Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_employee_grade
+msgid "Function of the Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Account Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Others:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.passport,contracts_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Passport and Visa"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,amount_type:0
+#: field:hr.payslip.line,amount_type:0
+#: rml:salary.structure:0
+msgid "Amount Type"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,category_id:0
+#: field:hr.payslip.line,category_id:0
+#: rml:salary.structure:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Total SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,hospital_id:0
+msgid "ESI Hospital"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,slip_ids:0
+#: view:hr.payroll.register:0
+#: field:hr.payroll.register,line_ids:0
+msgid "Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Reject"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_passport_tree
+msgid "All Passports"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:hr.payroll.register.sheet:0
+#: rml:payslip.pdf:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+msgid "Percentage (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,register_id:0
+#: view:hr.payroll.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
+#: model:ir.model,name:hr_payroll.model_hr_payroll_register
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:hr.payroll.register.sheet:0
+#: rml:payroll.advice:0
+#: rml:salary.structure:0
+#: rml:year.salary:0
+msgid "For"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expanse Journal"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_contract
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,contribute:0
+msgid "Contribe by Company ?"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,working_days_per_week:0
+msgid "Working Days / Week"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,worked_days:0
+msgid "Worked Day"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Complete Accountant Checking"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Title"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+msgid "On Attendance"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
+msgid "Allowance/Deduction Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:year.salary:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for HR Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,pf_account:0
+msgid "PF Account"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Compute"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: field:hr.payslip,deg_id:0
+#: rml:payslip.pdf:0
+#: rml:salary.structure:0
+msgid "Designation"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "HR Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.payslip,basic_before_leaves:0
+#: rml:payslip.pdf:0
+msgid "Basic Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,code:0
+msgid "Categoty Code"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Salary Information"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
+msgid "Allowance Deduction Categoty"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Allowance / Deduction Category"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:hr.payroll.register,date:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Basic SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Phone No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,include_in_salary:0
+msgid "Included in Salary ?"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.expense.expense,category_id:0
+#: field:hr.holidays.status,head_id:0
+msgid "Payroll Head"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,account_id:0
+#: rml:salary.structure:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,code:0
+#: field:hr.payslip.line,code:0
+#: rml:salary.structure:0
+msgid "Code"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
+#: rml:payroll.advice:0
+msgid "Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,to:0
+msgid "To"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_button:payroll.analysis,init,process:0
+msgid "Process"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Loan"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.year.salary,init,salary_on:0
+msgid "Salary On"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,number:0
+#: field:hr.payroll.register,number:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,number:0
+msgid "Number"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Contract Detail:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "General Information"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.employee,line_ids:0
+#: view:hr.employee.grade:0
+#: field:hr.employee.grade,line_ids:0
+#: rml:salary.structure:0
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+#: wizard_button:payroll.analysis,init,end:0
+#: wizard_button:wizard.employees.detail,init,end:0
+#: wizard_button:wizard.year.salary,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount:0
+#: rml:salary.structure:0
+msgid "Amount / Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:wizard.year.salary,init,salary_on:0
+msgid "Current Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Contract Duration"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_view:payroll.analysis,init:0
+msgid "Process Form"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,name:0
+msgid "Passport No"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Account Information"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Generalities"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "for period"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Allowance / Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "E-mail"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
+msgid "Print Statement"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,line_ids:0
+msgid "Calculations"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_view:wizard.year.salary,init:0
+msgid "Salary Deposit Date Option?"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Dynamic Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee.grade,function_id:0
+#: field:hr.payslip.line,function_id:0
+msgid "Function"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "PAN No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,pg_joining:0
+msgid "PF Join Date"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
+msgid "Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_view:wizard.employees.detail,init:0
+#: wizard_view:wizard.year.salary,init:0
+msgid "Year Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,name:0
+msgid "Categoty Name"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.wizard,name:hr_payroll.wizard_payroll_analysis
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_payroll_analysis
+msgid "Create Analytic Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:payslip.pdf:0
+#: rml:salary.structure:0
+msgid "Address"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expanse will be Paid"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,salary_account:0
+msgid "Expanse account when Salary Expanse will be recorded"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.payroll_configure
+msgid "Configure Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Advance"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Special Allowances and Deductions For Employee:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,name:0
+#: field:hr.payroll.advice,name:0
+#: field:hr.payroll.register,name:0
+#: field:hr.payslip,name:0
+#: field:hr.payslip.line,name:0
+#: rml:salary.structure:0
+#: rml:year.salary:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,leaves:0
+msgid "Leaved Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Statutory Information"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
+msgid "Employee Functions"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.employees.detail,init,employee_ids:0
+#: wizard_field:wizard.year.salary,init,employee_ids:0
+msgid "Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,property_bank_account:0
+#: rml:payroll.advice:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account A/C"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.employees.detail,init,fiscalyear_id:0
+#: wizard_field:wizard.year.salary,init,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:payroll.analysis,init,type:0
+msgid "By Allownce / Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Payroll Configurtion"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_issue:0
+msgid "Passport Issue Date"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,allounce:0
+#: field:hr.payslip,allounce:0
+#: selection:hr.payslip.line,type:0
+msgid "Allowance"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,holiday_days:0
+msgid "No of Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Content"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "By Sal"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Net SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
+msgid "Bank Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
+msgid "Print Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Total Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:payroll.advice:0
+#: rml:year.salary:0
+msgid "Total"
+msgstr ""
+
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
new file mode 100644
index 00000000000..a4466114f51
--- /dev/null
+++ b/addons/hr_payroll/i18n/hr_payroll.pot
@@ -0,0 +1,1435 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-25 13:16:10+0000\n"
+"PO-Revision-Date: 2009-11-25 13:16:10+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: hr_payroll
+#: rml:employees.salary:0
+msgid "E-mail Address"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "(Based on type Payroll will calculate basic salary)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,net:0
+#: field:hr.payslip,net:0
+msgid "Net Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,working_days:0
+msgid "Working Days"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "New Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Axis Bank"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,esp_account:0
+msgid "EPS Account"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Department"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,gratuity:0
+msgid "Use for Gratuity ?"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Employee No"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Salary Payment Register"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Paid ? "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
+msgid "Year Salary Report"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Paid Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,flag:0
+msgid "D/C"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,company_id:0
+#: field:hr.payslip,company_id:0
+#: wizard_field:payroll.analysis,init,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid ","
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Half-Pay Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,other_pay:0
+msgid "Others"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,slip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip
+#: rml:payslip.pdf:0
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Calculations Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,description:hr_payroll.module_meta_information
+msgid "\n"
+"    The Payroll system - India, Manages and depends on,\n"
+"    * HR Details\n"
+"    * HR Contracts\n"
+"    * HR Payslip\n"
+"    * HR Paysheet\n"
+"    * HR Attendance\n"
+"    * HR Holidays\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: rml:salary.structure:0
+msgid "Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Payment From"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Miscelleanous / Statutory"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,register_id:0
+msgid "Register"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:wizard.year.salary,init,salary_on:0
+msgid "Next Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,value:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Name of the Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,amount:0
+#: rml:payroll.advice:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,line_ids:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,country_id:0
+msgid "Country of Issue"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please Confirm all Expanse Invoice appear for Reimbursement"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Other Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_expire:0
+msgid "Passport Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Special Allowance and Deductions for Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Un-Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,type:0
+msgid "Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,analytic_account:0
+#: field:hr.employee.grade,account_id:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+#: rml:salary.structure:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Expanse To"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,base:0
+msgid "Based on"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Bank"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,move_id:0
+msgid "Expanse Entries"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
+msgid "Human Resource Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,esi_account:0
+msgid "ESI Account"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_passport
+msgid "Passport Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please defined the Employee Home Address Along with Partners !!"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,total:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,from:0
+msgid "From"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+msgid "By Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
+msgid "Employee Year Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+msgid "Employee PaySlip"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+#: rml:payroll.advice:0
+msgid "Authorised Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,umo_id:0
+msgid "Unite"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Notes:"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "End Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Amount Information"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,passport_id:0
+#: field:hr.employee,passport_id:0
+#: view:hr.passport:0
+msgid "Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,employee_id:0
+#: field:hr.payroll.advice.line,employee_id:0
+#: field:hr.payslip,employee_id:0
+#: field:hr.payslip.line,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,type:0
+#: field:hr.payslip.line,type:0
+#: wizard_field:payroll.analysis,init,type:0
+#: rml:salary.structure:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "#"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Miscelleanous"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Verify Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,pan_no:0
+msgid "PAN No"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_button:wizard.employees.detail,init,report:0
+#: wizard_button:wizard.year.salary,init,report:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Contributions Configuration"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,grows:0
+#: field:hr.payslip,grows:0
+msgid "Gross Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Total Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Other Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,basic:0
+msgid "Basic Salary - Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:payroll.analysis,init,type:0
+msgid "By Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.wizard,name:hr_payroll.wizard_print_year_salary
+msgid "Year Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Pay Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Gross SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please defined the Partner in Home Address !!"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+#: rml:payslip.pdf:0
+msgid "For the month of"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,deduction:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,deduction:0
+#: selection:hr.payslip.line,type:0
+msgid "Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Passport List"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,payment_id:0
+msgid "Payment Entries"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "YTD"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,expanse_id:0
+msgid "Expense"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+msgid "Fided Value"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Loan Installment"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Complete HR Checking"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Allowances"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Net Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.payroll.advice,state:0
+#: field:hr.payroll.register,state:0
+#: field:hr.payslip,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Salary Structure:"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
+#: model:ir.actions.wizard,name:hr_payroll.wizard_print_employees_detail
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_employees_detail
+msgid "Employees Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_employee_grade
+msgid "Function of the Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Account Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Others:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.passport,contracts_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Passport and Visa"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,amount_type:0
+#: field:hr.payslip.line,amount_type:0
+#: rml:salary.structure:0
+msgid "Amount Type"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,category_id:0
+#: field:hr.payslip.line,category_id:0
+#: rml:salary.structure:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Total SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,hospital_id:0
+msgid "ESI Hospital"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,slip_ids:0
+#: view:hr.payroll.register:0
+#: field:hr.payroll.register,line_ids:0
+msgid "Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Reject"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_passport_tree
+msgid "All Passports"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:hr.payroll.register.sheet:0
+#: rml:payslip.pdf:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+msgid "Percentage (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,register_id:0
+#: view:hr.payroll.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
+#: model:ir.model,name:hr_payroll.model_hr_payroll_register
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:hr.payroll.register.sheet:0
+#: rml:payroll.advice:0
+#: rml:salary.structure:0
+#: rml:year.salary:0
+msgid "For"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expanse Journal"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_contract
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,contribute:0
+msgid "Contribe by Company ?"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,working_days_per_week:0
+msgid "Working Days / Week"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,worked_days:0
+msgid "Worked Day"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Complete Accountant Checking"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Title"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+msgid "On Attendance"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
+msgid "Allowance/Deduction Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:year.salary:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for HR Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,pf_account:0
+msgid "PF Account"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Compute"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: field:hr.payslip,deg_id:0
+#: rml:payslip.pdf:0
+#: rml:salary.structure:0
+msgid "Designation"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "HR Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.payslip,basic_before_leaves:0
+#: rml:payslip.pdf:0
+msgid "Basic Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,code:0
+msgid "Categoty Code"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Salary Information"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
+msgid "Allowance Deduction Categoty"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Allowance / Deduction Category"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:hr.payroll.register,date:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Basic SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Phone No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,include_in_salary:0
+msgid "Included in Salary ?"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.expense.expense,category_id:0
+#: field:hr.holidays.status,head_id:0
+msgid "Payroll Head"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,account_id:0
+#: rml:salary.structure:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,code:0
+#: field:hr.payslip.line,code:0
+#: rml:salary.structure:0
+msgid "Code"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
+#: rml:payroll.advice:0
+msgid "Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,to:0
+msgid "To"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_button:payroll.analysis,init,process:0
+msgid "Process"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Loan"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.year.salary,init,salary_on:0
+msgid "Salary On"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,number:0
+#: field:hr.payroll.register,number:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,number:0
+msgid "Number"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Contract Detail:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "General Information"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.employee,line_ids:0
+#: view:hr.employee.grade:0
+#: field:hr.employee.grade,line_ids:0
+#: rml:salary.structure:0
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+#: wizard_button:payroll.analysis,init,end:0
+#: wizard_button:wizard.employees.detail,init,end:0
+#: wizard_button:wizard.year.salary,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount:0
+#: rml:salary.structure:0
+msgid "Amount / Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:wizard.year.salary,init,salary_on:0
+msgid "Current Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Contract Duration"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_view:payroll.analysis,init:0
+msgid "Process Form"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,name:0
+msgid "Passport No"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Account Information"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Generalities"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "for period"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Allowance / Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "E-mail"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
+msgid "Print Statement"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,line_ids:0
+msgid "Calculations"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_view:wizard.year.salary,init:0
+msgid "Salary Deposit Date Option?"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Dynamic Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee.grade,function_id:0
+#: field:hr.payslip.line,function_id:0
+msgid "Function"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "PAN No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,pg_joining:0
+msgid "PF Join Date"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
+msgid "Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_view:wizard.employees.detail,init:0
+#: wizard_view:wizard.year.salary,init:0
+msgid "Year Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,name:0
+msgid "Categoty Name"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.wizard,name:hr_payroll.wizard_payroll_analysis
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_payroll_analysis
+msgid "Create Analytic Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:payslip.pdf:0
+#: rml:salary.structure:0
+msgid "Address"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expanse will be Paid"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,salary_account:0
+msgid "Expanse account when Salary Expanse will be recorded"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.payroll_configure
+msgid "Configure Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Advance"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Special Allowances and Deductions For Employee:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,name:0
+#: field:hr.payroll.advice,name:0
+#: field:hr.payroll.register,name:0
+#: field:hr.payslip,name:0
+#: field:hr.payslip.line,name:0
+#: rml:salary.structure:0
+#: rml:year.salary:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,leaves:0
+msgid "Leaved Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Statutory Information"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
+msgid "Employee Functions"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.employees.detail,init,employee_ids:0
+#: wizard_field:wizard.year.salary,init,employee_ids:0
+msgid "Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,property_bank_account:0
+#: rml:payroll.advice:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account A/C"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.employees.detail,init,fiscalyear_id:0
+#: wizard_field:wizard.year.salary,init,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:payroll.analysis,init,type:0
+msgid "By Allownce / Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Payroll Configurtion"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_issue:0
+msgid "Passport Issue Date"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,allounce:0
+#: field:hr.payslip,allounce:0
+#: selection:hr.payslip.line,type:0
+msgid "Allowance"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,holiday_days:0
+msgid "No of Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Content"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "By Sal"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Net SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
+msgid "Bank Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
+msgid "Print Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Total Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:payroll.advice:0
+#: rml:year.salary:0
+msgid "Total"
+msgstr ""
+
diff --git a/addons/hr_payroll/report/__init__.py b/addons/hr_payroll/report/__init__.py
new file mode 100755
index 00000000000..c0f35b40bfc
--- /dev/null
+++ b/addons/hr_payroll/report/__init__.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+#-*- 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 report_payslip
+import report_payroll_advice
+import report_year_salary
+import report_payroll_register
+import report_employees_detail
+import report_emp_salary_structure
\ No newline at end of file
diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml
new file mode 100644
index 00000000000..13e40b68fe5
--- /dev/null
+++ b/addons/hr_payroll/report/payroll_register.rml
@@ -0,0 +1,261 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10"/>
+    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P19" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="P1">[[ repeatIn(objects, 'o') ]]</para>
+    <para style="P4">Salary Payment Register</para>
+    <para style="P5">[[o.name]]</para>
+    <para style="P2">For the month of [[get_month(o.date)]]</para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="72.0,295.0,47.0,68.0" style="Table3">
+      <tr>
+        <td>
+          <para style="P6">Expanse To</para>
+        </td>
+        <td>
+          <para style="P11">[[o.journal_id.name]]</para>
+        </td>
+        <td>
+          <para style="P13">Number</para>
+        </td>
+        <td>
+          <para style="P12">[[o.number]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P13">Payment From</para>
+        </td>
+        <td>
+          <para style="P11">[[o.bank_journal_id.name]]</para>
+        </td>
+        <td>
+          <para style="P6">Date</para>
+        </td>
+        <td>
+          <para style="P12">[[o.date]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table1">
+        <tr>
+          <td>
+            <para style="P5">#</para>
+          </td>
+          <td>
+            <para style="P6">Employee Name</para>
+          </td>
+          <td>
+            <para style="P7">Basic SAL</para>
+          </td>
+          <td>
+            <para style="P7">Others</para>
+          </td>
+          <td>
+            <para style="P7">Allowances</para>
+          </td>
+          <td>
+            <para style="P7">Gross SAL</para>
+          </td>
+          <td>
+            <para style="P7">Deduction</para>
+          </td>
+          <td>
+            <para style="P7">Net SAL</para>
+          </td>
+        </tr>
+      </blockTable>
+      <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table2">
+        <tr>
+          <td>
+            <para style="P9">[[ get_no() ]]</para>
+          </td>
+          <td>
+            <para style="P8">[[ repeatIn(o.line_ids, 'l') ]]</para>
+            <para style="P8">[[add_line(l)]]</para>
+            <para style="P8">[[ l.employee_id.name ]]</para>
+          </td>
+          <td>
+            <para style="P10">[[l.basic]]</para>
+          </td>
+          <td>
+            <para style="P10">[[l.other_pay]]</para>
+          </td>
+          <td>
+            <para style="P10">[[l.allounce]]</para>
+          </td>
+          <td>
+            <para style="P10">[[l.grows]]</para>
+          </td>
+          <td>
+            <para style="P10">[[l.deduction]]</para>
+          </td>
+          <td>
+            <para style="P10">[[l.net]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table4">
+        <tr>
+          <td>
+            <para style="P5">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="P6">Total SAL</para>
+          </td>
+          <td>
+            <para style="P7">[[get_basic()]]</para>
+          </td>
+          <td>
+            <para style="P7">[[get_other()]]</para>
+          </td>
+          <td>
+            <para style="P7">[[get_allow()]]</para>
+          </td>
+          <td>
+            <para style="P7">[[get_grows()]]</para>
+          </td>
+          <td>
+            <para style="P7">[[get_deduct()]]</para>
+          </td>
+          <td>
+            <para style="P7">[[get_net()]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="Standard">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <blockTable colWidths="241.0,241.0" style="Table5">
+      <tr>
+        <td>
+          <para style="P6">For [[company.name]],</para>
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
+          <para style="P6">HR Manager</para>
+          <para style="P19">Authorised Signature</para>
+        </td>
+        <td>
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/hr_payroll/report/payslip.rml b/addons/hr_payroll/report/payslip.rml
new file mode 100755
index 00000000000..ede60a9a490
--- /dev/null
+++ b/addons/hr_payroll/report/payslip.rml
@@ -0,0 +1,671 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table15">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table16">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table17">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table18">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table10">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table19">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table20">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table12">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table14">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table13">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table9">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table11">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table21">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table22">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_address" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
+    <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Table" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_space" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
+    <blockTable colWidths="539.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Pay Slip </para>
+          <para style="terp_default_Centre_9">For the month of [[ get_month(o) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="43.0,101.0,67.0,328.0" style="Table15">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Code</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.employee_id.sinid or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Name </para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[o.employee_id.name]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="43.0,496.0" style="Table16">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Address </para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="43.0,168.0,65.0,263.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Email</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.employee_id.work_email or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Bank Details </para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.employee_id.otherid or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="43.0,102.0,66.0,169.0,68.0,91.0" style="Table17">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Slip ID</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.number or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Bill No</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.move_id and o.move_id.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">PAN No</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.employee_id.pan_no or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="43.0,102.0,66.0,169.0,68.0,91.0" style="Table18">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Register</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.register_id and o.register_id.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Payment</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.payment_id and o.payment_id.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Designation </para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.employee_id.contract_ids and o.employee_id.contract_ids[0].function.name or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space"/>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table10">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Basic Salary without Leave:</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="70.0,89.0,90.0,93.0,105.0,92.0" style="Table19">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Working Days</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.working_days or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Number of Leaves</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.holiday_days or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Worked Day </para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.worked_days or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="70.0,89.0,90.0,93.0,105.0,92.0" style="Table20">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Basic Salary</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.basic_before_leaves or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Leaved Deduction</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.leaves or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Basic Salary – Leaves</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ formatLang(o.basic) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table12">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Leave Deductions Line:</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="292.0,247.0" style="Table14">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Deductions</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ get_month(o) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_9">[[repeatIn(get_leave(o.line_ids),'ld') ]]</para>
+      <blockTable colWidths="293.0,246.0" style="Table13">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ ld.code ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(ld.total) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="158.0,112.0,160.0,109.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Earnings</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ get_month(o) ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Deductions</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ get_month(o) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="269.0,269.0" style="Table8">
+      <tr>
+        <td>
+          <blockTable colWidths="141.0,122.0" style="Table9">
+            <tr>
+              <td>
+                <para style="terp_default_9">Basic Salary</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(o.basic) ]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="terp_default_9"><font>[[repeatIn(get_earnings(o.line_ids),'a') ]]</font><font>[[ a.code or removeParentNode('tr') ]]</font></para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(a.total) ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <section>
+            <para style="terp_default_9">[[repeatIn(get_deductions(o.line_ids),'b') ]]</para>
+            <blockTable colWidths="142.0,121.0" style="Table11">
+              <tr>
+                <td>
+                  <para style="terp_default_9">[[ b.code ]]</para>
+                </td>
+                <td>
+                  <para style="terp_default_Right_9">[[ formatLang(b.total) ]]</para>
+                </td>
+              </tr>
+            </blockTable>
+            <para style="terp_default_2">
+              <font color="white"> </font>
+            </para>
+          </section>
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="181.0,88.0,177.0,93.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Total Earnings </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.allounce + o.basic) ]] </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Total Deductions </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.deduction) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="269.0,134.0,135.0" style="Table21">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Other Lines</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Payments - [[ get_month(o) ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Deduction -[[ get_month(o) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_9">[[repeatIn(get_others(o.line_ids),'ol') ]]</para>
+      <blockTable colWidths="269.0,134.0,135.0" style="Table22">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ ol.type in ['advance','loan','otherpay','otherdeduct','installment'] and ol.code or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ ol.type in ['advance','loan','otherpay'] and formatLang(ol.total) or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ ol.type in ['otherdeduct','installment'] and formatLang(ol.total) or '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="269.0,177.0,93.0" style="Table5">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Net Amount </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.net) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="269.0,269.0" style="Table6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Amount (in words) :</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ convert(o.net,company.currency_id.name) ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="269.0,269.0" style="Table7">
+      <tr>
+        <td>
+          <para style="P1">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Authorized Signature </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.py b/addons/hr_payroll/report/report_emp_salary_structure.py
new file mode 100644
index 00000000000..01dd4302d37
--- /dev/null
+++ b/addons/hr_payroll/report/report_emp_salary_structure.py
@@ -0,0 +1,102 @@
+#!/usr/bin/env python
+#-*- 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 mx.DateTime
+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({
+            'time': time,
+            'get_type':self.get_type,
+            'get_contract':self.get_contract,
+            '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= '''
+            SELECT c.id as id, c.wage as wage, function 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
+            '''%(emp.id, curr_date, curr_date)
+        self.cr.execute(sql_req)
+        contract_id = self.cr.dictfetchone()
+        if not contract_id:
+            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'
+        elif type == 'deduction':
+            return 'Deduction'
+        elif type == 'advance':
+            return 'Advance'
+        elif type == 'loan':
+            return 'Loan'
+        elif type == 'otherpay':
+            return 'Other Payment'
+        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)   
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
new file mode 100644
index 00000000000..18211b254f3
--- /dev/null
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -0,0 +1,552 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table13">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table9">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table10">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table11">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table12">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Drawing" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Times-Roman"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[repeatIn(objects,'employee')]]</para>
+    <blockTable colWidths="539.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">Salary Structure</para>
+          <para style="terp_header_Centre">For [[ employee.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_9">[[repeatIn(get_contract(employee),'cont')]]</para>
+      <blockTable colWidths="68.0,111.0,63.0,111.0,71.0,115.0" style="Table4">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Code</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ employee.ssnid ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Department</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ employee.company_id and employee.company_id.name or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Bank</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ employee.otherid or '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <blockTable colWidths="68.0,111.0,63.0,111.0,71.0,115.0" style="Table6">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Name</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ employee.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">PAN No.</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ employee.pan_no or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Address</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[employee.address_home_id and employee.address_home_id.name or '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <blockTable colWidths="68.0,111.0,63.0,111.0,71.0,115.0" style="Table7">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Designation</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ cont.function.name or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Phone No.</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ employee.work_phone or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">E-mail</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ employee.work_email or '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_space">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="539.0" style="Table13">
+        <tr>
+          <td>
+            <para style="P1">Contract Detail:</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="68.0,111.0,63.0,111.0,71.0,115.0" style="Table2">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Start Date</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ formatLang(cont.date_start,date=True) or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">End Date</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ formatLang(cont.date_end,date=True) or removeParentNode('para') ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Type</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ get_type(cont.wage_type_id.type) or '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <blockTable colWidths="68.0,111.0,63.0,297.0" style="Table3">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Salary</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ formatLang(cont.wage) or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Notes:</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ cont.notes or '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_space">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="539.0" style="Table9">
+        <tr>
+          <td>
+            <para style="P1">Salary Structure:</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <section>
+        <para style="terp_default_1">
+          <font color="white"> </font>
+        </para>
+        <blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,70.0,59.0" style="Table5">
+          <tr>
+            <td>
+              <para style="terp_tblheader_Details">Code</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Name</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Amount Type</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">Amount / Percentage</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Type</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Category</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">General Account</para>
+            </td>
+            <td>
+              <para style="terp_tblheader_Details">Analytic Account</para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="terp_default_1">
+          <font color="white"> </font>
+        </para>
+        <section>
+          <para style="terp_default_9">[[repeatIn(cont.function.line_ids,'line')]]</para>
+          <blockTable colWidths="34.0,117.0,39.0,67.0,44.0,110.0,69.0,59.0" style="Table8">
+            <tr>
+              <td>
+                <para style="terp_default_9">[[ line.code or '' ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_9">[[ line.name ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_9">[[ get_line_amount_type(line.amount_type) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(line.amount) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_9">[[ get_line_type(line.type) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_9">[[ line.category_id.name ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_9">[[ line.account_id.name ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_9">[[ line.analytic_account_id and line.analytic_account_id.name or '' ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_1">
+            <font color="white"> </font>
+          </para>
+        </section>
+        <para style="terp_default_1">
+          <font color="white"> </font>
+        </para>
+      </section>
+    </section>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table10">
+      <tr>
+        <td>
+          <para style="P1">Special Allowances and Deductions For Employee:</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,128.0" style="Table11">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Code</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Name</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Amount Type</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Amount / Percentage</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Type</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Category</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">General Account</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <section>
+        <para style="terp_default_9">[[repeatIn(employee.line_ids,'line1')]]</para>
+        <blockTable colWidths="34.0,117.0,39.0,67.0,44.0,110.0,128.0" style="Table12">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ line1.code or '' ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ line1.name ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ get_line_amount_type(line1.amount_type) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(line1.amount) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ get_line_type(line1.type) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ line1.category_id.name ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ line1.account_id.name ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="terp_default_1">
+          <font color="white"> </font>
+        </para>
+      </section>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/hr_payroll/report/report_employees_detail.py b/addons/hr_payroll/report/report_employees_detail.py
new file mode 100644
index 00000000000..c809696a35b
--- /dev/null
+++ b/addons/hr_payroll/report/report_employees_detail.py
@@ -0,0 +1,235 @@
+import time
+import locale
+import datetime
+from report import report_sxw
+import time
+import pooler
+import rml_parse
+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({
+            'time': time,
+            'get_employee' : self.get_employee,
+            'get_employee_detail' : self.get_employee_detail,
+            'cal_monthly_amt':self.cal_monthly_amt,
+            'get_periods'  : self.get_periods,
+            'get_fiscalyear' : self.get_fiscalyear,
+            'get_total' : self.get_total,
+            'get_allow':self.get_allow,
+            'get_deduct':self.get_deduct,
+            'get_other':self.get_other,
+            'get_monthly_total':self.get_monthly_total,
+        })
+        
+        self.mnths =[]
+        self.allow_list =[]
+        self.deduct_list = []
+        self.other_list = []
+        self.month_total_list =[]
+        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])    
+        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
+        cm = fm
+        cy = fy
+
+#       Get name of the months from integer
+        mnth_name = []
+        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))     
+            if cm == 12:
+                cm = 0
+                cy = ly
+            cm = cm +1
+        return [mnth_name]
+
+    def get_fiscalyear(self,fiscalyear_id):
+        fiscalyear_obj = pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
+        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 = 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
+        for period in period_ids_l:
+            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 =[]
+        self.deduct_list = []
+        self.other_list = []
+        allowance_cat_ids =[]
+        deduction_cat_ids = []
+        other_cat_ids =[]
+        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')])
+        deduction_cat_ids = payment_category.search( self.cr, self.uid, [('type','=','deduct')])
+        other_cat_ids = payment_category.search( self.cr, self.uid, [('type','=','other')])
+        #for Basic Salary
+        res = []
+        res = self.cal_monthly_amt(obj.id,None)
+        self.total += res[len(res)-1]
+        basic_flag = False
+        for i in range(1,len(res)):
+            if res[i] > 0.0:
+                basic_flag = True
+        if basic_flag:
+            self.allow_list.append(res)
+        #for allowance
+        if allowance_cat_ids:
+            for allow in allowance_cat_ids:
+                 res = []
+                 res = self.cal_monthly_amt(obj.id,allow)
+                 all_flag = False
+                 for i in range(1,len(res)):
+                    if res[i] > 0.0:
+                        all_flag = True
+                 if all_flag:
+                     self.allow_list.append(res)
+                     self.total += res[len(res)-1]
+        #for Deduction
+        if deduction_cat_ids:
+            for deduct in deduction_cat_ids:
+                 res = []
+                 res = self.cal_monthly_amt(obj.id,deduct)
+                 ded_flag = False
+                 for i in range(1,len(res)):
+                    if res[i] > 0.0:
+                        ded_flag = True
+                 if ded_flag:
+                     self.deduct_list.append(res)
+                     self.total -= res[len(res)-1]
+        #for Other
+        if other_cat_ids:
+            for other in other_cat_ids:
+                 res = []
+                 res = self.cal_monthly_amt(obj.id,other)
+                 other_flag = False
+                 for i in range(1,len(res)):
+                    if res[i] > 0.0:
+                        other_flag = True
+                 if other_flag:
+                     self.other_list.append(res)
+        return None
+    
+    def cal_monthly_amt(self,emp_id,category):
+        tot = 0.0
+        cnt = 1
+        result = []
+        res ={}
+        if not category:
+            result.append('Basic Salary')
+        else:
+            category_name = self.pool.get('hr.allounce.deduction.categoty').read(self.cr, self.uid, [category],['name','type'])[0]
+            result.append(category_name['name'])
+        for mnth in self.mnths:
+            if len(mnth) != 7:
+                mnth = '0' + str(mnth)
+            query = "select id from hr_payslip where employee_id = "+str(emp_id)+" and to_char(date,'mm-yyyy') like '%"+mnth+"%' and state = 'done' and period_id in "+"("+ self.period_ids +")" +""
+            self.cr.execute(query)
+            payslip_id = self.cr.dictfetchone()
+            if payslip_id:
+                payslip_obj = self.pool.get('hr.payslip').browse(self.cr, self.uid, payslip_id['id'])
+                if not category:
+                    tot += payslip_obj.basic
+                    res[mnth] = payslip_obj.basic
+                    result.append(payslip_obj.basic)
+                    self.month_total_list[cnt] = self.month_total_list[cnt] + payslip_obj.basic
+                else:
+                    append_index = 0
+                    for line in payslip_obj.line_ids:
+                        if line.category_id.id == category:
+                            if category_name['type'] == 'allow':
+                                if res:
+                                    self.month_total_list[cnt] = self.month_total_list[cnt] + line.total
+                                    result[append_index] += line.total
+                                    tot += line.total
+                                    res[mnth] = result[append_index]
+                                else:
+                                    self.month_total_list[cnt] = self.month_total_list[cnt] + line.total
+                                    tot += line.total
+                                    res[mnth] = line.total
+                                    append_index = len(result) - 1
+                                    result.append(line.total)
+                            if category_name['type'] == 'deduct':
+                                if res:
+                                    self.month_total_list[cnt] = self.month_total_list[cnt] - line.total
+                                    result[append_index] += line.total
+                                    tot += line.total
+                                    res[mnth] = result[append_index]
+                                else:
+                                    self.month_total_list[cnt] = self.month_total_list[cnt] - line.total
+                                    tot += line.total
+                                    res[mnth] = line.total
+                                    append_index = len(result) - 1
+                                    result.append(line.total)
+                            if category_name['type'] == 'other':
+                                if res:
+                                    result[append_index] += line.total
+                                    tot += line.total
+                                    res[mnth] = result[append_index]
+                                else:
+                                    res[mnth] = line.total
+                                    result.append(res[mnth])
+                                    append_index = len(result) - 1
+                                    tot += line.total
+            else:
+                result.append(0.00)
+                res[mnth] = 0.00
+            if not res:
+                result.append(0.00)
+            res = {}
+            cnt = cnt + 1 
+        cnt = 1
+        result.append(tot)
+        tot = 0.0
+        return result
+
+    def get_allow(self):
+        return self.allow_list
+
+    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)
+       
+       
+               
diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
new file mode 100644
index 00000000000..1c3ec0e03fa
--- /dev/null
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -0,0 +1,582 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(842.0,595.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="786" height="539"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table9">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Drawing" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Times-Roman"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(get_employee(data['form']), 'o') ]]</para>
+    <para style="terp_header_Centre">Employees Salary Details </para>
+    <para style="terp_default_Centre_9">For [[ get_fiscalyear(data['form']['fiscalyear_id']) ]]</para>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Employee Code</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.ssnid ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Department</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.company_id and o.company_id.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Bank</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.otherid or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Employee Name</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">PAN No.</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.pan_no or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Address</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[o.address_home_id and o.address_home_id.name or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table5">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Designation</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.contract_ids and o.contract_ids[0].function.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Phone No.</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.work_phone or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">E-mail Address</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[o.work_email or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
+      <blockTable colWidths="74.0,54.0,51.0,55.0,52.0,54.0,56.0,53.0,56.0,56.0,56.0,56.0,56.0,56.0" style="Table4">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Title</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[0] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[1] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[2] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[3] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[4] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[5] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[6] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[7] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[8] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[9] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[10] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[11] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Total</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <section>
+        <para style="terp_default_9">[[ get_employee_detail(o) ]]</para>
+        <para style="terp_tblheader_Details">Allowances with Basic:</para>
+        <section>
+          <para style="terp_default_9">[[ repeatIn(get_allow(),'e1') ]]</para>
+          <blockTable colWidths="74.0,54.0,51.0,55.0,52.0,55.0,56.0,53.0,56.0,56.0,56.0,56.0,56.0,56.0" style="Table6">
+            <tr>
+              <td>
+                <para style="terp_default_9">[[ e1[0] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e1[1]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e1[2]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e1[3]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e1[4]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e1[5]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e1[6]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e1[7]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e1[8]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e1[9]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e1[10]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e1[11]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e1[12]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e1[13]) ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_1">
+            <font color="white"> </font>
+          </para>
+        </section>
+        <para style="terp_tblheader_Details">Deductions:</para>
+        <section>
+          <para style="terp_default_9">[[ repeatIn(get_deduct(),'e2') ]]</para>
+          <blockTable colWidths="74.0,54.0,51.0,55.0,52.0,55.0,56.0,53.0,56.0,56.0,56.0,56.0,56.0,56.0" style="Table8">
+            <tr>
+              <td>
+                <para style="terp_default_9">[[ e2[0] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e2[1]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e2[2]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e2[3]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e2[4]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e2[5]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e2[6]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e2[7]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e2[8]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e2[9]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e2[10]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e2[11]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e2[12]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e2[13]) ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_1">
+            <font color="white"> </font>
+          </para>
+        </section>
+        <para style="terp_tblheader_Details">Others:</para>
+        <section>
+          <para style="terp_default_9">[[ repeatIn(get_other(),'e3') ]]</para>
+          <blockTable colWidths="74.0,54.0,51.0,55.0,52.0,55.0,56.0,53.0,56.0,56.0,56.0,56.0,56.0,56.0" style="Table9">
+            <tr>
+              <td>
+                <para style="terp_default_9">[[ e3[0] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e3[1]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e3[2]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e3[3]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e3[4]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e3[5]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e3[6]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e3[7]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e3[8]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e3[9]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e3[10]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e3[11]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(e3[12]) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e3[13]) ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_1">
+            <font color="white"> </font>
+          </para>
+        </section>
+        <para style="terp_default_1">
+          <font color="white"> </font>
+        </para>
+      </section>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="74.0,54.0,50.0,55.0,52.0,55.0,55.0,54.0,56.0,56.0,56.0,56.0,56.0,56.0" style="Table1">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">[[ get_monthly_total()[0] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_total()) ]]</u></para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/hr_payroll/report/report_payroll_advice.py b/addons/hr_payroll/report/report_payroll_advice.py
new file mode 100644
index 00000000000..d33ad5affc1
--- /dev/null
+++ b/addons/hr_payroll/report/report_payroll_advice.py
@@ -0,0 +1,54 @@
+import time
+import mx.DateTime
+from report import report_sxw
+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({
+            'time': time,
+            'get_month'   : self.get_month,
+            'convert'     : self.convert,
+            'get_detail'  : self.get_detail,
+            'get_total'   : self.get_total,
+            'get_bysal_total'   : self.get_bysal_total,
+        })
+
+    def get_month(self,input_date):
+        res = {
+               'mname':''
+               }
+        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:
+            for l in line_ids:
+                res = {}
+                res['name'] = l.employee_id.name
+                res['acc_no'] = l.name
+                res['amount'] = l.amount
+                res['bysal'] = l.bysal
+                res['flag'] = l.flag
+                self.total_amount += l.amount
+                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
diff --git a/addons/hr_payroll/report/report_payroll_advice.rml b/addons/hr_payroll/report/report_payroll_advice.rml
new file mode 100644
index 00000000000..00a2d599d0e
--- /dev/null
+++ b/addons/hr_payroll/report/report_payroll_advice.rml
@@ -0,0 +1,337 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_0.30cmspace" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_space" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="1.0"/>
+    <paraStyle name="Drawing" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Times-Roman"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
+    <para style="terp_tblheader_Details_Centre">Payment Advice</para>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="269.0,269.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.date,date=True) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">The Manager</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Axis Bank</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_1">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">Dear Sir/Madam,</para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="539.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre"><u>[[ o.name ]] for period [[ get_month(o.date)['mname'] ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="539.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ o.note ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8_space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="61.0,166.0,84.0,82.0,111.0,35.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">SI. No.</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Name of the Employee</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Amount</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">By Sal</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Bank Account</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">C/D</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
+      <blockTable colWidths="60.0,167.0,84.0,82.0,110.0,35.0" style="Table5">
+        <tr>
+          <td>
+            <para style="P1" leftIndent="15" bulletIndent="0">
+              <bullet size="8.0"><seq id="L1"/>.</bullet>
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line['amount' ]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line['bysal']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line['acc_no'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ line['flag'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="60.0,167.0,84.0,82.0,145.0" style="Table6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Total</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(get_total()) ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(get_bysal_total()) ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_0.30cmspace">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="269.0,269.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Yours Sincerely</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">For [[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Authorised Signature</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para>
+      <seqReset id="L1"/>
+    </para>
+  </story>
+</document>
diff --git a/addons/hr_payroll/report/report_payroll_register.py b/addons/hr_payroll/report/report_payroll_register.py
new file mode 100644
index 00000000000..6ab5b0c35c9
--- /dev/null
+++ b/addons/hr_payroll/report/report_payroll_register.py
@@ -0,0 +1,72 @@
+import time
+import mx.DateTime
+from report import report_sxw
+from tools import amount_to_text_en
+
+class report_payroll_register(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(report_payroll_register, self).__init__(cr, uid, name, context)
+        
+        self.total_amount = 0.00
+        self.total_bysal = 0.00
+        self.localcontext.update({
+            'time': time,
+            'get_month': self.get_month,
+            'get_no': self.get_no,
+            'get_basic':self.get_basic,
+            'get_other':self.get_other,
+            'get_allow':self.get_allow,
+            'get_grows':self.get_grows,
+            'get_deduct':self.get_deduct,
+            'get_net':self.get_net,
+            'add_line':self.add_line,
+        })
+        self.no = 0
+        self.basic = 0.0
+        self.other = 0.0
+        self.allow = 0.0
+        self.grows = 0.0
+        self.deduct = 0.0
+        self.net = 0.0
+    
+    def add_line(self, line):
+        self.basic += line.basic
+        self.other += line.other_pay
+        self.allow += line.allounce
+        self.grows += line.grows
+        self.deduct += line.deduction
+        self.net += line.net
+        
+    def get_basic(self):
+        return self.basic
+    
+    def get_other(self):
+        return self.other
+        
+    def get_allow(self):
+        return self.allow
+        
+    def get_grows(self):
+        return self.grows
+    
+    def get_deduct(self):
+        return self.deduct
+        
+    def get_net(self):
+        return self.net
+        
+    def get_month(self, indate):
+        new_date = mx.DateTime.strptime(indate, '%Y-%m-%d')
+        out_date = new_date.strftime('%B')+'-'+new_date.strftime('%Y')
+        return out_date
+
+    def get_no(self):
+        self.no += 1
+        return self.no
+        
+report_sxw.report_sxw(
+    'report.hr.payroll.register.sheet', 
+    'hr.payroll.register', 
+    'hr_payroll/report/payroll_register.rml', 
+    parser=report_payroll_register
+)   
diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
new file mode 100755
index 00000000000..7895178de58
--- /dev/null
+++ b/addons/hr_payroll/report/report_payslip.py
@@ -0,0 +1,116 @@
+#!/usr/bin/env python
+#-*- 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 mx.DateTime
+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, 
+            '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 = []
+          for id in range(len(obj)):
+              if obj[id].category_id.type == 'other' and obj[id].type != 'leaves':
+                 ids.append(obj[id].id)
+          payslip_line = self.pool.get('hr.payslip.line')
+          if len(ids):
+              res = payslip_line.browse(self.cr, self.uid, ids)
+          return res
+          
+      def get_leave(self,obj):
+          res = []
+          ids = []
+          for id in range(len(obj)):
+              if obj[id].type == 'leaves':
+                 ids.append(obj[id].id)
+          payslip_line = self.pool.get('hr.payslip.line')
+          if len(ids):
+              res = payslip_line.browse(self.cr, self.uid, ids)
+          return res
+      
+      def get_earnings(self,obj):
+          res = []
+          ids = []
+          for id in range(len(obj)):
+              if obj[id].category_id.type == 'allow' and obj[id].type != 'leaves':
+                 ids.append(obj[id].id)
+          payslip_line = self.pool.get('hr.payslip.line')
+          if len(ids):
+              res = payslip_line.browse(self.cr, self.uid, ids)
+          return res
+
+      def get_deductions(self,obj):
+          res = []
+          ids = []
+          for id in range(len(obj)):
+              if obj[id].category_id.type == 'deduct' and obj[id].type != 'leaves':
+                 ids.append(obj[id].id)
+          payslip_line = self.pool.get('hr.payslip.line')
+          if len(ids):
+              res = payslip_line.browse(self.cr, self.uid, ids)
+          return res
+
+      def get_month(self,obj):
+           res = {
+                    'mname':''
+                 }
+           date = mx.DateTime.strptime(obj.date, '%Y-%m-%d')
+           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)   
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
new file mode 100755
index 00000000000..74c6d347550
--- /dev/null
+++ b/addons/hr_payroll/report/report_year_report.rml
@@ -0,0 +1,298 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(842.0,595.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="786" height="539"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Drawing" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Times-Roman"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_header_Centre">Yearly Salary Details </para>
+    <para style="terp_default_Centre_9">For [[ get_fiscalyear(data['form']['fiscalyear_id']) ]]</para>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
+      <blockTable colWidths="74.0,54.0,51.0,55.0,52.0,54.0,56.0,53.0,56.0,56.0,56.0,56.0,56.0,56.0" style="Table4">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Name</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[0] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[1] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[2] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[3] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[4] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[5] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[6] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[7] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[8] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[9] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[10] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[11] ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Total</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <section>
+        <para style="terp_default_9">[[ repeatIn(get_employee(data['form']),'e') ]]</para>
+        <blockTable colWidths="74.0,54.0,51.0,55.0,52.0,55.0,56.0,53.0,56.0,56.0,56.0,56.0,56.0,56.0" style="Table1">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ e[0] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(e[1]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(e[2]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(e[3]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(e[4]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(e[5]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(e[6]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(e[7]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(e[8]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(e[9]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(e[10]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(e[11]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(e[12]) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9_Bold">[[ formatLang(e[13]) ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="terp_default_1">
+          <font color="white"> </font>
+        </para>
+      </section>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P1">[[ repeatIn(get_months_tol(),'t') ]]</para>
+      <blockTable colWidths="74.0,54.0,51.0,55.0,52.0,56.0,55.0,53.0,56.0,56.0,56.0,56.0,56.0,56.0" style="Table6">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Total</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[1]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[2]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[3]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[4]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[5]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[6]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[7]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[8]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[9]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[10]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[11]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[12]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py
new file mode 100755
index 00000000000..1866ef795b6
--- /dev/null
+++ b/addons/hr_payroll/report/report_year_salary.py
@@ -0,0 +1,113 @@
+import time
+import locale
+import datetime
+from report import report_sxw
+import time
+import pooler
+import rml_parse
+import mx.DateTime
+from mx.DateTime import RelativeDateTime, now, DateTime, localtime
+
+class year_salary_report(rml_parse.rml_parse):
+    
+    def __init__(self, cr, uid, name, context):
+        super(year_salary_report, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'get_employee' : self.get_employee,
+            'get_periods'  : self.get_periods,
+            'get_months_tol' : self.get_months_tol,
+            'get_fiscalyear' : self.get_fiscalyear,
+            'get_total' : self.get_total,
+        })
+        
+        self.mnths =[]
+        self.mnths_tol = []
+        self.curr_fiscal_year_name=''
+        self.total=0.0
+        
+    def get_periods(self,form):
+        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])    
+        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
+        cm = fm
+        cy = fy
+
+#       Get name of the months from integer
+        mnth_name = []
+        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))     
+            if cm == 12:
+                cm = 0
+                cy = ly
+            cm = cm +1
+        return [mnth_name]
+
+    def get_fiscalyear(self,fiscalyear_id):
+        fiscalyear_obj = pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
+        return fiscalyear_obj.read(self.cr,self.uid,[fiscalyear_id],['name'])[0]['name']
+
+            
+    def get_employee(self,form):
+        ls1=[]        
+        ls = []
+        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]
+        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
+        for period in period_ids_l:
+            periods.append(period.id)
+        periods_ids = ','.join(map(str, periods))
+        cnt = 1
+        for emp_id in empll:        
+            ls1.append(emp_id.name)
+            tol = 0.0
+            for mnth in self.mnths:
+                if len(mnth) != 7:
+                    mnth = '0' + str(mnth)
+                query = "select net from hr_payslip where employee_id = "+str(emp_id.id)+" and to_char(date,'mm-yyyy') like '%"+mnth+"%' and state = 'done' and period_id in "+"("+ periods_ids +")" +""
+                self.cr.execute(query)
+                sal = self.cr.fetchall()
+                try:
+                    ls1.append(sal[0][0])
+                except:
+                    ls1.append(0) 
+                try:                    
+                    tol += sal[0][0]
+                    tol_mnths[cnt] = tol_mnths[cnt] + sal[0][0]
+                except:
+                    tol += 0 
+                cnt = cnt + 1  
+            cnt = 1          
+            ls1.append(tol)
+            ls.append(ls1)
+            ls1 = []
+        self.mnths_tol.append(tol_mnths)
+        return ls
+    
+    def get_months_tol(self):
+        return self.mnths_tol
+        
+    def get_total(self):
+        for item in self.mnths_tol:
+            for count in range(1,len(item)):
+              self.total += item[count]
+        return self.total
+    
+report_sxw.report_sxw('report.year.salary', 'hr.payslip', 'hr_payroll/report/report_year_report.rml', parser=year_salary_report)
+       
+       
+               
diff --git a/addons/account/rml_parse.py b/addons/hr_payroll/report/rml_parse.py
similarity index 97%
rename from addons/account/rml_parse.py
rename to addons/hr_payroll/report/rml_parse.py
index fd73d16a406..beeb6deae49 100755
--- a/addons/account/rml_parse.py
+++ b/addons/hr_payroll/report/rml_parse.py
@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    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
@@ -19,7 +19,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 from report import report_sxw
 import xml.dom.minidom
 import os, time
@@ -30,6 +29,7 @@ import pooler
 import re
 import sys
 
+
 class rml_parse(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(rml_parse, self).__init__(cr, uid, name, context=None)
@@ -56,14 +56,12 @@ 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, '...')
 
@@ -150,6 +148,7 @@ class rml_parse(report_sxw.rml_parse):
         except UnicodeDecodeError:
             print "DECODING ERROR"
             return str.encode("ascii")
+
         else:
             print Stringer
             return Stringer
@@ -161,6 +160,3 @@ class rml_parse(report_sxw.rml_parse):
             rml_head =  self.rml_header
         rml_head =  rml_head.replace('<pageGraphics>','''<pageGraphics> <image x="10" y="26cm" height="770.0" width="1120.0" >[[company.logo]] </image> ''')
         return True
-
-
-
diff --git a/addons/hr_payroll/wizard/__init__.py b/addons/hr_payroll/wizard/__init__.py
new file mode 100755
index 00000000000..453998a44ca
--- /dev/null
+++ b/addons/hr_payroll/wizard/__init__.py
@@ -0,0 +1,3 @@
+import wizard_year_salary
+import wizard_employees_detail
+import wizard_create_analytic
diff --git a/addons/hr_payroll/wizard/wizard_create_analytic.py b/addons/hr_payroll/wizard/wizard_create_analytic.py
new file mode 100644
index 00000000000..371b0a2bda4
--- /dev/null
+++ b/addons/hr_payroll/wizard/wizard_create_analytic.py
@@ -0,0 +1,124 @@
+#!/usr/bin/env python
+#-*- 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 wizard
+import pooler
+
+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>'''
+
+    fields = {
+        'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company'},
+        'type': {'string':'Type', 'type':'selection', 'selection':[('bydeg','By Employee Function'), ('byallded','By Allownce / Deduction')]}
+    }
+
+    def _get_defaults(self, cr, user, data, context):
+        #TODO : initlize required data
+        
+        
+        return data['form'] 
+
+    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 = {
+                    'name':function.name,
+                    'company_id':company
+                }
+                fid = account_pool.create(cr, uid, res)
+                res = {
+                    'name':'Basic Salary',
+                    'company_id':company,
+                    'parent_id': fid
+                }
+                account_pool.create(cr, uid, res)
+                for ad in ad_pool.browse(cr, uid, ad_ids):
+                    res = {
+                        'name':ad.name,
+                        'company_id':company,
+                        'parent_id': fid
+                    }
+                    account_pool.create(cr, uid, res)
+                    
+                    
+            
+        elif tpy == 'byallded':
+            res = {
+                'name':'Basic Salary',
+                'company_id':company
+            }
+            adid = account_pool.create(cr, uid, res)
+            for function in func_pool.browse(cr, uid, function_ids):
+                res = {
+                    'name':function.name,
+                    'company_id':company,
+                    'parent_id': adid
+                }
+                account_pool.create(cr, uid, res)
+            
+            for ad in ad_pool.browse(cr, uid, ad_ids):
+                res = {
+                    'name':ad.name,
+                    'company_id':company,
+                }
+                adid = account_pool.create(cr, uid, res)
+                for function in func_pool.browse(cr, uid, function_ids):
+                    res = {
+                        'name':function.name,
+                        'company_id':company,
+                        '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')
diff --git a/addons/hr_payroll/wizard/wizard_employees_detail.py b/addons/hr_payroll/wizard/wizard_employees_detail.py
new file mode 100755
index 00000000000..707a428229e
--- /dev/null
+++ b/addons/hr_payroll/wizard/wizard_employees_detail.py
@@ -0,0 +1,60 @@
+# -*- 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
new file mode 100755
index 00000000000..efab1695ba1
--- /dev/null
+++ b/addons/hr_payroll/wizard/wizard_year_salary.py
@@ -0,0 +1,69 @@
+# -*- 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_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
index fd4920a1199..3eba3bc17de 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@@ -148,6 +148,7 @@
             <field eval="[(6,0,[])]" name="users"/>
             <field name="type" ref="survey.survey_type1"/>
             <field name="responsible_id" ref="base.user_root"/>
+            <field name="response_user">5</field>
         </record>
     </data>
     <data>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ab383748fe0..5183587e992 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -2,6 +2,12 @@
 <openerp>
     <data>
 
+       <menuitem
+        id="menu_hr_config_applicant"
+        name="Applicant"
+        parent="hr.menu_hr_configuration"
+        />
+
     # ------------------------------------------------------
     # Job Categories
     # ------------------------------------------------------
@@ -25,7 +31,8 @@
         <field name="domain">[('object_id.model', '=', 'hr.applicant')]</field>
         <field name="context">{'object_id':'hr.applicant'}</field>
     </record>
-    <menuitem action="hr_job_stage_act" id="menu_hr_job_stage_act" parent="crm.menu_crm_case_stage"/>
+
+    <menuitem action="hr_job_stage_act" id="menu_hr_job_stage_act" name="Stages" parent="menu_hr_config_applicant"/>
 
     # ------------------------------------------------------
     # Jobs
@@ -152,26 +159,33 @@
                            <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>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(crm.action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'hr.applicant'}"
-                                   	icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email_to"/>
-                                   <field name="date"/>
-                               </tree>
-                           </field>
+                           <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': 'hr.applicant'}"
+                                    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': 'hr.applicant'}"
@@ -202,20 +216,20 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
-               <filter icon="gtk-new" string="Current"
+               <filter icon="terp-check" string="Current"
                    domain="[('state','in',('draft','open'))]"
                    help="All new and in progress jobs"
                    default="1"
                />
-               <filter icon="gtk-new" string="New"
+               <filter icon="terp-document-new" string="New"
                    domain="[('state','=','draft')]"
                    help="All Initial Jobs"
                />
-               <filter icon="gtk-yes" string="In Progress"
+               <filter icon="terp-camera_test" string="In Progress"
                    domain="[('state','=','open')]"
                    help="Open Jobs"
                />
-               <filter icon="gtk-media-pause" string="Pending"
+               <filter icon="terp-gtk-media-pause" string="Pending"
                    domain="[('state','=','pending')]"
                    help="Pending Jobs"
                />
@@ -224,27 +238,27 @@
                <field name="email_from"/>
                <field name="job_id" widget="selection"/>
                <field name="user_id" widget="selection">
-                    <filter domain="[('user_id','=',False)]" help="Unassigned Recruitements" icon="gtk-execute" separator="1"/>
+                    <filter domain="[('user_id','=',False)]" help="Unassigned Recruitements" icon="terp-personal-" separator="1"/>
                </field>
                <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
-                   <filter icon="terp-hr" context="{'invisible_department': False}"
+                   <filter icon="terp-personal+" context="{'invisible_department': False}"
                        domain="[('department_id','=',context.get('department_id',False))]"
                        help="My Department"/>
                </field>
                <newline/>
                 <group expand="0" string="Group By..." colspan="11" col="20">
-                    <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="Responsible" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
+                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Job" icon="terp-project" domain="[]" context="{'group_by':'job_id'}"/>
-                    <filter string="Stage" icon="terp-project" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="Degree" icon="terp-project" domain="[]" context="{'group_by':'type_id'}"/>
-                    <filter string="Availability" icon="terp-project" domain="[]" context="{'group_by':'availability'}"/>
-                    <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                    <filter string="Degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
+                    <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'availability'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Appreciation" icon="terp-project" domain="[]" context="{'group_by':'priority'}"/>
+                    <filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Date" icon="terp-project" domain="[]" context="{'group_by':'create_date'}"/>
+                    <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
                 </group>
            </search>
         </field>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 8a9e913a454..4fca4a8b239 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -47,29 +47,29 @@
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
             	<group>
-            	    <filter icon="gtk-media-rewind" string="365 Days"
+            	    <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="Recruitment performed in last 356 days"/>
-	                <filter icon="gtk-media-rewind" string="30 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="Recruitment performed in this month"/>
-		            <filter icon="gtk-media-rewind"
+		            <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="Recruitment during last 7 days"/>
 	                <separator orientation="vertical"/>
 	                <filter string="Draft"
-                    	icon="terp-hr"
+                    	icon="terp-document-new"
                     	domain="[('state','=','draft')]"
                     	help = "Draft recruitment"/>
 	                <filter string="Current"
-	                	icon="terp-hr"
+	                	icon="terp-check"
 	                	domain="[('state', '=' ,'open')]"
 	                	help = "In progress recruitment"/>
                    	<filter string="Pending"
-                   		icon="terp-hr"
+                   		icon="terp-gtk-media-pause"
                    		domain="[('state','=','pending')]"
                    		help = "Pending recruitment"/>
   					<separator orientation="vertical"/>
@@ -83,21 +83,21 @@
                     </field>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By ...">
-                   <filter string="User" name='User' icon="terp-hr" domain="[]" context="{'group_by':'user_id'}"/>
-                   <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                   <filter string="Partner" icon="terp-hr" domain="[]" context="{'group_by':'partner_id'}" />
+                <group expand="0" string="Group By ...">
+                   <filter string="User" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                   <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                   <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
                    <separator orientation="vertical"/>
-                   <filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
-                   <filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
+                   <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                   <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                    <separator orientation="vertical"/>
-                   <filter string="Jobs" name="job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
-                   <filter string="Department" name="department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
-                   <filter string="Degree" name="degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
+                   <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                   <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                   <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
             	   <separator orientation="vertical"/>
-            	   <filter string="Day" name = "day" icon="terp-hr" domain="[]" context="{'group_by':'day'}"/>
-            	   <filter string="Month" icon="terp-hr" domain="[]" context="{'group_by':'month'}"/>
-            	   <filter string="Year" icon="terp-hr" domain="[]" context="{'group_by':'year'}"/>
+            	   <filter string="Day" name = "day" icon="terp-go-month" domain="[]" context="{'group_by':'day'}"/>
+            	   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
+            	   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
                 </group>
 
                 <newline/>
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 733a405acb7..f0340109cc7 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -57,8 +57,7 @@ class hr_analytic_timesheet(osv.osv):
 
     def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, unit, context={}):
         res = {}
-#        if prod_id and unit_amount:
-        if prod_id:
+        if prod_id and unit_amount:
             # find company
             company_id = self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=context)
             res = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, context=context)
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d7c12b14df7..947f0d34c41 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -50,7 +50,7 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group col='8' colspan='4'>
-                        <filter icon="terp-hr" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
+                        <filter icon="terp-go-today" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
                         <separator orientation="vertical"/>
                         <field name="user_id" select="1" widget="selection"/>
                         <field name="account_id" select="1" widget="selection"/>
diff --git a/addons/hr_timesheet/i18n/hr.po b/addons/hr_timesheet/i18n/hr.po
index b86674b1aa8..6e180f8cd55 100644
--- a/addons/hr_timesheet/i18n/hr.po
+++ b/addons/hr_timesheet/i18n/hr.po
@@ -1,382 +1,388 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet
-#
+# * hr_timesheet_sheet
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-06-07 21:18+0000\n"
+"Last-Translator: Drazen Bosak <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-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: hr_timesheet
 #: wizard_view:hr.analytical.timesheet,init:0
 #: wizard_view:hr.analytical.timesheet.my,init:0
 msgid "Choose your month"
-msgstr ""
+msgstr "Izaberite svoj mjesec"
 
 #. module: hr_timesheet
 #: constraint:ir.model:0
 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
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
 msgid "Employee timesheet"
-msgstr ""
+msgstr "Kontrolna kartica Djelatnika"
 
 #. module: hr_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.si_so
 #: model:ir.ui.menu,name:hr_timesheet.menu_si_so
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "Prijava / Odjava po Projektu"
 
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_in,so_result_end:0
 msgid "Stop Working"
-msgstr ""
+msgstr "Prestanite s radom"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "(Keep empty for current_time)"
-msgstr ""
+msgstr "(Treba ostati prazno za current_time)"
 
 #. module: hr_timesheet
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Greška: Zadana Jedinica Mjere (JM) i kupovna Jedinica Mjere (JM) moraju biti "
+"u istoj kategoriji."
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "Sign in status"
-msgstr ""
+msgstr "Status Prijave"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
 msgid "(Keep empty for current time)"
-msgstr ""
+msgstr "(Treba ostati prazno za tekuće vijeme)"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_out,server_date:0
 msgid "Current Date"
-msgstr ""
+msgstr "Tekući Datumž"
 
 #. module: hr_timesheet
 #: 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
 #: wizard_button:hr.analytical.timesheet,init,report:0
 #: wizard_button:hr.analytical.timesheet.my,init,report:0
 #: wizard_button:hr.analytical.timesheet_users,init,report:0
 msgid "Print"
-msgstr ""
+msgstr "Tiskaj"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr ""
+msgstr "Minimalni Analitički Konto"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,server_date:0
 msgid "Current Server Date"
-msgstr ""
+msgstr "Tekući datum Servera"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,date_start:0
 #: wizard_field:hr_timesheet.si_so,sign_out,date:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Početni Datum"
 
 #. module: hr_timesheet
 #: field:hr.employee,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "août"
-msgstr ""
+msgstr "\"août\""
 
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Analitički Dnevnik"
 
 #. module: hr_timesheet
 #: model:product.uom,name:hr_timesheet.uom_hour
 msgid "Hour"
-msgstr ""
+msgstr "Sat"
 
 #. module: hr_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet
 #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet
 msgid "Employee Timesheet"
-msgstr ""
+msgstr "Kontrolna kartica Djelatnika"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Work done stats"
-msgstr ""
+msgstr "Statistika obavljenog Posla"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_today_form
 msgid "Working Hours"
-msgstr ""
+msgstr "Radno vrijeme"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Linije Kontrolne kartice"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total time"
-msgstr ""
+msgstr "Ukupna cijena"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "juillet"
-msgstr ""
+msgstr "\"juillet\""
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
 #: xsl:hr.analytical.timesheet_users:0
 #: model:ir.ui.menu,name:hr_timesheet.next_id_48
 msgid "Timesheet"
-msgstr ""
+msgstr "Kontrolna Kartica"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "janvier"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "juin"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: hr_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_my
 #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet_my
 msgid "Print My Timesheet"
-msgstr ""
+msgstr "Tiskaj moju Kontrolnu Karticu"
 
 #. module: hr_timesheet
 #: wizard_field:hr.analytical.timesheet,init,user_id:0
 #: wizard_field:hr.analytical.timesheet.my,init,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
 msgid "Sign in"
-msgstr ""
+msgstr "Prijava"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form
 msgid "Working Hours of The Day"
-msgstr ""
+msgstr "Radni sati u danu"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
 msgid "(local time on the server side)"
-msgstr ""
+msgstr "(Lokalno vrijeme na serveru)"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total cost"
-msgstr ""
+msgstr "Ukupni trošak"
 
 #. module: hr_timesheet
 #: model:product.uom,name:hr_timesheet.uom_day
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,date:0
 msgid "Closing Date"
-msgstr ""
+msgstr "Datum zaključenja"
 
 #. module: hr_timesheet
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "avril"
-msgstr ""
+msgstr "Travanj"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
 msgid "Analytic line"
-msgstr ""
+msgstr "Analitička linija"
 
 #. module: hr_timesheet
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
 msgstr ""
+"Greška: Jedinica skladištenja  (JS) mora biti u različitoj kategoriji od "
+"Jedinice Mjere (JM)"
 
 #. module: hr_timesheet
 #: wizard_view:hr.analytical.timesheet_users,init:0
 msgid "Choose Users"
-msgstr ""
+msgstr "Odaberite Korisnike"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "novembre"
-msgstr ""
+msgstr "Studeni"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
 msgid "Sign in / Sign out"
-msgstr ""
+msgstr "Prijava / Odjava"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "Work done in the last period"
-msgstr ""
+msgstr "Posao obavljen u zadnjem razdoblju"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Key dates"
-msgstr ""
+msgstr "Ključni datumi"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,state:0
 #: wizard_field:hr_timesheet.si_so,sign_out,state:0
 msgid "Current state"
-msgstr ""
+msgstr "Tekuće stanje"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "octobre"
-msgstr ""
+msgstr "Listopad"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis stats"
-msgstr ""
+msgstr "Analitičke statistike"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "décembre"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,info:0
 msgid "Work Description"
-msgstr ""
+msgstr "Opis Posla"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,name:0
 #: wizard_field:hr_timesheet.si_so,sign_out,name:0
 msgid "Employee's name"
-msgstr ""
+msgstr "Ime Djelatnika"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
 msgid "Consultancy - Senior Developer"
-msgstr ""
+msgstr "Savjetovanje - Stariji Programer"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_me_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_me_all_form
 msgid "My Working Hours"
-msgstr ""
+msgstr "Moji radni sati"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
 msgid "Timesheet line"
-msgstr ""
+msgstr "Niz Kontrolne kartice"
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
 msgid "Sum"
-msgstr ""
+msgstr "Zbroj"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form_my
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form_my
 msgid "My Working Hours of The Day"
-msgstr ""
+msgstr "Moji radni sati u danu"
 
 #. module: hr_timesheet
 #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
 msgid "Human Resources (Timesheet encoding)"
-msgstr ""
+msgstr "Ljudski Resursi (Kodiranje Kontrolna Kartica)"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "mars"
-msgstr ""
+msgstr "Travanj"
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
 #: xsl:hr.analytical.timesheet_users:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "mai"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_out,si_result:0
 msgid "Start Working"
-msgstr ""
+msgstr "Započnite s radom"
 
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_in,so_result:0
 msgid "Change Work"
-msgstr ""
+msgstr "Promijenite posao"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "février"
-msgstr ""
+msgstr "Veljača"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by month"
-msgstr ""
+msgstr "Satistike po mjesecu"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -384,49 +390,49 @@ msgstr ""
 #: wizard_field:hr.analytical.timesheet.my,init,month:0
 #: wizard_field:hr.analytical.timesheet_users,init,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitički Konto"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "General Information"
-msgstr ""
+msgstr "Opći Podaci"
 
 #. module: hr_timesheet
 #: model:process.process,name:hr_timesheet.process_process_timesheetprocess0
 msgid "Timesheet Process"
-msgstr ""
+msgstr "Proces Kontrolne kartice"
 
 #. module: hr_timesheet
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: Nepravila EAN kod"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by user"
-msgstr ""
+msgstr "Statistike po Korisniku"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Niz Kontrolne kartice"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis summary"
-msgstr ""
+msgstr "Zbirna Analiza"
 
 #. module: hr_timesheet
 #: wizard_field:hr.analytical.timesheet,init,year:0
 #: wizard_field:hr.analytical.timesheet.my,init,year:0
 #: wizard_field:hr.analytical.timesheet_users,init,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: hr_timesheet
 #: wizard_button:hr.analytical.timesheet,init,end:0
@@ -435,39 +441,39 @@ msgstr ""
 #: wizard_button:hr_timesheet.si_so,sign_in,end:0
 #: wizard_button:hr_timesheet.si_so,sign_out,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 #: wizard_field:hr.analytical.timesheet_users,init,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Korisnici"
 
 #. module: hr_timesheet
 #: model:product.uom.categ,name:hr_timesheet.uom_categ_wtime
 msgid "Working Time"
-msgstr ""
+msgstr "Radno vrijeme"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "To be invoiced"
-msgstr ""
+msgstr "Treba izdati račun"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
 #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet_users
 msgid "Employees Timesheet"
-msgstr ""
+msgstr "Kontrolna kartica Djelatnika"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "septembre"
-msgstr ""
+msgstr "Rujan"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Kontrolne Kartice"
diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml
index 6bae0704e8a..69079149f03 100644
--- a/addons/hr_timesheet/test/test_hr_timesheet.yml
+++ b/addons/hr_timesheet/test/test_hr_timesheet.yml
@@ -61,7 +61,6 @@
     uom_id: product.uom_hour
     uom_po_id: product.uom_hour
 
-
 - |
   I assing product and journal to  "Mark Johnson" 
 - 
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 d6c7398864a..9b37db8b0c6 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -57,7 +57,7 @@
         </record>
 
 		<record id="action_hr_timesheet_my" model="ir.actions.act_window">
-            <field name="name">Print My Timesheet</field>
+            <field name="name">My Timesheet</field>
             <field name="res_model">hr.analytical.timesheet.employee</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index fa57cfdd1a5..dc1a6723786 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -115,31 +115,19 @@ class hr_si_project(osv.osv_memory):
         # get the latest action (sign_in or out) for this employee
         cr.execute('select action from hr_attendance where employee_id=%s and action in (\'sign_in\',\'sign_out\') order by name desc limit 1', (emp_id,))
         res = (cr.fetchone() or ('sign_out',))[0]
+        in_out = res == 'sign_out' and 'out' or 'in'
         #TODO: invert sign_in et sign_out
-        if res == 'sign_out':
-            model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_in')])
-            resource_id = obj_model.read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
-            return {
-                'name': 'Sign in / Sign out',
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'hr.sign.in.project',
-                'views': [(False,'tree'), (resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new'
-                    }
-        else:
-            model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_out')])
-            resource_id = obj_model.read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
-            return {
-                'name': 'Sign in / Sign out',
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'hr.sign.out.project',
-                'views': [(False,'tree'), (resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new'
-                    }
+        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_%s' % in_out)])
+        resource_id = obj_model.read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+        return {
+            'name': 'Sign in / Sign out',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'hr.sign.%s.project' % in_out,
+            'views': [(False,'tree'), (resource_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new'
+        }
 
     def _get_empid(self, cr, uid, context=None):
         emp_obj = self.pool.get('hr.employee')
@@ -153,10 +141,7 @@ class hr_si_project(osv.osv_memory):
         emp_obj = self.pool.get('hr.employee')
         data = self.read(cr, uid, ids, [], context)[0]
         emp_id = data['emp_id']
-        try:
-            success = emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data['date'] or False)
-        except except_osv, e:
-            raise osv.except_osv(e.name, e.value)
+        success = emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data['date'] or False)
         return {}
 
     def default_get(self, cr, uid, fields_list, context=None):
@@ -166,4 +151,4 @@ class hr_si_project(osv.osv_memory):
 
 hr_si_project()
 
-# 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_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index 8f95108f331..2309fa6b3d2 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/i18n/pl.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-05-24 15:59+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-06-04 21:45+0000\n"
+"Last-Translator: ErnestŻyciński <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-05-25 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
@@ -327,7 +327,7 @@ msgstr "Upust (%)"
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Eff."
-msgstr ""
+msgstr "Eff."
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.create,init,accounts:0
@@ -433,7 +433,7 @@ msgstr "Produkt"
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,name:0
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 eccdb721de0..b3f81e5fbb1 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
@@ -47,21 +47,21 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group col="10" colspan="4">
-                    	<filter icon="terp-hr" string="This Year"
+                    	<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="Timesheet lines in this year"/>
-	                    <filter icon="terp-hr" string="This Month"
+	                    <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="Timesheet lines in this month"/>
-		                <filter icon="gtk-media-rewind"
+		                <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="Timesheet lines during last 7 days"/>
 	                    <separator orientation="vertical"/>
 	  					<field name="user_id" widget="selection">
-	                        <filter icon="terp-hr"
+	                        <filter icon="terp-personal"
 	                        		string="Non Assigned timesheets to users"
 	                        		help="Non Assigned timesheets to users"
 	                        		domain="[('user_id','=',False)]"/>
@@ -69,28 +69,16 @@
 	                    <field name="account_id"/>
                         <field name="product_id"/>
                     </group>
-                    <group expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
-                        <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
-                        <filter string="Invoice" icon="terp-hr" context="{'group_by':'invoice_id'}"/>
+                        <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                        <filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-hr" context="{'group_by':'name'}"/>
-                    </group>
-                    <newline/>
-                    <group expand="1" string="Group By..." colspan="10" col="12">
-                        <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
-                        <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
-                        <filter string="Invoice" icon="terp-hr" context="{'group_by':'invoice_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-hr" context="{'group_by':'name'}"/>
+                        <filter string="Day" icon="terp-go-month" 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':'name'}"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended options..." colspan="10" col="12">
@@ -177,8 +165,8 @@
                 <search string="Timesheet by user">
                     <group col="10" colspan="4">
                         <separator orientation="vertical"/>
-                        <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
-                        <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
+                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
+                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="month" select="1"/>
@@ -316,8 +304,8 @@
                 <search string="Daily timesheet by account">
                     <group col="10" colspan="4">
                         <separator orientation="vertical"/>
-                        <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
-                        <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
+                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
+                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="month" select="1"/>
@@ -390,8 +378,8 @@
                 <form string="Timesheet by account">
                     <group col="10" colspan="4">
                         <separator orientation="vertical"/>
-                        <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
-                        <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
+                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
+                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="month" select="1"/>
@@ -454,17 +442,18 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet Lines">
                    <group col='15' colspan='4'>
-                        <filter icon="terp-project" string="Current" default="1" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
+                        <filter icon="terp-check" string="Current" default="1" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
                     	<field name="user_id" widget="selection"/>
                     	<field name="product_id" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By...">
-                        <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Product" icon="terp-project" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Analytic Account" icon="terp-project" domain="[]" context="{'group_by':'analytic_account_id'}"/>
-                   		<filter string="General Account" icon="terp-project" domain="[]" context="{'group_by':'general_account_id'}"/>
+                   <group expand="0" string="Group By...">
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Analytic Account" icon="terp-folder-green" domain="[]" context="{'group_by':'analytic_account_id'}"/>
+                   		<filter string="General Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'general_account_id'}"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index da501ad5ab4..7d24e8c26ec 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -18,8 +18,8 @@
                 </form>
             </field>
         </record>
-        
-        
+
+
         <record id="view_analytic_account_close_tree" model="ir.ui.view">
             <field name="name">report.analytic.account.close.tree</field>
             <field name="model">report.analytic.account.close</field>
@@ -36,7 +36,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_analytic_account_graph" model="ir.ui.view">
             <field name="name">report.analytic.account.close.graph</field>
             <field name="model">report.analytic.account.close</field>
@@ -45,11 +45,11 @@
                 <graph string="Expired analytic accounts" type="bar">
                     <field name="partner_id"/>
                     <field name="quantity" operator="+"/>
-                    <field name="quantity_max" operator="+"/> 
+                    <field name="quantity_max" operator="+"/>
                 </graph>
             </field>
         </record>
-        
+
         <record id="action_analytic_account_tree" model="ir.actions.act_window">
             <field name="name">Expired analytic accounts</field>
             <field name="res_model">report.analytic.account.close</field>
@@ -116,8 +116,8 @@
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
                    <group col="12" colspan="4">
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
+                   		<filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
+						<filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
 						<separator orientation="vertical"/>
 						<field name="name" select="1"/>
 						<field name="month" select="1"/>
@@ -138,6 +138,6 @@
         <menuitem action="action_account_analytic_line_to_invoice" id="account_analytic_lines_to_invoice_report" parent="account.next_id_40"/>
 
         <act_window domain="[('account_id', '=', active_id),('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" name="Lines to Invoice" res_model="account.analytic.line" src_model="account.analytic.account"/>
-        
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 35c20fdce08..f686daf575e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -192,21 +192,21 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <group col="10" colspan="4">
-                        <filter icon="terp-crm" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
-                        <filter icon="terp-crm" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
+                        <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
+                        <filter icon="terp-gtk-go-back-rtl" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                         <separator orientation="vertical"/>
                         <field name="user_id" select="1" widget="selection"/>
                         <field name="date_from"/>
                         <field name="department_id" widget="selection">
-                            <filter icon="terp-crm"
+                            <filter icon="terp-personal+"
                                 domain="[('department_id','=',context.get('department_id',False))]"
                                 help="My Departments Timesheet"/>
                         </field>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By...">
-                        <filter string="Users" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Users" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
index 3dd8d161c5f..a8c0440a053 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -39,6 +39,9 @@ class timesheet_report(osv.osv):
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
         'nbr': fields.integer('#Nbr',readonly=True),
+        'total_diff': fields.float('#Total Diff',readonly=True),
+        'total_timesheet': fields.float('#Total Timesheet',readonly=True),
+        'total_attendance': fields.float('#Total Attendance',readonly=True),
         'company_id': fields.many2one('res.company', 'Company',readonly=True),
         'department_id':fields.many2one('hr.department','Department',readonly=True),
         'date_from': fields.date('Date from',readonly=True,),
@@ -67,10 +70,25 @@ class timesheet_report(osv.osv):
                         to_char(htss.date_current,'MM') as month,
                         to_char(htss.date_current, 'YYYY-MM-DD') as day,
                         count(*) as nbr,
-                        sum(aal.unit_amount) as quantity,
-                        sum(aal.amount) as cost,
+                        aal.unit_amount as quantity,
+                        aal.amount as cost,
                         aal.account_id,
                         aal.product_id,
+                        (SELECT   sum(day.total_difference)
+                            FROM hr_timesheet_sheet_sheet AS sheet 
+                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
+                            ON (sheet.id = day.sheet_id 
+                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_diff,
+                        (SELECT sum(day.total_timesheet)
+                            FROM hr_timesheet_sheet_sheet AS sheet 
+                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
+                            ON (sheet.id = day.sheet_id 
+                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_timesheet,
+                        (SELECT sum(day.total_attendance)
+                            FROM hr_timesheet_sheet_sheet AS sheet 
+                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
+                            ON (sheet.id = day.sheet_id 
+                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_attendance,
                         aal.to_invoice,
                         aal.general_account_id,
                         htss.user_id,
@@ -87,6 +105,8 @@ class timesheet_report(osv.osv):
                         aal.account_id,
                         htss.date_from,
                         htss.date_to,
+                        aal.unit_amount,
+                        aal.amount,
                         htss.date_current,
                         aal.to_invoice,
                         aal.product_id,
@@ -94,8 +114,9 @@ class timesheet_report(osv.osv):
                         htss.name,
                         htss.company_id,
                         htss.state,
+                        htss.id,
                         htss.department_id,
                         htss.user_id
             )
         """)
-timesheet_report()
\ No newline at end of file
+timesheet_report()
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index c7cf7b0495e..51e6b5d295c 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -24,8 +24,6 @@
                     <field name="user_id" invisible="1"/>
                     <field name="date_from" invisible="1"/>
                     <field name="date_to" invisible="1"/>
-					<field name="quantity" sum="#Quantity"/>
-					<field name="cost" sum="#Cost"/>
                     <field name="state" invisible="1"/>
                     <field name="department_id" invisible="1"/>
                     <field name="company_id" invisible="1"/>
@@ -36,6 +34,11 @@
                     <field name="year" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="month" invisible="1"/>
+                    <field name="quantity" sum="#Quantity"/>
+                    <field name="cost" sum="#Cost"/>
+                    <field name="total_diff" sum="#Total Diff"/>
+                    <field name="total_timesheet" sum="#Total Timesheet"/>
+                    <field name="total_attendance" sum="#Total Attendance"/>
                 </tree>
             </field>
         </record>
@@ -46,72 +49,66 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group col="10" colspan="12">
-                        <filter icon="terp-hr" string="This Year"
+                        <filter icon="terp-go-year" string="This Year"
 	                    	    domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Timesheet in this year"/>
-	                    <filter icon="terp-hr" string="This Month"
+	                    <filter icon="terp-go-month" string="This Month"
 	                    		name="month"
 	                    		domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                    		help="Timesheet in this month"/>
-		                <filter icon="gtk-media-rewind"
+		                <filter icon="terp-go-week"
 	                            string="    7 Days    "
 	                            separator="1"
 	                            domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                            help="Timesheet during last 7 days"/>
 	                    <separator orientation="vertical"/>
-	                    <filter icon="terp-hr"
+	                    <filter icon="terp-document-new"
                     			string="Draft"
                     			domain="[('state','=','draft')]"/>
-	                    <filter icon="terp-hr"
+	                    <filter icon="terp-camera_test"
 	                    		string="Confirmed"
 	                    		domain="[('state','=','confirm')]"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="product_id"/>
-	  					<field name="user_id" widget="selection">
-	                        <filter icon="terp-hr"
-	                        		string="Non Assigned timesheets to users"
-	                        		help="Non Assigned timesheets to users"
-	                        		domain="[('user_id','=',False)]"/>
-	                    </field>
-	                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>      
-                    <newline/>                        
-                    <group expand="1" string="Group By...">
-	                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
-	                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Type of Invoicing" icon="terp-hr" context="{'group_by':'to_invoice'}"/>
-	                    <filter string="Analytic Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
-	                    <filter string="General Account" icon="terp-hr" context="{'group_by':'general_account_id'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-	                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
-	                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-	                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
-	                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Extended options..." groups="base.group_extended">
-	                	<filter icon="terp-hr"
-	                    		string="New"
-	                    		domain="[('state','=','new')]"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="date_from"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="account_id"/>
-	                    <field name="department_id" widget="selection"/>
-	                    <newline/>
-	                    <filter icon="terp-hr"
+	                    <filter icon="terp-dialog-close"
 		                    		string="Done"
 		                    		domain="[('state','=','done')]"/>
 	                    <separator orientation="vertical"/>
-	                    <field name="date_to"/>
+	                    <field name="account_id"/>
+                      <field name="user_id" />
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+	                    <filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
+	                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
 	                    <separator orientation="vertical"/>
+	                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
+	                    <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="Day" icon="terp-go-month" 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>
+                    <newline/>
+                    <group expand="0" string="Extended options..." groups="base.group_extended">
 	                    <field name="general_account_id"/>
 	                    <field name="to_invoice" widget="selection"/>
-	                </group>                    
+	                    <separator orientation="vertical"/>
+	                    <field name="product_id"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="department_id" widget="selection"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+	                    <newline/>
+	                    <field name="date_to"/>
+	                    <field name="date_from"/>
+	                </group>
                 </search>
             </field>
         </record>
@@ -121,7 +118,7 @@
             <field name="res_model">timesheet.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="search_view_id" ref="view_timesheet_report_search"/>
         </record>
         <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all" parent="hr.menu_hr_reporting"/>
diff --git a/addons/idea/i18n/hr.po b/addons/idea/i18n/hr.po
index 97112788aea..34c35557cc1 100644
--- a/addons/idea/i18n/hr.po
+++ b/addons/idea/i18n/hr.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# * idea
+# * hr_attendance
 # Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"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-05-10 06:56+0000\n"
-"Last-Translator: nafterburner <nafterburner@gmail.com>\n"
-"Language-Team: Vinteh\n"
+"PO-Revision-Date: 2010-06-07 19:29+0000\n"
+"Last-Translator: Drazen Bosak <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-05-11 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -174,7 +174,7 @@ msgstr "idea.vote"
 #: field:idea.comment,user_id:0
 #: field:idea.vote,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: idea
 #: view:idea.idea:0
diff --git a/addons/idea/i18n/id.po b/addons/idea/i18n/id.po
index 190156f359b..1ecdb11dd08 100644
--- a/addons/idea/i18n/id.po
+++ b/addons/idea/i18n/id.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-09 17:47+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-01 01:00+0000\n"
+"Last-Translator: Pandu Pradana <p4ndupr4d4n4@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
@@ -27,7 +27,7 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Good"
-msgstr ""
+msgstr "Sangat Baik"
 
 #. module: idea
 #: view:idea.idea:0
@@ -39,7 +39,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:idea.action_idea_idea_my_idea
 #: model:ir.ui.menu,name:idea.menu_idea_idea_my_idea
 msgid "My Ideas"
-msgstr ""
+msgstr "Ide Saya"
 
 #. module: idea
 #: constraint:ir.actions.act_window:0
@@ -51,13 +51,13 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Not Voted"
-msgstr ""
+msgstr "Tidak Memberikan Suara"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open_my
 #: model:ir.ui.menu,name:idea.menu_idea_idea_open_my
 msgid "My Open Ideas"
-msgstr ""
+msgstr "Ide Terbuka Saya"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea
@@ -69,18 +69,18 @@ msgstr ""
 #. module: idea
 #: field:idea.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Kategori Anak"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "New Idea"
-msgstr ""
+msgstr "Ide Baru"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category_tree
 #: model:ir.ui.menu,name:idea.menu_idea_category_tree
 msgid "Ideas by Categories"
-msgstr ""
+msgstr "Ide berdasar Kategori"
 
 #. module: idea
 #: field:idea.vote,score:0
@@ -101,7 +101,7 @@ msgstr ""
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote_stat
 msgid "Statistics on Votes"
-msgstr ""
+msgstr "Statistik pada Voting"
 
 #. module: idea
 #: constraint:ir.model:0
@@ -112,17 +112,17 @@ msgstr ""
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Category for an idea"
-msgstr ""
+msgstr "Kategori untuk sebuah ide"
 
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
-msgstr ""
+msgstr "Manager Ide"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote_stat
 msgid "Vote Statistics"
-msgstr ""
+msgstr "Statistik Voting"
 
 #. module: idea
 #: selection:idea.idea,state:0
@@ -161,12 +161,12 @@ msgstr "Pelaporan"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
 msgid "Idea Votes Statistics"
-msgstr ""
+msgstr "Statistik Voting Ide"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
 msgid "idea.vote"
-msgstr ""
+msgstr "ide.voting"
 
 #. module: idea
 #: field:idea.comment,user_id:0
@@ -177,7 +177,7 @@ msgstr ""
 #. module: idea
 #: view:idea.idea:0
 msgid "Your comment"
-msgstr ""
+msgstr "Komentar anda"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_config
@@ -193,12 +193,12 @@ msgstr ""
 #. module: idea
 #: view:idea.stat:0
 msgid "stat"
-msgstr ""
+msgstr "stat"
 
 #. module: idea
 #: field:idea.idea,my_vote:0
 msgid "My Vote"
-msgstr ""
+msgstr "Voting Saya"
 
 #. module: idea
 #: constraint:ir.ui.view:0
@@ -208,7 +208,7 @@ msgstr ""
 #. module: idea
 #: view:idea.vote:0
 msgid "Votes"
-msgstr ""
+msgstr "Memilih"
 
 #. module: idea
 #: model:ir.module.module,description:idea.module_meta_information
@@ -230,28 +230,28 @@ msgstr ""
 #. module: idea
 #: field:idea.idea,count_votes:0
 msgid "Count of votes"
-msgstr ""
+msgstr "Jumlah voting"
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
 msgid "Number of Votes"
-msgstr ""
+msgstr "Nomer Voting"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
 msgid "idea.idea"
-msgstr ""
+msgstr "ide.ide"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_draft_my
 #: model:ir.ui.menu,name:idea.menu_idea_idea_draft_my
 msgid "My Draft Ideas"
-msgstr ""
+msgstr "Draf ide saya"
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
 msgid "Vote"
-msgstr ""
+msgstr "Pemilihan"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -264,7 +264,7 @@ msgstr ""
 #: view:idea.idea:0
 #: model:ir.ui.menu,name:idea.menu_idea_idea
 msgid "All Ideas"
-msgstr ""
+msgstr "Semua Ide"
 
 #. module: idea
 #: view:idea.comment:0
@@ -277,17 +277,17 @@ msgstr ""
 #. module: idea
 #: field:idea.idea,count_comments:0
 msgid "Count of comments"
-msgstr ""
+msgstr "Jumlah komentar"
 
 #. module: idea
 #: field:idea.idea,title:0
 msgid "Idea Summary"
-msgstr ""
+msgstr "Ringkasan Ide"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Category of ideas"
-msgstr ""
+msgstr "Kategori berdasarkan ide"
 
 #. module: idea
 #: field:idea.category,summary:0
@@ -299,7 +299,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open
 #: model:ir.ui.menu,name:idea.menu_idea_idea_open
 msgid "Open Ideas"
-msgstr ""
+msgstr "Ide Terbuka"
 
 #. module: idea
 #: view:idea.idea:0
@@ -317,7 +317,7 @@ msgstr ""
 #. module: idea
 #: field:idea.category,parent_id:0
 msgid "Parent Categories"
-msgstr ""
+msgstr "Kategori Induk"
 
 #. module: idea
 #: field:idea.idea,user_id:0
@@ -335,14 +335,14 @@ msgstr ""
 #: field:idea.vote,idea_id:0
 #: field:idea.vote.stat,idea_id:0
 msgid "Idea"
-msgstr ""
+msgstr "Ide"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Bad"
-msgstr ""
+msgstr "Sangat Buruk"
 
 #. module: idea
 #: selection:idea.idea,state:0
@@ -352,7 +352,7 @@ msgstr ""
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote
 msgid "All Votes"
-msgstr ""
+msgstr "Semua Pemilihan"
 
 #. module: idea
 #: view:idea.idea:0
@@ -367,7 +367,7 @@ msgstr ""
 #. module: idea
 #: field:idea.idea,vote_avg:0
 msgid "Average Score"
-msgstr ""
+msgstr "Skor Rata-rata"
 
 #. module: idea
 #: view:idea.idea:0
@@ -377,4 +377,4 @@ msgstr ""
 #. module: idea
 #: help:idea.idea,description:0
 msgid "Content of the idea"
-msgstr ""
+msgstr "Isi ide"
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 12564de8540..14fb24ee607 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -22,6 +22,7 @@
 from osv import osv
 from osv import fields
 from tools.translate import _
+import time
 
 VoteValues = [('-1', 'Not Voted'), ('0', 'Very Bad'), ('25', 'Bad'), \
               ('50', 'Normal'), ('75', 'Good'), ('100', 'Very Good') ]
@@ -29,7 +30,7 @@ DefaultVoteValue = '50'
 
 class idea_category(osv.osv):
     """ Category of Idea """
-    
+
     _name = "idea.category"
     _description = "Idea Category"
 
@@ -155,16 +156,16 @@ class idea_idea(osv.osv):
         'title': fields.char('Idea Summary', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}),
         'comment_ids': fields.one2many('idea.comment', 'idea_id', 'Comments'),
-        'create_date': fields.datetime('Creation date', readonly=True),
+        'created_date': fields.datetime('Creation date', readonly=True),
         'vote_ids': fields.one2many('idea.vote', 'idea_id', 'Vote'),
         'my_vote': fields.function(_vote_read, fnct_inv = _vote_save, string="My Vote", method=True, type="selection", selection=VoteValues),
         'vote_avg': fields.function(_vote_avg_compute, method=True, string="Average Score", type="float"),
         'count_votes': fields.function(_vote_count, method=True, string="Count of votes", type="integer"),
         'count_comments': fields.function(_comment_count, method=True, string="Count of comments", type="integer"),
         'category_id': fields.many2one('idea.category', 'Category', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('draft', 'Draft'), 
+        'state': fields.selection([('draft', 'Draft'),
             ('open', 'Opened'),
-            ('close', 'Accepted'), 
+            ('close', 'Accepted'),
             ('cancel', 'Cancelled')],
             'State', readonly=True,
             help='When the Idea is created the state is \'Draft\'.\n It is \
@@ -173,12 +174,16 @@ class idea_idea(osv.osv):
         ),
         'visibility':fields.boolean('Open Idea?', required=False),
         'stat_vote_ids': fields.one2many('idea.vote.stat', 'idea_id', 'Statistics', readonly=True),
+        'vote_limit': fields.integer('Maximum Vote per User',
+                     help="Set to one if  you require only one Vote per user"),
     }
 
     _defaults = {
         'user_id': lambda self,cr,uid,context: uid,
         'my_vote': lambda *a: '-1',
         'state': lambda *a: 'draft',
+        'vote_limit': lambda * a: 1,
+        'created_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'visibility': lambda *a: True,
     }
     _order = 'id desc'
@@ -190,11 +195,11 @@ class idea_idea(osv.osv):
         @param user: ID of the user currently logged in
         @param vals: provides data for new record
         @param context: context arguments, like lang, time zone
-        
+
         @return: Returns an id of the new record
         """
         visibility = False
-        
+
         if vals.get('category_id', False):
             category_pool = self.pool.get('idea.category')
             category = category_pool.browse(cr, user, vals.get('category_id'), context)
@@ -215,41 +220,41 @@ class idea_idea(osv.osv):
         @param id: list of record ids on which copy method executes
         @param default: dict type contains the values to be overridden during copy of object
         @param context: context arguments, like lang, time zone
-        
+
         @return: Returns the id of the new record
         """
-        
+
         default.update({
             'comment_ids':False,
             'vote_ids':False,
             'stat_vote_ids':False
-            
+
         })
         res_id = super(idea_idea, self).copy(cr, uid, id, default, context)
         return res_id
-    
+
     def write(self, cr, user, ids, vals, context=None):
         """
         Update redord(s) exist in {ids}, with new value provided in {vals}
-    
+
         @param cr: A database cursor
         @param user: ID of the user currently logged in
         @param ids: list of record ids to update
         @param vals: dict of new values to be set
         @param context: context arguments, like lang, time zone
-        
+
         @return: Returns True on success, False otherwise
         """
-        
+
         state = self.browse(cr, user, ids[0]).state
-        
+
         if vals.get('my_vote', False):
             if vals.get('state', state) != 'open':
                 raise osv.except_osv(_("Warning !"), _("Draft/Accepted/Cancelled ideas Could not be voted"))
-        
+
         res = super(idea_idea, self).write(cr, user, ids, vals, context)
         return res
-        
+
     def idea_cancel(self, cr, uid, ids):
         self.write(cr, uid, ids, { 'state': 'cancel' })
         return True
@@ -261,7 +266,7 @@ class idea_idea(osv.osv):
     def idea_close(self, cr, uid, ids):
         self.write(cr, uid, ids, { 'state': 'close' })
         return True
-    
+
     def idea_draft(self, cr, uid, ids):
         self.write(cr, uid, ids, { 'state': 'draft' })
         return True
@@ -299,12 +304,15 @@ class idea_vote(osv.osv):
     _rec_name = 'score'
 
     _columns = {
-        'user_id': fields.many2one('res.users', 'User'),
-        'idea_id': fields.many2one('idea.idea', 'Idea', required=True, ondelete='cascade'),
-        'score': fields.selection(VoteValues, 'Score', required=True)
+        'user_id': fields.many2one('res.users', 'By user', readonly="True"),
+        'idea_id': fields.many2one('idea.idea', 'Idea', readonly="True", ondelete='cascade'),
+        'score': fields.selection(VoteValues, 'Vote Status', readonly="True"),
+        'date': fields.datetime('Date', readonly="True"),
+        'comment': fields.text('Comment', readonly="True"),
     }
     _defaults = {
         'score': lambda *a: DefaultVoteValue,
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
 
 idea_vote()
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 88c48656b5e..90ee35d21e2 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -50,6 +50,7 @@
 
     <menuitem name="Categories" parent="menu_ideas" id="menu_idea_category" action="action_idea_category" />
 
+
 <!-- Idea Category Action -->
 
     <record model="ir.actions.act_window" id="action_idea_category_tree">
@@ -61,7 +62,17 @@
 
     <menuitem name="Ideas" parent="base.menu_tools" id="menu_ideas1" sequence="4"/>
 
-<!-- Oepn Ideas Action  -->
+    <menuitem
+        name="Ideas by Categories" parent="menu_ideas1"
+        id="menu_idea_category_tree"
+        action="action_idea_category_tree"/>
+
+    <menuitem name="Give Vote" parent="menu_ideas1"
+    	id="menu_give_vote"
+    	action="action_idea_select"/>
+
+
+    <!-- Open Ideas Action  -->
 
     <record model="ir.actions.act_window" id="action_idea_idea_categ_open">
         <field name="name">Open Ideas</field>
@@ -102,9 +113,9 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
         <tree string="Votes">
-            <field name="idea_id"/>
-            <field name="user_id"/>
-            <field name="score" />
+            <field name="user_id" />
+            <field name="score"/>
+            <field name="date"/>
         </tree>
         </field>
     </record>
@@ -117,13 +128,40 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
         <form string="Votes">
-            <field name="idea_id" select="1" />
-            <field name="user_id" select="1" />
-            <field name="score"/>
+        	<group colspan="4">
+	            <field name="user_id" select="1" />
+	            <field name="date"/>
+	            <newline/>
+	            <field name="score"/>
+            </group>
+            <separator string="Comments:" colspan="4"/>
+            <field name="comment" colspan="4" nolabel="1"/>
         </form>
         </field>
     </record>
 
+<!-- Search view for Idea vote -->
+
+    <record model="ir.ui.view" id="view_idea_vote_search">
+        <field name="name">idea.vote.search</field>
+        <field name="model">idea.vote</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+	        <search string="Ideas vote">
+	        	<group col="10" colspan="4">
+		            <field name="idea_id" widget="selection"/>
+		            <field name="user_id" widget="selection"/>
+				</group>
+				<newline/>
+	            <group expand="0" string="Group By..." colspan="14">
+	            	<filter string="Vote date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+	                <filter string="Idea" icon="terp-idea" domain="[]" context="{'group_by':'idea_id'}"/>
+	                <filter string="User" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+	            </group>
+	        </search>
+        </field>
+    </record>
+
 <!-- New Idea Form View -->
 
     <record model="ir.ui.view" id="view_idea_idea_form">
@@ -181,19 +219,19 @@
                             <field name="nbr"/>
                         </tree>
                     </field>
+
                 </page>
             </notebook>
             <group colspan="4" col="6">
                 <field name="state"/>
                 <button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
                 <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
-                <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/> 
-                
+                <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
             </group>
         </form>
         </field>
     </record>
-    
+
     <!-- New Idea Tree View -->
 
     <record model="ir.ui.view" id="view_idea_idea_tree">
@@ -201,17 +239,17 @@
         <field name="model">idea.idea</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-        <tree string="All Ideas">
+        <tree string="Ideas">
             <field name="title"/>
             <field name="category_id" />
-            <field name="create_date"/>
+            <field name="created_date"/>
             <field name="vote_avg" widget="progressbar"/>
             <field name="count_comments" />
             <field name="count_votes" />
             <field name="state"/>
-            <button name="%(action_idea_post_vote)d" icon="gtk-execute" type="action" states="draft,open" string="Vote"/>
+            <button name="%(idea.action_idea_post_vote)d" icon="gtk-execute" type="action" states="open" string="Submit Vote"/>
             <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
-            <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/> 
+            <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
         </tree>
         </field>
     </record>
@@ -225,9 +263,9 @@
         <field name="arch" type="xml">
             <search string="Ideas">
                 <group col="10" colspan="4">
-                    <filter icon="gtk-execute" string="Draft"
+                    <filter icon="terp-document-new" string="Draft"
                         domain="[('state','=','draft')]" help="Draft Ideas" />
-                    <filter icon="gtk-execute" string="Open"
+                    <filter icon="terp-camera_test" string="Open"
                         domain="[('state','=','open')]" help="Open Ideas" />
                     <separator orientation="vertical"/>
                     <field name="title" select="1"/>
@@ -235,32 +273,15 @@
                     <field name="user_id" select="1" widget="selection"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="12" col="10">
-                    <filter icon="gtk-execute" string="Creator" help="By Creators" context="{'group_by':'user_id'}"/>
-                    <filter icon="gtk-execute" string="State" help="By States" context="{'group_by':'state'}"/>
-                    <filter icon="gtk-execute" string="Category" help="By Idea Category" context="{'group_by':'category_id'}"/>
+                <group expand="0" string="Group By..." colspan="12" col="10">
+                    <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'user_id'}"/>
+                    <filter icon="terp-stock_effects-object-colorize" string="State" help="By States" context="{'group_by':'state'}"/>
+                    <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_id'}"/>
                 </group>
             </search>
         </field>
     </record>
 
-<!-- Comments on Idea Tree View -->
-
-    <record model="ir.ui.view" id="view_idea_comment_tree">
-        <field name="name">idea.comment.tree</field>
-        <field name="model">idea.comment</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-        <tree string="Comments">
-            <field name="create_date" />
-            <field name="user_id" />
-            <field name="content" string="Comment" />
-        </tree>
-        </field>
-    </record>
-
-<!-- Idea Action -->
-
     <record model="ir.actions.act_window" id="action_idea_idea">
         <field name="name">Ideas</field>
         <field name="res_model">idea.idea</field>
@@ -348,9 +369,10 @@
         <field name="res_model">idea.vote</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_idea_vote_search"/>
     </record>
 
-    <menuitem name="All Votes" parent="menu_ideas" id="menu_idea_vote" action="action_idea_vote"/>
+    <menuitem name="Votes" parent="menu_ideas" id="menu_idea_vote" action="action_idea_vote"/>
 
     </data>
 </openerp>
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index 0c720f2ee2d..0fe5dad9ac9 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -1,8 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_idea_category","idea.category","model_idea_category","base.group_user",1,0,0,0
 "access_idea_idea","idea.idea","model_idea_idea","base.group_user",1,1,1,1
-"access_idea_comment","idea.comment","model_idea_comment","base.group_user",1,1,1,1
 "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/idea/test/test_idea.yml b/addons/idea/test/test_idea.yml
index 6714fbfc7e2..4c3f5301a5a 100644
--- a/addons/idea/test/test_idea.yml
+++ b/addons/idea/test/test_idea.yml
@@ -8,10 +8,10 @@
     name: Technical
 - |
   I create a New Idea of "Technical  presentation for 1 hours in every day" and specify category "Technical".
-
 - 
   !record {model: idea.idea, id: idea_idea_0}: 
     category_id: idea_category_technical0
+    created_date: '05/13/2010 19:16:26'
     description: I want that Technical presentation are arranged for 1 hours in every
       day.\nso, on that presentation, we can know all things what improvement and development
       are done in our company.\n\n\n\n\n
@@ -44,52 +44,50 @@
   !record {model: res.users, id: res_users_user1}:
     company_id: base.main_company
     context_lang: en_US
+    groups_id:
+      - base.group_system
+      - base.group_user
     login: user2
     name: user2
     password: user2
  
 - |
   In order to post vote I connect as user1 and open the idea page
-  I click on  "Vote" wizard and vote the idea as "Normal"
+  I click on  "Submit Vote" wizard  button and vote the idea as "Normal"
 -
   !record {model: idea.post.vote, id: idea_post_vote_0}: 
     vote: 50
+    
 - |
-  Now I click on "Post Vote" button of wizard.     
+  Now I click on "Post" button of this wizard.     
 - 
   !python {model: idea.post.vote}: |
     uid = ref('res_users_user0')    
-    self.do_vote(cr, uid, [ref("idea_post_vote_0")], {'active_id': ref('idea_idea_0')})  
+    self.do_vote(cr, uid, [ref("idea_post_vote_0")], {'active_ids': [ref('idea_idea_0')]})  
     
 - |
-  To add other vote I connect as user2 and open the idea page
-  I click on "Vote" wizard and vote the idea as "Very Good"
+  To add other vote I connect as user2 and open the idea page.
+  
+  I click on "Submit Vote" wizard button and vote the idea as "Very Good".
+   
+  and put comment "We can learn many things from technical presentation".
   
 - 
   !record {model: idea.post.vote, id: idea_post_vote_1}: 
     vote: 100
-    
+    note: 'We can learn many things from technical presentation'
 - |
-  I click on "Post Vote" button of this wizard.    
+  I click on "Post" button of this wizard.    
 -
   !python {model: idea.post.vote}: |
     uid = ref('res_users_user1')
-    self.do_vote(cr, uid, [ref("idea_post_vote_1")], {'active_id': ref('idea_idea_0')})  
+    self.do_vote(cr, uid, [ref("idea_post_vote_1")], {'active_ids': [ref('idea_idea_0')]})  
         
 - |
   I can see that the Average score changed in "Average score" field with value 75
 -
   !record {model: idea.idea, id: idea_idea_0}: 
     vote_avg: 75 
-   
-- |
-  I put one comment "We can learn many things from technical presentation" for the idea.
-- 
-  !record {model: idea.idea, id: idea.idea_idea_0}:
-    comment_ids:
-      - content: "We can learn many things from technical presentation"
-        idea_id: idea.idea_idea_0
-        user_id: res_users_user1
         
 - |
   I connect as Manager and  close this idea by click on "Close" button.
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index fb36f7945a4..e723d0a4505 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -34,11 +34,11 @@ class idea_post_vote(osv.osv_memory):
               ('25', 'Bad'),
               ('50', 'Normal'),
               ('75', 'Good'),
-              ('100', 'Very Good') ], 
+              ('100', 'Very Good') ],
         'Post Vote', required=True),
         'note': fields.text('Description'),
     }
-    
+
     def get_default(self, cr, uid, context={}):
         """
         This function checks for precondition before wizard executes
@@ -49,17 +49,17 @@ class idea_post_vote(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         """
         idea_obj = self.pool.get('idea.idea')
-        
+
         if context.get('active_id'):
             idea = idea_obj.browse(cr, uid, context.get('active_id'))
             return idea.my_vote
         else:
             return 75
-        
+
     _defaults = {
         'vote': get_default,
     }
-    
+
     def view_init(self, cr, uid, fields, context=None):
         """
         This function checks for precondition before wizard executes
@@ -70,15 +70,28 @@ class idea_post_vote(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         """
         idea_obj = self.pool.get('idea.idea')
+        vote_obj = self.pool.get('idea.vote')
 
         for idea in idea_obj.browse(cr, uid, context.get('active_ids', [])):
-            if idea.state in ['draft', 'close', 'cancel']:
-                raise osv.except_osv(_("Warning !"), _("Draft/Accepted/Cancelled ideas Could not be voted"))
+
+            for active_id in context.get('active_ids'):
+
+                vote_ids = vote_obj.search(cr, uid, [('user_id', '=', uid), ('idea_id', '=', active_id)])
+                vote_obj_id = vote_obj.browse(cr, uid, vote_ids)
+                count = 0
+                for vote in vote_obj_id:
+                    count += 1
+
+                user_limit = idea.vote_limit
+                if  count >= user_limit:
+                   raise osv.except_osv(_('Warning !'),_("You can not give Vote for this idea more than %s times") % (user_limit))
+
             if idea.state != 'open':
-                raise osv.except_osv(_('Warning !'), _('idea should be in \'Open\' state before vote for that idea.'))
+                raise osv.except_osv(_('Warning !'), _('Idea should be in \
+\'Open\' state before vote for that idea.'))
         return False
 
-    def do_vote(self, cr, uid, ids, context):
+    def do_vote(self, cr, uid, ids, context=None):
         """
         Create idea vote.
         @param cr: the current row, from the database cursor,
@@ -86,8 +99,8 @@ class idea_post_vote(osv.osv_memory):
         @param ids: List of Idea Post vote’s IDs.
         @return: Dictionary {}
         """
-        
-        vote_id = context and context.get('active_id', False) or False
+
+        vote_ids = context and context.get('active_ids', []) or []
         vote_pool = self.pool.get('idea.vote')
         idea_pool = self.pool.get('idea.idea')
         comment_pool = self.pool.get('idea.comment')
@@ -96,8 +109,8 @@ class idea_post_vote(osv.osv_memory):
             score = str(do_vote_obj['vote'])
             comment = do_vote_obj.get('note', False)
             vote = {
-                'idea_id': vote_id, 
-                'user_id': uid, 
+                'idea_id': vote_id,
+                'user_id': uid,
                 'score': score
             }
             if comment:
@@ -114,5 +127,44 @@ class idea_post_vote(osv.osv_memory):
 
 idea_post_vote()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+class idea_select(osv.osv_memory):
 
+    """ Select idea for vote."""
+
+    _name = "idea.select"
+    _description = "select idea"
+
+    _columns = {
+                'idea_id': fields.many2one('idea.idea', 'Idea', required=True),
+               }
+
+    def open_vote(self, cr, uid, ids, context=None):
+       """
+       This function load column.
+       @param cr: the current row, from the database cursor,
+       @param uid: the current users ID for security checks,
+       @param ids: List of load column,
+       @return: dictionary of query logs clear message window
+       """
+       idea_obj = self.browse(cr, uid, ids)
+       for idea in idea_obj:
+           idea_id = idea.idea_id.id
+
+       data_obj = self.pool.get('ir.model.data')
+       id2 = data_obj._get_id(cr, uid, 'idea', 'view_idea_post_vote')
+       if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+       value = {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'idea.post.vote',
+            'views': [(id2, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': {'active_ids': [idea_id]}
+       }
+       return value
+
+idea_select()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/idea/wizard/idea_post_vote_view.xml b/addons/idea/wizard/idea_post_vote_view.xml
index aa066cdffd3..ef1a338dcd4 100644
--- a/addons/idea/wizard/idea_post_vote_view.xml
+++ b/addons/idea/wizard/idea_post_vote_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
     <!-- Post Idea for vote Form View  -->
 
       <record id="view_idea_post_vote" model="ir.ui.view">
@@ -9,7 +8,7 @@
         <field name="model">idea.post.vote</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Create Tasks">
+            <form string="Give Vote">
                 <group colspan="4" >
                      <field name="vote" colspan="4"/>
                      <separator string="Comment" colspan="4"/>
@@ -18,12 +17,33 @@
                <separator string="" colspan="4" />
                <group colspan="4" col="6">
                     <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button  icon="gtk-ok" name="do_vote" string="Post Vote" type="object"/>
+                    <button  icon="gtk-ok" name="do_vote" string="Post" type="object"/>
                </group>
            </form>
         </field>
     </record>
 
+
+    <record id="view_idea_select" model="ir.ui.view">
+            <field name="name">idea.select.form</field>
+            <field name="model">idea.select</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Select Idea for Vote">
+                	<group colspan="4" >
+                		 <separator string="Select Idea for Vote" colspan="4"/>
+                		 <field name="idea_id"/>
+                    </group>
+                       	<separator string="" colspan="4"/>
+                    <group colspan="4" col="6">
+                    	<label string="" colspan="2"/>
+                    	<button  icon="gtk-cancel" special="cancel" string="Close"/>
+                    	<button  icon="gtk-go-forward" name="open_vote" string="Next" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+
     <!-- Post Idea for vote Action  -->
 
     <record id="action_idea_post_vote" model="ir.actions.act_window">
@@ -33,7 +53,17 @@
         <field name="view_mode">tree,form</field>
        <field name="view_id" ref="view_idea_post_vote"/>
        <field name="target">new</field>
-    </record>
-        
+    </record>  
+
+    <record id="action_idea_select" model="ir.actions.act_window">
+            <field name="name">Idea select</field>
+            <field name="res_model">idea.select</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_idea_select"/>
+           <field name="target">new</field>
+           <field name="context">{'model': 'idea.idea'}</field>
+        </record>     
+
     </data>
 </openerp>
diff --git a/addons/l10n_be/wizard/l10_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py
index 636e8fe2b89..24a9541a2a2 100644
--- a/addons/l10n_be/wizard/l10_be_partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py
@@ -40,7 +40,7 @@ class vat_listing_clients(osv.osv_memory):
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):
             return []
-        return [(r['id'], r['name'] + ' - ' + r['vat']) \
+        return [(r['id'], r['name'] or '' + ' - ' + r['vat'] or '') \
                 for r in self.read(cr, uid, ids, ['name', 'vat'],
                     context, load='_classic_write')]
 
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index 9d0b2852abd..7de9b5eb77e 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -77,7 +77,6 @@ TODO :
         "base_vat", 
         "base_iban",
         "account_payment",
-        "account_tax_include", 
     ],
     "init_xml" : [
         "dta_data.xml",
diff --git a/addons/l10n_fr/i18n/pl.po b/addons/l10n_fr/i18n/pl.po
index 9ab5656cf1c..2638031c7b9 100644
--- a/addons/l10n_fr/i18n/pl.po
+++ b/addons/l10n_fr/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 09:18+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-04 21:52+0000\n"
+"Last-Translator: ErnestŻyciński <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-04-17 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
@@ -77,7 +77,7 @@ msgstr "Własność"
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_income
 msgid "Income"
-msgstr ""
+msgstr "Przychody"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
@@ -113,12 +113,12 @@ msgstr ""
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_payable
 msgid "Payable"
-msgstr ""
+msgstr "Należności"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "( IV )"
-msgstr ""
+msgstr "( IV )"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_4
@@ -138,7 +138,7 @@ msgstr ""
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "+ IV+ V+ VI"
-msgstr ""
+msgstr "+ IV+ V+ VI"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
@@ -153,12 +153,12 @@ msgstr ""
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "D"
-msgstr ""
+msgstr "D"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "PROVISIONS"
-msgstr ""
+msgstr "PROWIZJA"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
@@ -183,7 +183,7 @@ msgstr ""
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "P"
-msgstr ""
+msgstr "P"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_stocks
@@ -193,7 +193,7 @@ msgstr ""
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "T"
-msgstr ""
+msgstr "T"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
@@ -213,12 +213,12 @@ msgstr ""
 #. module: l10n_fr
 #: wizard_view:l10n.fr.cdr.report,init:0
 msgid "Select period"
-msgstr ""
+msgstr "Wybierz okres"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "RÉSERVES"
-msgstr ""
+msgstr "ZAREZERWOWANY"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
@@ -228,7 +228,7 @@ msgstr ""
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_tax
 msgid "Tax"
-msgstr ""
+msgstr "Podatek"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
@@ -290,7 +290,7 @@ msgstr ""
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_1
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_5
 msgid "France"
-msgstr ""
+msgstr "Francja"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
@@ -306,7 +306,7 @@ msgstr ""
 #: wizard_button:l10n.fr.bilan.report,init,report:0
 #: wizard_button:l10n.fr.cdr.report,init,report:0
 msgid "Print"
-msgstr ""
+msgstr "Drukuj"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
@@ -316,7 +316,7 @@ msgstr ""
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "Net"
-msgstr ""
+msgstr "Sieć"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
@@ -331,7 +331,7 @@ msgstr ""
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
 msgid "( VI )"
-msgstr ""
+msgstr "( VI )"
 
 #. module: l10n_fr
 #: constraint:account.account.template:0
@@ -341,7 +341,7 @@ msgstr ""
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_provision
 msgid "Provisions"
-msgstr ""
+msgstr "Prowizja"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
@@ -378,7 +378,7 @@ msgstr ""
 #. module: l10n_fr
 #: field:l10n.fr.line,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "Raport"
 
 #. module: l10n_fr
 #: constraint:account.tax.code.template:0
@@ -408,12 +408,12 @@ msgstr ""
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
 msgid "M"
-msgstr ""
+msgstr "M"
 
 #. module: l10n_fr
 #: model:ir.module.module,description:l10n_fr.module_meta_information
@@ -441,7 +441,7 @@ msgstr ""
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_expense
 msgid "Expense"
-msgstr ""
+msgstr "Koszty"
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
diff --git a/addons/lunch/lunch_report.xml b/addons/lunch/lunch_report.xml
index 6503c99a6ea..c5e933847cd 100644
--- a/addons/lunch/lunch_report.xml
+++ b/addons/lunch/lunch_report.xml
@@ -3,7 +3,7 @@
     <data>
         <report
             id="report_lunch_order"
-            string="Print Order"
+            string="Lunch Order"
             model="lunch.order"
             name="lunch.order"
             rml="lunch/report/order.rml"
diff --git a/addons/mail_gateway/__openerp__.py b/addons/mail_gateway/__openerp__.py
index b5e56a03ee1..1584067ea38 100644
--- a/addons/mail_gateway/__openerp__.py
+++ b/addons/mail_gateway/__openerp__.py
@@ -24,18 +24,15 @@
     'version': '1.0',
     'category': 'Generic Modules/Mail Service',
     'description': """The generic email gateway system allows to send and receive emails
-    * IMAP / IMAP with SSL
-    * POP / POP with SSL
-    * SMTP / SMTP with TLS
-    * ACL basd access polocy 
-    * Queing and History for Emails
+    * History for Emails
     * Easy Integration with any Module""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
-        "mail_gateway_view.xml"
+        "mail_gateway_view.xml",
+        'security/ir.model.access.csv'
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 8534c32c510..fb4920e9632 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -21,6 +21,7 @@
 
 from osv import osv, fields
 import time
+import  base64
 
 class one2many_domain(fields.one2many):
     def set(self, cr, obj, id, field, values, user=None, context=None):
@@ -30,7 +31,7 @@ class one2many_domain(fields.one2many):
                                             user=user, context=context)
 
     def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if not context:
+        if context is None:
             context = {}
         res = {}
         msg_obj = obj.pool.get('mailgate.message')
@@ -49,12 +50,12 @@ class mailgate_thread(osv.osv):
     _rec_name = 'thread' 
 
     _columns = {
-        'thread': fields.char('Thread', size=32, required=False),  
+        'thread': fields.char('Thread', size=32, required=False), 
         'message_ids': one2many_domain('mailgate.message', 'thread_id', 'Messages', domain=[('history', '=', True)], required=False), 
-        'log_ids': one2many_domain('mailgate.message', 'thread_id', 'Logs', domain=[('history', '=', False)], required=False),
+        'log_ids': one2many_domain('mailgate.message', 'thread_id', 'Logs', domain=[('history', '=', False)], required=False), 
         }
         
-    def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, message_id=False, context={}):
+    def __history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context={}):
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -64,36 +65,52 @@ class mailgate_thread(osv.osv):
         @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 atach: Attachment sent in email
         @param context: A standard dictionary for contextual values"""
-        if not context:
+        if context is None:
             context = {}
         # The mailgate sends the ids of the cases and not the object list
         if all(isinstance(case_id, (int, long)) for case_id in cases) and context.get('model'):
             cases = self.pool.get(context['model']).browse(cr, uid, cases, context=context)
 
         model_obj = self.pool.get('ir.model')
-        
+        att_obj = self.pool.get('ir.attachment')
         obj = self.pool.get('mailgate.message')
+
         for case in cases:
             model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
             data = {
-                'name': keyword,
-                'user_id': uid,
-                'model_id' : model_ids and model_ids[0] or False,
-                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
-                'thread_id': case.thread_id.id,                
-                'message_id': message_id
+                'name': keyword, 
+                'user_id': uid, 
+                'model_id' : model_ids and model_ids[0] or False, 
+                'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
+                'thread_id': case.thread_id.id, 
+                'message_id': message_id, 
             }
-
+            attachments = []
             if history:
-                data['history'] = True
-                data['description'] = details or case.description
-                data['email_to'] = email or \
-                        (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or tools.config.get('email_from', False)
-                data['email_from'] = email_from or \
-                        (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or tools.config.get('email_from', False)
+                for att in attach:
+                    attachments.append(att_obj.create(cr, uid, {'name': att[0], 'datas': base64.encodestring(att[1])}))
+                
+                data = {
+                        'name': subject or 'History', 
+                        'history': True, 
+                        'user_id': uid, 
+                        'model_id' : model_ids and model_ids[0] or False, 
+                        '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), 
+                        '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, 
+                        'thread_id': case.thread_id.id, 
+                        'message_id': message_id, 
+                        'attachment_ids': [(6, 0, attachments)]
+                        }
             res = obj.create(cr, uid, data, context)
         return True
     
@@ -112,20 +129,22 @@ class mailgate_message(osv.osv):
     _order = 'date desc'
 
     _columns = {
-        'name':fields.char('Message', size=64),
-        'model_id': fields.many2one('ir.model', 'Model'),
-        'thread_id':fields.many2one('mailgate.thread', 'Thread'),
-        'date': fields.datetime('Date'),
+        'name':fields.char('Message', size=64), 
+        'model_id': fields.many2one('ir.model', 'Model'), 
+        'res_id': fields.integer('Resource ID'),
+        'thread_id':fields.many2one('mailgate.thread', 'Thread'), 
+        'date': fields.datetime('Date'), 
         'history': fields.boolean('Is History?', required=False), 
-        '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 From', size=84),
-        'email_bcc': fields.char('Email From', size=84),
-        'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email Server.", select=True),
+        '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), 
+        'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email Server.", select=True), 
         'description': fields.text('Description'), 
-        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
+        'partner_id': fields.many2one('res.partner', 'Partner', required=False), 
+        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'), 
     }
 
 mailgate_message()
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 8b26d5ee47a..e5b7b426fe9 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -1,49 +1,67 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <record model="ir.ui.view" id="view_maligate_message_form">
-            <field name="name">maligate.message.form</field>
-            <field name="model">maligate.message</field>
+        <record model="ir.ui.view" id="view_mailgate_message_form">
+            <field name="name">mailgate.message.form</field>
+            <field name="model">mailgate.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="maligate message">
-                    <field name="name" />
-                    <field name="date" />
-                    <field name="user_id" />
-                    <field name="history" />
-                    <field name="message_id" />
+                <form string="mailgate message">
+                    <group colspan="4" col="6">
+                        <field name="name" required="1" select="1"/>
+                        <field name="date" required="1" select="1"/>
+                        <field name="user_id" string="Responsible" select="1"/>
+                    </group>
                     <notebook colspan="4">
-	                    <page>
-	                    	<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" />
-			               </group>
-		                </page>
-		                <page>
-		                	<separator string="Attachments" colspan="4"/>
-		                    <field name="attachment_ids" nolabel="1" colspan="4" />
-                 		</page>
-	                </notebook>
+                        <page string="Details">
+                            <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="message_id" />
+                           </group>
+                           <separator string="Description" colspan="4"/>
+                            <field name="description" nolabel="1" colspan="4" />
+                        </page>
+                        <page string="Attachments">
+                            <separator string="Attachments" colspan="4"/>
+                            <field name="attachment_ids" nolabel="1" colspan="4" readonly="1"/>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_mailgate_message_tree">
-            <field name="name">maligate.message.tree</field>
-            <field name="model">maligate.message</field>
+            <field name="name">mailgate.message.tree</field>
+            <field name="model">mailgate.message</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Mailgateway Message">
-                    <field name="name" select="1" />
                     <field name="date" />
+                    <field name="email_from" />
+                    <field name="user_id" />
                 </tree>
             </field>
         </record>
-        
-        
+
+        <record model="ir.ui.view" id="view_mailgate_message_search">
+            <field name="name">mailgate.message.search</field>
+            <field name="model">mailgate.message</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Mailgateway Message Search">
+                    <field name="name" />
+                    <field name="date" />
+                    <field name="user_id" />
+                    <field name="message_id" />
+                </search>
+            </field>
+        </record>
+
+
         <record model="ir.ui.view" id="view_mailgate_thread_form">
             <field name="name">mailgate.thread.form</field>
             <field name="model">mailgate.thread</field>
@@ -53,32 +71,33 @@
                     <field name="thread" select="1"/>
                     <separator string="Logs" colspan="4"/>
                     <field name="log_ids" nolabel="1" colspan="4" domain="[('history', '=', True)]">
-                    	<tree string="Mailgateway Logs">
-		                    <field name="name" select="1" />
-		                    <field name="date" />
-		                </tree>
-	                    <form string="Maligate Logs">
-		                    <field name="name" />
-		                    <field name="date" />
-		                    <field name="user_id" />
-		                    <field name="message_id" />
-		                    <field name="history" />
-		                    <notebook colspan="4">
-			                    <page string="Email Details">
-			                    	<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" />
-					               </group>
-				                </page>
-				                <page string="Attachments">
-				                	<separator string="Attachments" colspan="4"/>
-				                    <field name="attachment_ids" nolabel="1" colspan="4" />
-		                 		</page>
-			                </notebook>
-		                </form>
+                        <tree string="Mailgateway Logs">
+                            <field name="name" select="1" />
+                            <field name="date" />
+                        </tree>
+                        <form string="Mailgate Logs">
+                            <field name="name" />
+                            <field name="date" />
+                            <field name="user_id" />
+                            <field name="message_id" />
+                            <notebook colspan="4">
+                                <page string="Email Details">
+                                    <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" />
+                                   </group>
+                                   <separator string="Description" colspan="4"/>
+                                    <field name="description" nolabel="1" colspan="4" />
+                                </page>
+                                <page string="Attachments">
+                                    <separator string="Attachments" colspan="4"/>
+                                    <field name="attachment_ids" nolabel="1" colspan="4" />
+                                </page>
+                            </notebook>
+                        </form>
                     </field>
                     <separator string="Histories" colspan="4"/>
                     <field name="message_ids" nolabel="1" colspan="4" domain="[('history', '=', True)]">
@@ -86,7 +105,7 @@
                             <field name="name" select="1" />
                             <field name="date" />
                         </tree>
-                        <form string="Maligate Histories">
+                        <form string="Mailgate Histories">
                             <field name="name" />
                             <field name="date" />
                             <field name="user_id" />
@@ -112,7 +131,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_mailgate_thread_tree">
             <field name="name">mailgate.thread.tree</field>
             <field name="model">mailgate.thread</field>
@@ -124,35 +143,37 @@
                 </tree>
             </field>
         </record>
-        
-        <record model="ir.actions.act_window" id="action_view_mailgate_thread">
-	        <field name="name">Mailgateway Threads</field>
-	        <field name="res_model">mailgate.thread</field>
-	        <field name="view_mode">tree,form</field>
-	        <field name="view_type">form</field>
-	        <field name="view_id" ref="view_mailgate_thread_tree"/>
-	    </record>
-		
-		<record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view1">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_mailgate_thread_tree"/>
-	        <field name="act_window_id" ref="action_view_mailgate_thread"/>
-	    </record>
-	    <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view2">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">form</field>
-	        <field name="view_id" ref="view_mailgate_thread_form"/>
-	        <field name="act_window_id" ref="action_view_mailgate_thread"/>
-	    </record>
-		
-		
-		 <!-- <menuitem id="base.menu_crm_configuration" name="Cases"
-            parent="base.menu_base_config" sequence="0"/>
 
-        <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
-        	parent="base.menu_crm_configuration"  sequence="20"/>
-        	-->
-      	
+        <record model="ir.actions.act_window" id="action_view_mailgate_thread">
+            <field name="name">Mailgateway Threads</field>
+            <field name="res_model">mailgate.thread</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_mailgate_thread_tree"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view1">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_mailgate_thread_tree"/>
+            <field name="act_window_id" ref="action_view_mailgate_thread"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view2">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_mailgate_thread_form"/>
+            <field name="act_window_id" ref="action_view_mailgate_thread"/>
+        </record>
+
+            <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
+           parent="base.menu_base_config"  sequence="100"/>
+
+        <act_window domain="[('partner_id', '=', active_id), ('history', '=', True)]"
+            id="act_res_partner_emails" name="Emails"
+            res_model="mailgate.message"
+            src_model="res.partner"
+            view_id="view_mailgate_message_tree"
+            />
+
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 7a72f39c6eb..78f5a742bb6 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-	   
+
         <menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="10"/>
 
         <record id="view_marketing_installer" model="ir.ui.view">
@@ -14,20 +14,23 @@
                   <form position="attributes">
                     <attribute name="string">Marketing Modules Installation</attribute>
                   </form>
-        
                   <separator string="title" position="attributes">
-                    <attribute name="string">Configure Your Marketing System</attribute>
+                    <attribute name="string">Select Marketing Modules to Install</attribute>
                   </separator>
                   <xpath expr="//label[@string='description']"
                          position="attributes">
-                    <attribute name="string">You can enhance OpenERP's basic Marketing support with a few additional OpenERP applications</attribute>
+                    <attribute name="string">OpenERP provides tools to automate your leads process, design marketing campaigns and profile efficiently your customers.</attribute>
+                  </xpath>
+                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                       <attribute name='rowspan'>13</attribute>
+                       <attribute name='string'></attribute>
+                 </xpath>
+                  <xpath expr="//button[@string='Install Modules']" position="attributes">
+                            <attribute name="string">Configure</attribute>
                   </xpath>
                   <group colspan="8">
-                    <group colspan="2" col="2">
-                        <separator string="Marketing Mdules" colspan="4" />
                         <field name="marketing_campaign" />
                         <field name="crm_profiling" />
-                    </group>
                   </group>
                 </data>
             </field>
@@ -49,4 +52,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
index 443fb09ed48..aee302283b2 100644
--- a/addons/marketing/marketing_wizard.py
+++ b/addons/marketing/marketing_wizard.py
@@ -24,15 +24,13 @@ from osv import fields, osv
 class marketing_installer(osv.osv_memory):
     _name = 'marketing.installer'
     _inherit = 'res.config.installer'
-    
     _columns = {
         # Generic modules
-        'marketing_campaign':fields.boolean('Marketing Campaign',
-            help="Helps you to manage your marketing campaigns step by step."),
-        'crm_profiling':fields.boolean('Crm Profile',
-            help="Helps you to perform segmentation within partners.")
-            }
-        
+        'marketing_campaign':fields.boolean('Marketing Campaigns',
+            help="Helps you to manage marketing campaigns and automate actions and communication steps."),
+        'crm_profiling':fields.boolean('Profiling Tools',
+            help="Helps you to perform segmentation within partners and design questionaires.")
+    }
 marketing_installer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index aca6c2f6d28..992731c1332 100755
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -24,10 +24,9 @@
     "name" : "",
     "version" : "1.1",
     "depends" : ["marketing",
-                 "crm", 
+                "crm", 
                 "document",
-                "poweremail" # need to get this module form the branch 
-                # lp:poweremail  
+                "email_template"
                 ],
     "author" : "Tiny",
     "category": 'Generic Modules/Marketing',
@@ -40,7 +39,6 @@
         'marketing_campaign_data.xml',    
         'marketing_campaign_workflow.xml',    
         'report/campaign_analysis_view.xml',
-        'marketing_campaign_demo.xml'
     ],
     'demo_xml': [
         'marketing_campaign_demo.xml',
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 398e0e805be..3f29e03c968 100755
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -129,9 +129,7 @@ class marketing_campaign_segment(osv.osv): #{{{
         curr_date = time.strftime('%Y-%m-%d %H:%M:%S')
         vals = {'state': 'running'}
         if not segment.date_run:
-            vals['date_run'] = segment.campaign_id.date_run and \
-                                segment.campaign_id.date_run or \
-                                time.strftime('%Y-%m-%d %H:%M:%S')                
+            vals['date_run'] = time.strftime('%Y-%m-%d %H:%M:%S')                
         if not segment.sync_last_date:
             vals['sync_last_date']=curr_date
         if not segment.date_done:
@@ -142,7 +140,7 @@ class marketing_campaign_segment(osv.osv): #{{{
         
     def state_done_set(self, cr, uid, ids, *args):
         date_done = self.browse(cr, uid, ids[0]).date_done 
-        if (date_done > time.strftime('%Y-%m-%d')):
+        if (date_done > time.strftime('%Y-%m-%d %H:%M:%S')):
             raise osv.except_osv("Error", "Segment cannot be closed before end date")
 
         wi_ids = self.pool.get("marketing.campaign.workitem").search(cr, uid,
@@ -186,7 +184,7 @@ class marketing_campaign_segment(osv.osv): #{{{
                                         }
                             self.pool.get('marketing.campaign.workitem').create(
                                                     cr, uid, wi_vals)
-                self.write(cr, uid, segment.id, {'sync_last_date':action_date}) 
+                self.write(cr, uid, segment.id, {'sync_last_date':action_date})
         return True
 
 marketing_campaign_segment()#}}}
@@ -196,7 +194,7 @@ class marketing_campaign_activity(osv.osv): #{{{
     _description = "Campaign Activity"
 
     _columns = {
-        'name': fields.char('Name', size=64, required=True),
+        'name': fields.char('Name', size=128, required=True),
         'campaign_id': fields.many2one('marketing.campaign', 'Campaign', 
                                             required = True, ondelete='cascade'),
         'object_id': fields.related('campaign_id','object_id',
@@ -212,7 +210,7 @@ class marketing_campaign_activity(osv.osv): #{{{
                                   ('action', 'Action'),
                                   ('subcampaign', 'Sub-Campaign')],
                                   'Type', required=True),
-        'email_template_id': fields.many2one('poweremail.templates','Email Template'),
+        'email_template_id': fields.many2one('email.template','Email Template'),
         'report_id': fields.many2one('ir.actions.report.xml', 'Reports', ),         
         'report_directory_id': fields.many2one('document.directory','Directory',
                                 help="Folder is used to store the generated reports"),
@@ -254,8 +252,9 @@ class marketing_campaign_activity(osv.osv): #{{{
 
     def process(self, cr, uid, act_id, wi_id, context={}):
         activity = self.browse(cr, uid, act_id)
-        workitem_obj = self.pool.get('marketing.campaign.workitem')        
+        workitem_obj = self.pool.get('marketing.campaign.workitem')
         workitem = workitem_obj.browse(cr, uid, wi_id)
+        
         if activity.type == 'paper' :
             service = netsvc.LocalService('report.%s'%activity.report_id.report_name)
             (report_data, format) = service.create(cr, uid, [], {}, {})
@@ -278,12 +277,12 @@ class marketing_campaign_activity(osv.osv): #{{{
             if not workitem.partner_id.email:
                 return {'error_msg'  : "There is no email defined for the partner"}
             vals = {
-                'pem_from': tools.ustr(accounts.name) + "<" + tools.ustr(accounts.email_id) + ">",
-                'pem_to': workitem.partner_id.email,
-                'pem_subject': template.def_subject,
-                'pem_body_text': template.def_body_text,
-                'pem_body_html': template.def_body_html,
-                'pem_account_id':accounts.id,
+                'email_from': tools.ustr(accounts.name) + "<" + tools.ustr(accounts.email_id) + ">",
+                'email_to': workitem.partner_id.email,
+                'subject': template.def_subject,
+                'body_text': template.def_body_text,
+                'body_html': template.def_body_html,
+                'account_id':accounts.id,
                 'state':'na',
                 'mail_type':'multipart/alternative' #Options:'multipart/mixed','multipart/alternative','text/plain','text/html'
             }
@@ -294,12 +293,11 @@ class marketing_campaign_activity(osv.osv): #{{{
 #                    vals['pem_body_html'] = tools.ustr(vals['pem_body_html'] or '') + signature
 
             #Create partly the mail and later update attachments
-            mail_id = self.pool.get('poweremail.mailbox').create(cr, uid, vals, context)
+            mail_id = self.pool.get('email_template.mailbox').create(cr, uid, vals, context)
         elif activity.type == 'action' :
             server_obj = self.pool.get('ir.actions.server')
             server_obj.run(cr, uid, [activity.server_action_id.id], context)
             #???
-
         return True    
 marketing_campaign_activity()#}}}
 
@@ -410,13 +408,13 @@ class marketing_campaign_workitem(osv.osv): #{{{
     
 marketing_campaign_workitem() #}}}  
 
-class poweremail_templates(osv.osv):
-    _inherit = "poweremail.templates"
+class email_template(osv.osv):
+    _inherit = "email.template"
     
     _defaults = {
         'object_name': lambda obj, cr, uid, context: context.get('object_id',False),
     }
-poweremail_templates() 
+email_template() 
 
 class report_xml(osv.osv):
 
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
index 9c2211903c5..7296ebf9c50 100644
--- a/addons/marketing_campaign/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -21,8 +21,9 @@
             <field eval="&quot;&quot;&quot;ressource&quot;&quot;&quot;" name="type"/>
             <field name="ressource_type_id" ref="model_marketing_campaign"/>
         </record>	
-<!-- Power email tempalte -->	
-		<record id="poweremail_templates_foropenerpondemandfreetrial0" model="poweremail.templates">
+        
+        <!-- Email tempalte -->	
+		<record id="email_template_1" model="email.template">
 			<field name="def_subject">Thanks for showing interest in OpenERP</field>
 			<field name="def_to">info@tinyerp.com</field>
 			<field eval="[(6,0,[])]" name="allowed_groups"/>
@@ -32,17 +33,163 @@
 			<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
 			<field name="object_name" ref="crm.model_crm_lead"/>
 			<field eval="0" name="use_sign"/>
-			<field name="def_body_text">Hello, 
-Thanks for generous interest you have shown in the open ERP.
-Regards,
-OpenERP Team,</field>
+			<field name="def_body_text">Hello,Thanks for generous interest you have shown in the open ERP.Regards,OpenERP Team,</field>
 			<field name="template_language">mako</field>
 			<field eval="0" name="send_on_create"/>
 			<field name="name">For OpenERP OnDemand Free Trial 2010</field>
 			<field name="model_int_name">crm.lead</field>
 			<field eval="0" name="send_on_write"/>
 		</record>	
-<!-- Report -->	
+		<record id="email_template_2" model="email.template">
+            <field name="def_subject">Propose to subscribe to the Open ERP Discovery Day on May 2010</field>
+            <field name="def_to">info@tinyerp.com</field>
+            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field eval="0" name="auto_email"/>
+            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
+            <field eval="[(6,0,[])]" name="table_required_fields"/>
+            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
+            <field name="object_name" ref="crm.model_crm_lead"/>
+            <field eval="0" name="use_sign"/>
+            <field name="def_body_text">Hello,We have very good offer that might suit you.
+            We propose you to subscribe to the Open ERP Discovery Day on May 2010.
+            If any further information required kindly revert back.
+            We really appreciate your co-operation on this.
+            Regards,OpenERP Team,</field>
+            <field name="template_language">mako</field>
+            <field eval="0" name="send_on_create"/>
+            <field name="name">For Open ERP Discovery Day on May 2010</field>
+            <field name="model_int_name">crm.lead</field>
+            <field eval="0" name="send_on_write"/>
+        </record> 
+        
+            <record id="email_template_3" model="email.template">
+            <field name="def_subject">Thanks for subscribing to the Open ERP Discovery Day</field>
+            <field name="def_to">info@tinyerp.com</field>
+            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field eval="0" name="auto_email"/>
+            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
+            <field eval="[(6,0,[])]" name="table_required_fields"/>
+            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
+            <field name="object_name" ref="crm.model_crm_lead"/>
+            <field eval="0" name="use_sign"/>
+            <field name="def_body_text">Hello,Thanks for showing intrest and for subscribing to the Open ERP Discovery Day.
+             If any further information required kindly revert back.
+             I really appreciate your co-operation on this.
+             Regards,OpenERP Team,</field>
+            <field name="template_language">mako</field>
+            <field eval="0" name="send_on_create"/>
+            <field name="name">For Open ERP Discovery Day</field>
+            <field name="model_int_name">crm.lead</field>
+            <field eval="0" name="send_on_write"/>
+        </record>  
+        
+             <record id="email_template_4" model="email.template">
+            <field name="def_subject">Thanks for buying the Open ERP book</field>
+            <field name="def_to">info@tinyerp.com</field>
+            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field eval="0" name="auto_email"/>
+            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
+            <field eval="[(6,0,[])]" name="table_required_fields"/>
+           <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
+             <field name="object_name" ref="crm.model_crm_lead"/>
+            <field eval="0" name="use_sign"/>
+            <field name="def_body_text">Hello,Thanks for showing intrest and buying the Open ERP book.
+            If any further information required kindly revert back.
+            I really appreciate your co-operation on this.
+            Regards,OpenERP Team,</field>
+            <field name="template_language">mako</field>
+            <field eval="0" name="send_on_create"/>
+            <field name="name">For Open ERP book</field>
+            <field name="model_int_name">crm.lead</field>
+            <field eval="0" name="send_on_write"/>
+        </record>
+        
+         <record id="email_template_5" model="email.template">
+            <field name="def_subject">Propose a free technical training to Gold partners</field>
+            <field name="def_to">info@tinyerp.com</field>
+            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field eval="0" name="auto_email"/>
+            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
+            <field eval="[(6,0,[])]" name="table_required_fields"/>
+            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
+            <field name="object_name" ref="crm.model_crm_lead"/>
+            <field eval="0" name="use_sign"/>
+            <field name="def_body_text">Hello, We have very good offer that might suit you.
+            For our gold partners,We are arranging free technical training on june,2010.
+            If any further information required kindly revert back.
+            I really appreciate your co-operation on this.
+            Regards,OpenERP Team,</field>
+            <field name="template_language">mako</field>
+            <field eval="0" name="send_on_create"/>
+            <field name="name">For technical training to Gold partners</field>
+            <field name="model_int_name">crm.lead</field>
+            <field eval="0" name="send_on_write"/>
+        </record>
+        
+          <record id="email_template_6" model="email.template">
+            <field name="def_subject">Propose paid training to Silver partners</field>
+            <field name="def_to">info@tinyerp.com</field>
+            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field eval="0" name="auto_email"/>
+            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
+            <field eval="[(6,0,[])]" name="table_required_fields"/>
+            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
+            <field name="object_name" ref="crm.model_crm_lead"/>
+            <field eval="0" name="use_sign"/>
+            <field name="def_body_text">Hello, We have very good offer that might suit you.
+            For our silver partners,We are  paid technical training on june,2010.
+            If any further information required kindly revert back.
+            I really appreciate your co-operation on this.
+            Regards,OpenERP Team,</field>
+            <field name="template_language">mako</field>
+            <field eval="0" name="send_on_create"/>
+            <field name="name">For training to Silver partners</field>
+            <field name="model_int_name">crm.lead</field>
+            <field eval="0" name="send_on_write"/>
+        </record>
+    
+        <record id="email_template_7" model="email.template">
+            <field name="def_subject">Propose gold partnership to silver partners</field>
+            <field name="def_to">info@tinyerp.com</field>
+            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field eval="0" name="auto_email"/>
+            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
+            <field eval="[(6,0,[])]" name="table_required_fields"/>
+            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
+            <field name="object_name" ref="crm.model_crm_lead"/>
+            <field eval="0" name="use_sign"/>
+            <field name="def_body_text">Hello, We have very good offer that might suit you.
+            For our silver partners,We are  offering Gold partnership.
+            If any further information required kindly revert back.
+            I really appreciate your co-operation on this.
+            Regards,OpenERP Team,</field>
+            <field name="template_language">mako</field>
+            <field eval="0" name="send_on_create"/>
+            <field name="name">For gold partnership to silver partners</field>
+            <field name="model_int_name">crm.lead</field>
+            <field eval="0" name="send_on_write"/>
+        </record>
+        
+        <record id="email_template_8" model="email.template">
+            <field name="def_subject">Thanks for subscribing to technical training</field>
+            <field name="def_to">info@tinyerp.com</field>
+            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field eval="0" name="auto_email"/>
+            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
+            <field eval="[(6,0,[])]" name="table_required_fields"/>
+            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
+            <field name="object_name" ref="crm.model_crm_lead"/>
+            <field eval="0" name="use_sign"/>
+            <field name="def_body_text">Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
+            Regards,OpenERP Team,</field>
+            <field name="template_language">mako</field>
+            <field eval="0" name="send_on_create"/>
+            <field name="name">For subscribing to technical training</field>
+            <field name="model_int_name">crm.lead</field>
+            <field eval="0" name="send_on_write"/>
+        </record>
+        <!-- Report -->	
+    
 		<record id="mc_crm_lead_demo_report" model="ir.actions.report.xml">
 			<field name="name">Marketing campaign demo report</field>
 			<field name="type">ir.actions.report.xml</field>
@@ -51,12 +198,15 @@ OpenERP Team,</field>
 			<field name="report_rml">marketing_campaign/report/crm_lead_mc_demo_report.rml</field>
 			<field name="report_type">pdf</field>
 		</record>
-<!-- Campaign -->			
+		
+    <!-- Campaign -->			
 		<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"/>
 		</record>
-<!-- Activity -->			
+            
+            <!-- Activity -->	
+            		
 		<record id="marketing_campaign_activity_0" model="marketing.campaign.activity">
 			<field name="name">Propose a 1 month free trial for an OnDemand offer</field>
 			<field name="server_action_id" ref="base.action_start_configurator"/>
@@ -70,13 +220,112 @@ OpenERP Team,</field>
 			<field name="name">Thanks for showing interest</field>
 			<field name="server_action_id" ref="base.action_start_configurator"/>
 			<field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+		    <field name="email_template_id" ref="email_template_1"/>
 		</record>
-<!-- Tranisition -->							
+		
+		<record id="marketing_campaign_activity_2" model="marketing.campaign.activity">
+            <field name="name">Propose to subscribe to the Open ERP Discovery Day on May 2010</field>
+            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+             <field name="email_template_id" ref="email_template_2"/>
+        </record>
+		
+		<record id="marketing_campaign_activity_3" model="marketing.campaign.activity">
+            <field name="name">Thanks for subscribing to the Open ERP Discovery Day</field>
+            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="email_template_id" ref="email_template_3"/>
+        </record>
+        <record id="marketing_campaign_activity_4" model="marketing.campaign.activity">
+            <field name="name">Propose to buy the Open ERP Book</field>
+           <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="report_directory_id" ref="document_directory_campaign1"/>
+            <field name="type">paper</field>
+            <field name="report_id" ref="mc_crm_lead_demo_report"/>
+        </record>
+        
+        <record id="marketing_campaign_activity_5" model="marketing.campaign.activity">
+            <field name="name">Thanks for buying the Open ERP book</field>
+            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="email_template_id" ref="email_template_4"/>
+        </record>
+        <record id="marketing_campaign_activity_6" model="marketing.campaign.activity">
+            <field name="name">Propose a free technical training to Gold partners</field>
+            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="email_template_id" ref="email_template_5"/>
+        </record>
+        <record id="marketing_campaign_activity_7" model="marketing.campaign.activity">
+            <field name="name">Propose paid training to Silver partners</field>
+            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="email_template_id" ref="email_template_6"/>
+        </record>
+        
+        <record id="marketing_campaign_activity_8" model="marketing.campaign.activity">
+            <field name="name">Propose gold partnership to silver partners</field>
+            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="email_template_id" ref="email_template_7"/>
+        </record>
+        
+         <record id="marketing_campaign_activity_9" model="marketing.campaign.activity">
+            <field name="name">Thanks for subscribing to technical training</field>
+            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+        <field name="email_template_id" ref="email_template_8"/>
+        </record>
+        
+    <!-- Tranisition -->							
 		<record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
 			<field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
 			<field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
 		</record>
-<!-- Segment -->					
+		
+		<record id="marketing_campaign_transition_1" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_2"/>
+        </record>
+        <record id="marketing_campaign_transition_2" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_2"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_3"/>
+        </record>
+        <record id="marketing_campaign_transition_3" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_2"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_4"/>
+        </record>
+        <record id="marketing_campaign_transition_4" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_5"/>
+        </record>
+        <record id="marketing_campaign_transition_5" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_6"/>
+        </record>
+        <record id="marketing_campaign_transition_6" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_7"/>
+        </record>
+        <record id="marketing_campaign_transition_7" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_6"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_9"/>
+        </record>
+        <record id="marketing_campaign_transition_8" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_7"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_8"/>
+        </record>
+        <record id="marketing_campaign_transition_9" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_7"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_9"/>
+        </record>
+        <record id="marketing_campaign_transition_10" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_9"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
+        </record>
+		
+    <!-- Segment -->					
 		<record id="marketing_campaign_segment_bosslistusassociationslist0" model="marketing.campaign.segment">
 			<field eval="time.strftime('%Y-%m-%d %H:%M:%S')" name="date_run"/>
 			<field name="name">BossList US Associations List-0/90</field>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index fb88b6d283d..3e2d7330291 100755
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -29,20 +29,20 @@
                         <field name="condition" colspan="4"/>
                         <newline/>
                         <field name="type" colspan="4"/>
-                        <group colspan="4" attrs="{'invisible':[('type','!=','email')]}" >                
+                        <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')]}" >                
+                        <group colspan="4" attrs="{'invisible':[('type','!=','action')]}" >
                             <field name="server_action_id" attrs="{'required':[('type','=','action')]}" />
                         </group>
-                        <group colspan="4" attrs="{'invisible':[('type','!=','subcampaign')]}" >                
+                        <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>
                         <field name="to_ids" nolabel="1" colspan="4" mode="tree"                  default_get="{'type_id':'activity_from_id','activity_id':active_id or False}">
                              <form string="Out Transitions" >
                                  <field name="activity_from_id" readonly="True"/>
@@ -56,7 +56,7 @@
                                  <field name="interval_nbr"/>
                                  <field name="interval_type"/>
                              </tree>
-                         </field> 
+                         </field>
                          <field name="from_ids" nolabel="1" colspan="4" mode="tree" default_get="{'type_id':'activity_to_id','activity_id':active_id or False}">
                              <form string="In Transitions" >
                                  <field name="activity_from_id"/>
@@ -77,14 +77,14 @@
                         <field name="object_id"/>
                         <field name="start"/>
                         <field name="condition"/>
-                        <field name="variable_cost" select="1"/>                    
+                        <field name="variable_cost" select="1"/>
                         <field name="type"/>
                         <field name="report_id"/>
                          <field name="to_ids"/>
                         <field name="subcampaign_id"/>
                         <field name="subcampaign_segment_id"/>
                     </tree>
-                </field>    
+                </field>
                 <separator string="Status" colspan="4" />
                 <group col="10" colspan="4">
                     <field name="state" readonly="1" select="2" nolabel="1"/>
@@ -121,7 +121,7 @@
                     <field name="name"/>
                     <field name="type"/>
                     <field name="start" invisible="1"/>
-                    <field name="condition"/> 
+                    <field name="condition"/>
                   </node>
                   <arrow object="marketing.campaign.transition" source="activity_from_id" destination="activity_to_id" label="['interval_type']">
                     <field name="activity_from_id"/>
@@ -139,19 +139,19 @@
        <field name="type">search</field>
        <field name="arch" type="xml">
            <search string="Campaigns">
-               <filter icon="terp-marketing" string="Draft" name = "draft" domain="[('state','=','draft')]"/>
-               <filter icon="terp-marketing" string="Running" domain="[('state','=','running')]"/>
+               <filter icon="terp-document-new" string="Draft" name = "draft" domain="[('state','=','draft')]"/>
+               <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
                <separator orientation="vertical"/>
-               <filter icon="terp-marketing" string="Test Mode" name = "test" domain="[('mode','=','test')]"/>
-               <filter icon="terp-marketing" string="Manual Mode" domain="[('mode','=','manual')]"/>
+               <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name = "test" domain="[('mode','=','test')]"/>
+               <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
                <separator orientation="vertical"/>
                <field name="name" select="1"/>
                <field name="object_id" select="1"/>
                <newline/>
-               <group expand="1" string="Group By..." colspan="10" col="12">
-                   <filter string="Object" name="Object" icon="terp-marketing" context="{'group_by':'object_id'}" />
-                   <filter string="State" name="State" icon="terp-marketing" context="{'group_by':'state'}" />
-               </group>   
+               <group expand="0" string="Group By..." colspan="10" col="12">
+                   <filter string="Object" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
+                   <filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
+               </group>
            </search>
        </field>
    </record>
@@ -165,12 +165,12 @@
         <field name="view_id" ref="view_marketing_campaign_tree"/>
        <field name="context">{'group_by': [], 'search_default_draft': 1, 'search_default_test': 1}</field>
        <field name="search_view_id" ref="view_marketing_campaign_search"/>
-        
+
     </record>
 
 	<menuitem name="Campaigns" id="menu_marketing_campaign" parent="marketing.marketing_menu"/>
     <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="10" />
-		        
+
     <!--
     ======================
     Marketing Segments
@@ -232,22 +232,22 @@
        <field name="type">search</field>
        <field name="arch" type="xml">
            <search string="Segments">
-               <filter icon="terp-marketing" string="Draft" name="draft" domain="[('state','=','draft')]"/>
-               <filter icon="terp-marketing" string="Running" domain="[('state','=','running')]"/>
+               <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
+               <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
                <separator orientation="vertical"/>
-               <filter icon="terp-marketing" string="Create Date" name="create_date" domain="[('sync_mode','=','create_date')]"/>
-               <filter icon="terp-marketing" string="Write Date" domain="[('sync_mode','=','write_date')]"/>
+               <filter icon="terp-go-month" string="Create Date" name="create_date" domain="[('sync_mode','=','create_date')]"/>
+               <filter icon="terp-go-month" string="Write Date" domain="[('sync_mode','=','write_date')]"/>
                <separator orientation="vertical"/>
                <field name="name" select="1"/>
                <field name="object_id" select="1"/>
                <field name="campaign_id" select="1"/>
                <field name="date_run" select="1"/>
                <newline/>
-               <group expand="1" string="Group By..." colspan="10" col="12">
-                   <filter string="Campaign" name="Campaign" icon="terp-marketing" context="{'group_by':'campaign_id'}" />
-                   <filter string="Date Run" name="Date Run" icon="terp-marketing" context="{'group_by':'date_run'}" />
-                   <filter string="State" name="State" icon="terp-marketing" context="{'group_by':'state'}" />
-               </group> 
+               <group expand="0" string="Group By..." colspan="10" col="12">
+                   <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
+                   <filter string="Date Run" name="Date Run" icon="terp-go-month" context="{'group_by':'date_run'}" />
+                   <filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
+               </group>
            </search>
        </field>
    </record>
@@ -264,7 +264,7 @@
     </record>
 
     <menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign" action="action_marketing_campaign_segment_form" sequence="20" />
-        
+
     <!--
     ======================
     Marketing Activities
@@ -283,20 +283,20 @@
                 <field name="object_id" readonly="True"/>
                 <newline/>
                 <field name="type"/>
-                <group colspan="4" attrs="{'invisible':[('type','!=','email')]}" >                
+                <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')]}" >                
+                <group colspan="4" attrs="{'invisible':[('type','!=','action')]}" >
                     <field name="server_action_id" attrs="{'required':[('type','=','action')]}" />
                 </group>
-                <group colspan="4" attrs="{'invisible':[('type','!=','subcampaign')]}" >                
+                <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>
                 <field name="to_ids" nolabel="1" colspan="4" mode="tree"                  default_get="{'type_id':'activity_from_id','activity_id':active_id or False}">
                      <form string="Out Transitions" >
                          <field name="activity_from_id" readonly="True"/>
@@ -310,7 +310,7 @@
                          <field name="interval_nbr"/>
                          <field name="interval_type"/>
                      </tree>
-                 </field> 
+                 </field>
                  <field name="from_ids" nolabel="1" colspan="4" mode="tree" default_get="{'type_id':'activity_to_id','activity_id':active_id or False}">
                      <form string="In Transitions" >
                          <field name="activity_from_id"/>
@@ -357,9 +357,9 @@
         <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" /-->
-    
+
     <!--
     ======================
     Marketing Workitems
@@ -407,22 +407,22 @@
        <field name="type">search</field>
        <field name="arch" type="xml">
            <search string="Workitems">
-               <filter icon="terp-marketing" string="To Do" name = "todo" domain="[('state','=','todo')]"/>
-               <filter icon="terp-marketing" string="In Progress" domain="[('state','=','inprogress')]"/>
-               <filter icon="terp-marketing" string="Exception" domain="[('state','=','exception')]"/>
+               <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"/>
                <field name="object_id" select="1"/>
                <field name="partner_id" select="1"/>
                <field name="date" select="1"/>
                <newline/>
-               <group expand="1" string="Group By..." colspan="10" col="12">
-                   <filter string="Segment" name="Segment" icon="terp-marketing" context="{'group_by':'segment_id'}" />
-                   <filter string="Activity" name="Activity" icon="terp-marketing" context="{'group_by':'activity_id'}" />
+               <group expand="0" string="Group By..." colspan="10" col="12">
+                   <filter string="Segment" name="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
+                   <filter string="Activity" name="Activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
                    <separator orientation="vertical"/>
-                   <filter string="Date" name="Date" icon="terp-marketing" context="{'group_by':'date'}" />
-                   <filter string="State" name="State" icon="terp-marketing" context="{'group_by':'state'}" />
-               </group> 
+                   <filter string="Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}" />
+                   <filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
+               </group>
            </search>
        </field>
    </record>
@@ -435,10 +435,10 @@
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_marketing_campaign_workitem_tree"/>
         <field name="search_view_id" ref="view_marketing_campaign_workitem_search"/>
-        <field name="context">{'group_by': [], 'search_default_todo': 1}</field>        
+        <field name="context">{'group_by': [], 'search_default_todo': 1}</field>
     </record>
 
     <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="30" groups="base.group_extended"/>
-    
+
     </data>
 </openerp>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 9963075dce6..d7827033809 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -30,15 +30,15 @@
         <field name="arch" type="xml">
             <search string="Marketing Reports">
            		<group>
-	            	<filter icon="terp-marketing"
+	            	<filter icon="terp-go-year"
 	                    	string="This Year"
 	                    	domain="[('year','=',time.strftime('%%Y'))]"/>
-	                <filter icon="terp-marketing"
+	                <filter icon="terp-go-month"
 	                    	string="This Month"
 	                    	domain="[('month','=',time.strftime('%%m'))]"/>
 	                <separator orientation="vertical"/>
-		            <filter icon="terp-marketing" 
-		            		string="Date" 
+		            <filter icon="terp-go-month"
+		            		string="Date"
 		            		domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
 	                <separator orientation="vertical"/>
 					<field name="campaign_id"/>
@@ -48,14 +48,14 @@
 					<field name="country_id"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Campaign" name="Campaign" icon="terp-marketing" context="{'group_by':'campaign_id'}" />
-                    <filter string="Segment" name ="Segment" icon="terp-marketing" context="{'group_by':'segment_id'}" />
-                    <filter string="Partner" icon="terp-marketing" context="{'group_by':'partner_id'}"/>
+                <group expand="0" string="Group By..." colspan="10" col="12">
+                    <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
+                    <filter string="Segment" name ="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-marketing" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-marketing" context="{'group_by':'year'}"/>
-                </group>                
+                    <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>
@@ -68,9 +68,9 @@
         <field name="context">{'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1}</field>
         <field name="search_view_id" ref="view_campaign_analysis_search"/>
     </record>
-    
+
 	<menuitem name="Reporting" id="menu_marketing_reporting" parent="marketing.marketing_menu"/>
     <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="menu_marketing_reporting" sequence="40"/>
-		
+
 	</data>
 </openerp>
diff --git a/addons/marketing_campaign_mailchimp/__init__.py b/addons/marketing_campaign_mailchimp/__init__.py
new file mode 100644
index 00000000000..0f354314327
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/__init__.py
@@ -0,0 +1,24 @@
+# -*- 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 marketing_campaign_mailchimp
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/marketing_campaign_mailchimp/__openerp__.py b/addons/marketing_campaign_mailchimp/__openerp__.py
new file mode 100644
index 00000000000..bd614607b97
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/__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" : "",
+    "version" : "1.1",
+    "depends" : ['marketing_campaign'],
+    "author" : "Tiny",
+    "category": 'Generic Modules/Marketing',
+    "description": """
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': [
+        'marketing_campaign_mailchimp_view.xml',
+    ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
new file mode 100644
index 00000000000..a1c3162cee2
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+import urllib2
+import simplejson as json
+
+mailchimp_url = 'http://%s.api.mailchimp.com/1.2'
+
+class marketing_campaign_mailchimp_account(osv.osv): #{{{
+    _name = "marketing.campaign.mailchimp.account"
+    
+    _columns = {
+            'name': fields.char('Account Name', size=64),
+            'username': fields.char('Username', size=64, required=True),
+            'password': fields.char('Password', size=64, required=True),
+            'apikey': fields.char('API Key', size=128),
+            'data_center': fields.selection([('us1', 'US1'), ('us2', 'US2'), 
+                                            ('uk1', 'UK1')], 'Data Center'),
+            'state': fields.selection([('draft', 'Draft'), ('approved', 'Approved'), 
+                           ('cancelled', 'Cancelled')], 'State', readonly=True)
+        }
+    
+    _defaults = {
+            'state': lambda *a: 'draft'
+        }
+    
+    def get_response(self, cr, uid, mailchimp_id, method, params={}):
+        mailchimp_account = self.browse(cr, uid, mailchimp_id)
+        params['output'] = 'json'
+        if method == 'login':
+                params['username'] = mailchimp_account.username
+                params['password'] = mailchimp_account.password
+        else :
+                params['apikey'] = mailchimp_account.apikey
+        params = '&'.join(map(lambda x : '%s=%s' %(x, params[x]), params))
+        url = mailchimp_url%mailchimp_account.data_center+ '/?method=%s'%method
+        req = urllib2.Request(url, params)
+        handle = urllib2.urlopen(req)
+        response = json.loads(handle.read())
+        return response 
+    
+    def button_approve(self, cr, uid, ids, context):
+        acc_obj = self.browse(cr, uid, ids)[0]
+        vals = {}
+        if not acc_obj.apikey:
+            method = 'login'
+        else:
+            method = 'ping'
+        response = self.get_response(cr, uid, acc_obj.id, method)
+        if 'error' not in response:
+            if method == 'login' :
+                vals['apikey'] = response
+            vals['state'] = 'approved'
+            self.write(cr, uid, ids, vals)
+        else : 
+            raise osv.except_osv('Error!!!',
+                            "Can't approved accoutnt : %s"%response['error'])
+        return True
+    
+    def button_cancel(self, cr, uid, ids, context):
+        self.write(cr, uid, ids, {'state': 'cancelled'})
+        return True
+    
+marketing_campaign_mailchimp_account() #}}}
+
+#class marketing_campaign_mailchimp_list(osv.osv_memory): #{{{
+#    _name = "marketing.campaign.mailchimp.list"
+#    
+#    _columns = {
+#            'name': fields.char('Name', size=64),
+#            'mailchimp_account_id': fields.many2one('marketing.campaign.mailchimp.account', 'Account'),
+#            'list_id': fields.char('List Id', size=64,),
+#        }
+#    
+#    _defaults = {
+#            'state': lambda *a: 'draft'
+#        }
+#    
+#marketing_campaign_mailchimp_list() #}}}
+
+class marketing_campaign_segment(osv.osv): #{{{
+    _inherit = "marketing.campaign.segment"
+    
+    _columns = {
+            'synchro': fields.boolean('Mailchimp Synchro'),
+            'mailchimp_account_id': fields.many2one(
+                            'marketing.campaign.mailchimp.account', 'Account'),
+            'mailchimp_list': fields.char('List', size=64),
+        }
+    
+    def onchange_mailchimp(self, cr, uid, ids, mailchimp_account_id):
+        if mailchimp_account_id:
+            return {'value':{'mailchimp_list':''}}
+        return {'value':{}}
+    
+    def onchange_mailchimp_list(self, cr, uid, ids, mailchimp_account_id, 
+                                                                mailchimp_list):
+        if mailchimp_account_id and mailchimp_list:
+            lists = self.pool.get('marketing.campaign.mailchimp.account').get_response(cr,
+                                             uid, mailchimp_account_id, 'lists')
+            list_names = [list['name'] for list in lists]
+            if mailchimp_list not in list_names:
+                raise osv.except_osv('Error!!!',"Lists doesn't exists")
+        else :
+            return {}
+        return {'value':{}}
+marketing_campaign_segment() #}}}
+
+
+
+# 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
new file mode 100644
index 00000000000..7a84f17311d
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    <!--
+    ================================================================
+    Marketing Segments Inherited View - mailchimp
+    ================================================================
+    -->
+
+    <record model="ir.ui.view" id="view_marketing_campaign_segment_form_inherit">
+        <field name="name">marketing.campaign.segment.form.inherit</field>
+        <field name="model">marketing.campaign.segment</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="marketing_campaign.view_marketing_campaign_segment_form"/>
+        <field name="arch" type="xml">
+            <field name="date_done" position="after">
+                <separator string="Mailchimp Synchronization" colspan="4"/>
+                <field name="synchro"/>
+                <group colspan="2" attrs="{'invisible':[('synchro','!=',True)]}">
+                    <field name="mailchimp_account_id" attrs="{'required':[('synchro','=',True)]}" domain="[('state','=','approved')]" on_change="onchange_mailchimp(mailchimp_account_id)"/>
+                    <field name="mailchimp_list" attrs="{'required':[('synchro','=',True)]}" on_change="onchange_mailchimp_list(mailchimp_account_id,mailchimp_list)"/>
+                </group>
+            </field>
+        </field>
+    </record>
+
+
+    <!--
+    ================================================================
+    Mailchimp Account
+    ================================================================
+    -->
+
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
+    <menuitem name="Mailchimps" id="menu_action_mailchimp" parent="base.menu_tools" />
+
+    <record model="ir.ui.view" id="view_marketing_campaign_mailchimp_account_tree">
+        <field name="name">marketing.campaign.mailchimp.account.tree</field>
+        <field name="model">marketing.campaign.mailchimp.account</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="All Accounts">
+                <field name="name"/>
+                <field name="username" />
+                <field name="data_center"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_marketing_campaign_mailchimp_account_form">
+        <field name="name">marketing.campaign.mailchimp.account.form</field>
+        <field name="model">marketing.campaign.mailchimp.account</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Account">
+                <field name="name" select="1"/>
+                <newline/>
+                <field name="username" select="1"/>
+                <field name="password" select="1" password="True"/>
+                <field name="apikey" />
+                <field name="data_center" required="1"/>
+                <separator string="Status" colspan="4"/>
+                <group col="13" colspan="4">
+                    <field name="state" nolabel="1"/>
+                    <button name="button_approve" string="Approve" states="draft" type="object"/>
+                    <button name="button_cancel" string="Cancel" states="draft,approved" type="object"/>
+                </group>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_marketing_campaign_mailchimp_account">
+        <field name="name">All Mailchimp Accounts</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">marketing.campaign.mailchimp.account</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_marketing_campaign_mailchimp_account_tree"/>
+    </record>
+
+    <menuitem id="menu_action_marketing_campaign_mailchimp_account" parent="menu_action_mailchimp" action="action_marketing_campaign_mailchimp_account" sequence="40"/>
+
+    </data>
+</openerp>
diff --git a/addons/membership/i18n/zh_CN.po b/addons/membership/i18n/zh_CN.po
index 3937d1ead5a..5f3a087e093 100644
--- a/addons/membership/i18n/zh_CN.po
+++ b/addons/membership/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:31+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-05-30 06:24+0000\n"
+"Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-05-31 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
@@ -96,7 +96,7 @@ msgstr "错误!你不能创建递归的账户"
 #. module: membership
 #: constraint:account.invoice:0
 msgid "Error: BVR reference is required."
-msgstr ""
+msgstr "错误：需要BVR参照"
 
 #. module: membership
 #: field:product.product,membership_date_from:0
@@ -294,7 +294,7 @@ msgstr "准会员"
 #. module: membership
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "错误：无效的Bvr号（错误的检验和）"
 
 #. module: membership
 #: field:res.partner,membership_cancel:0
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 00dde266b4b..2ba81d2c1ee 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -116,14 +116,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <field name="category_id" position="after">
-                    <field name="membership_state" select="1">
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'paid')]" help="Paid Members"/>
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'free')]" help="Free Members"/>
-                        <filter icon="terp-partner" domain="[('associate_member', '!=', False), ('membership_state', '!=', 'none')]" help="Associated Members"/>
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'invoiced')]" help="Invoiced Members"/>
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'waiting')]" help="Future Members"/>
-                        <filter icon="terp-partner" domain="[('membership_state', '=', 'old')]" help="Old Members"/>
-                    </field>
+                    <group col="4" colspan="6">
+                        <filter string="Members" icon="terp-personal" domain="[]" context="{'group_by':'membership_state'}"/>
+                        <separator orientation="vertical"/>
+                        <field name="membership_state"/>
+                    </group>
                </field>
             </field>
         </record>
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index fe4fb6b8348..c3929df10af 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -21,6 +21,9 @@
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
       			<attribute name='string'></attribute>
   		  </xpath>
+  		  <xpath expr="//button[@string='Install Modules']" position="attributes">
+                   <attribute name="string">Configure</attribute>
+          </xpath>
           <group colspan="8">
             <field name="stock_location"/>
             <field name="mrp_jit"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 15ed872391f..bcda66e8679 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -296,9 +296,9 @@
 	                    <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By" colspan="4" col="8" groups="base.group_extended">
-                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Routing" icon="terp-mrp" domain="[]" context="{'group_by':'routing_id'}"/>
+                    <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'}"/>
                    </group>
                 </search>
             </field>
@@ -655,21 +655,21 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                    <group col='9' colspan='4'>
-                       <filter icon="terp-mrp" string="Draft"
+                       <filter icon="terp-document-new" string="Draft"
                            domain="[('state','=','draft')]"
                            help="Non confirmed manufacturing orders"/>
-                       <filter icon="terp-mrp" string="Current" name="Current"
+                       <filter icon="terp-check" string="Current" name="Current"
                            default="1"
                            domain="[('state','in',('confirmed','ready','exception'))]"
                            help="Manufacturing Orders which are waiting for raw materials"/>
-                       <filter icon="terp-mrp" string="Ready"
+                       <filter icon="terp-camera_test" string="Ready"
                            domain="[('state','=','ready')]"
                            help="Manufacturing Orders which are ready to produce" />
-                       <filter icon="terp-mrp" string="In Production"
+                       <filter icon="terp-check" string="In Production"
                            domain="[('state','=','in_production')]"
                            help="Manufacturing Orders which are in production" />
                        <separator orientation="vertical"/>
-                       <filter icon="terp-mrp" string="Late"
+                       <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"/>
@@ -679,12 +679,12 @@
                        <field name="origin"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By" colspan="10" col="8">
-                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Routing" icon="terp-mrp" domain="[]" context="{'group_by':'routing_id'}" groups="base.group_extended"/>
+                    <group expand="0" string="Group By" colspan="10" col="8">
+                        <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'}"/>
+                        <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
-                        <filter string="Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/mrp/report/mrp_production_order.py b/addons/mrp/report/mrp_production_order.py
index d754d6a50ad..4fffbdf1689 100644
--- a/addons/mrp/report/mrp_production_order.py
+++ b/addons/mrp/report/mrp_production_order.py
@@ -32,11 +32,12 @@ class mrp_production_order(osv.osv):
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
         'day': fields.char('Day',size=64,readonly=True),
         'origin': fields.char('Source Document', size=64),
-        'nbr': fields.integer('# of Orders', readonly=True),
+        'nbr': fields.integer('# of Lines', readonly=True),
         'products_to_consume': fields.integer('Products to Consume', readonly=True),
         'consumed_products': fields.integer('Consumed Products', readonly=True),
         'date': fields.date('Date', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
+        'product_id2': fields.many2one('product.product', 'Product Consumed', readonly=True),
         'product_qty': fields.float('Product Qty', readonly=True),
         'state': fields.selection([('draft','Draft'),
                                    ('picking_except', 'Picking Exception'),
@@ -74,11 +75,12 @@ class mrp_production_order(osv.osv):
                      to_char(s.create_date, 'YYYY') as year,
                      to_char(s.create_date, 'MM') as month,
                      to_char(s.create_date, 'YYYY-MM-DD') as day,
-                     l.product_id as product_id,
+                     s.product_id as product_id,
+                     l.product_id as product_id2,
                      l.product_uom,
                      sum(l.product_qty * u.factor) as product_qty,
                      s.company_id as company_id,
-                     count(*) as nbr,
+                     (select 1) as nbr,
                      (select sum(sm.product_qty) from stock_move as sm
                         left join mrp_production_move_ids as mv on (sm.id=mv.move_id)
                         left join mrp_production_product_line as ll on (ll.production_id=mv.production_id)
@@ -111,6 +113,7 @@ class mrp_production_order(osv.osv):
                      to_char(s.create_date, 'YYYY-MM-DD'),
                      to_date(to_char(s.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY'),
                      l.product_id,
+                     s.product_id,
                      l.product_uom,
                      s.id,
                      l.id,
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 5663ef93210..61aff34bf91 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -11,20 +11,20 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Production">
-					<field name="date_planned"/>
-					<field name="origin"/>
-					<field name="bom_id" />
-					<field name="product_id"/>
-					<field name="product_qty" sum='Product Qty'/>
-					<field name="nbr" string="#Production Orders" sum='#Production Orders'/>
-					<field name="state"/>
-					<field name="routing_id" invisible="1"/>
-					<field name="picking_id" invisible="1"/>
-                    <field name="priority" invisible="1"/>
-                    <field name="year" invisible="1" />
-					<field name="month" invisible="1"/>
-					<field name="location_src_id" invisible="1"/>
-					<field name="location_dest_id" invisible="1"/>
+                      <field name="date_planned"/>
+                      <field name="bom_id" invisible="1"/>
+                      <field name="product_id" invisible="1"/>
+                      <field name="product_qty" sum='Product Qty'/>
+                      <field name="nbr" string="#Line Orders" sum='#Line Orders'/>
+                      <field name="state" invisible="1"/>
+                      <field name="picking_id" invisible="1"/>
+                      <field name="priority" invisible="1"/>
+                      <field name="day" invisible="1" />
+                      <field name="month" invisible="1" />
+                      <field name="year" invisible="1" />
+                      <field name="location_src_id" invisible="1"/>
+                      <field name="location_dest_id" invisible="1"/>
+                      <field name="company_id" groups="base.group_multi_company" invisible="1"/>
 				</tree>
             </field>
         </record>
@@ -48,50 +48,57 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter string="This Year" icon="terp-mrp" domain="[('year','=',time.localtime()[0])]" default="1" />
-						<filter string="This Month" icon="terp-mrp" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
-                        <separator orientation="vertical"/>
-						<filter string="Current" icon="terp-mrp" domain="[('state','in',('open','draft'))]"/>
-						<separator orientation="vertical"/>
-						<field name="origin"/>
-						<field name="date_planned"/>
+	                    <filter icon="terp-go-year" string="  365 Days  "
+	                    	    domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+	                    	    help="Production performed in last 365 Days"/>
+	                    <filter icon="terp-go-month" string="   30 Days   "
+	                    		name="month"
+	                    		domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                    		help="Production performed in last 30 days"/>
+		                <filter icon="terp-go-week"
+	                            string="    7 Days    "
+	                            separator="1"
+	                            domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+	                            help="Production during last 7 days"/>
+                      <separator orientation="vertical"/>
+                        <filter string="Current" icon="terp-check" domain="[('state','in',('open','draft'))]"/>
+                        <filter icon="terp-check" string="In Production" domain="[('state','=','in_production')]"/>
+                        <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                      <separator orientation="vertical"/>
+                        <field name="location_src_id" />
+                        <field name="location_dest_id" />
                    </group>
                    <newline/>
 
-                   <group expand="1" string="Group By...">
-                    	<filter string="Source Location" icon="terp-mrp" context="{'group_by':'location_src_id'}"/>
-                    	<filter string="Destination Location" icon="terp-mrp" context="{'group_by':'location_dest_id'}"/>
-                    	<filter string="Picking" icon="terp-mrp" context="{'group_by':'picking_id'}"/>
-                    	<separator orientation="vertical"/>
-                        <filter string="Routing" icon="terp-mrp" context="{'group_by':'routing_id'}"/>
-                        <filter string="Product" name="Product" icon="terp-mrp" context="{'group_by':'product_id'}" />
-                        <filter string="State" icon="terp-mrp" context="{'group_by':'state'}"/>
+                   <group expand="0" string="Group By...">
+                    	<filter string="Raw Material Location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_src_id'}"/>
+                    	<filter string="Finished Products Location" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_dest_id'}"/>
                     	<separator orientation="vertical"/>
+                        <filter string="Product" name="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" />
                     	<filter string="BOM" icon="terp-mrp" context="{'group_by':'bom_id'}"/>
-                    	<filter string="Month" icon="terp-mrp" context="{'group_by':'month'}"/>
-                    	<filter string="Year" icon="terp-mrp" context="{'group_by':'year'}"/>
+                    	<separator orientation="vertical"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    	<separator orientation="vertical"/>
+                    	<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
+                    	<separator orientation="vertical"/>
+                        <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    	<filter string="Month" name="terp-go-month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                    </group>
                     <newline/>
 	                <group expand="0" string="Extended options..." groups="base.group_extended">
-	                    <filter icon="terp-mrp" string="Draft" domain="[('state','=','draft')]"/>
-	                    <filter icon="terp-mrp" string="Picking Exception" domain="[('state','=','picking_except')]"/>
-	                    <separator orientation="vertical"/>
-	                    <filter icon="terp-mrp" string="Waiting Goods" domain="[('state','=','confirmed')]"/>
-	                    <filter icon="terp-mrp" string="Ready to Produce" domain="[('state','=','ready')]"/>
-	                    <separator orientation="vertical"/>
-	                    <filter icon="terp-mrp" string="In Production" domain="[('state','=','in_production')]"/>
-	                    <filter icon="terp-mrp" string="Done" domain="[('state','=','done')]"/>
-	                    <filter icon="terp-mrp" string="Cancelled" domain="[('state','=','cancel')]"/>
-	                    <newline/>
-	                    <filter icon="terp-mrp" string="Not urgent" domain="[('priority','=','0')]"/>
-	                    <filter icon="terp-mrp" string="Normal" domain="[('priority','=','1')]"/>
-	                    <separator orientation="vertical"/>
-	                    <filter icon="terp-mrp" string="Urgent" domain="[('priority','=','2')]"/>
-	                    <filter icon="terp-mrp" string="Very Urgent" domain="[('priority','=','3')]"/>
+	                    <filter icon="terp-emblem-important" string="Picking Exception" domain="[('state','=','picking_except')]"/>
+	                    <filter icon="terp-gtk-media-pause" string="Waiting Goods" domain="[('state','=','confirmed')]"/>
+	                    <filter icon="terp-camera_test" string="Ready to Produce" domain="[('state','=','ready')]"/>
 	                    <separator orientation="vertical"/>
+                      <field name="priority"/>
+                      <separator orientation="vertical"/>
+                      <field name="company_id" groups="base.group_multi_company"/>
+                      <newline/>
 	                    <field name="date_start"/>
-						<field name="date_finnished"/>
-	                </group>                   
+                      <field name="date_planned"/>
+                      <field name="date_finnished"/>
+	                </group>
                   </search>
             </field>
         </record>
@@ -102,7 +109,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_mrp_production_order_tree"/>
             <field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
-          <field name="context">{'search_default_Product': 1}</field>
+          <field name="context">{'search_default_Product': 1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field>
 
         </record>
 
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 37e90a995b4..a5c6564644e 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -96,10 +96,10 @@
                 		<field name="production_id"/>
                 	</group>
                 	<newline/>
-                    <group expand="1" string="Group By" colspan="10" col="8" groups="base.group_extended">
-                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product'}"/>
-                        <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
+                    <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="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/mrp_procurement/mrp_procurement.py b/addons/mrp_procurement/mrp_procurement.py
index ceaefb4c4db..bb18326af07 100644
--- a/addons/mrp_procurement/mrp_procurement.py
+++ b/addons/mrp_procurement/mrp_procurement.py
@@ -200,7 +200,7 @@ class mrp_procurement(osv.osv):
         return False
 
     #
-    # Return the quantity of product shipped/produced/served, wich may be
+    # Return the quantity of product shipped/produced/served, which may be
     # different from the planned quantity
     #
     def quantity_get(self, cr, uid, id, context={}):
@@ -262,8 +262,9 @@ class mrp_procurement(osv.osv):
         user = self.pool.get('res.users').browse(cr, uid, uid)
         for procurement in self.browse(cr, uid, ids):
             if procurement.product_id.product_tmpl_id.supply_method <> 'produce':
-                if procurement.product_id.seller_ids:
-                    partner = procurement.product_id.seller_ids[0].name
+                partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  procurement.product_id.seller_ids if partner_id])
+                if partner_list:
+                    partner = partner_list and partner_list[0] and partner_list[0][1] and partner_list[0][1].name or False
                     if user.company_id and user.company_id.partner_id:
                         if partner.id == user.company_id.partner_id.id:
                             return True
@@ -288,7 +289,9 @@ class mrp_procurement(osv.osv):
             if not procurement.product_id.seller_ids:
                 cr.execute('update mrp_procurement set message=%s where id=%s', (_('No supplier defined for this product !'), procurement.id))
                 return False
-            partner = procurement.product_id.seller_ids[0].name
+            partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  procurement.product_id.seller_ids if partner_id and partner_id.sequence])
+            partner = partner_list and partner_list[0] and partner_list[0][1] and partner_list[0][1].name or False
+
             if user.company_id and user.company_id.partner_id:
                 if partner.id == user.company_id.partner_id.id:
                     return False
diff --git a/addons/mrp_procurement/mrp_procurement_view.xml b/addons/mrp_procurement/mrp_procurement_view.xml
index 1defa214754..7345dc94f93 100644
--- a/addons/mrp_procurement/mrp_procurement_view.xml
+++ b/addons/mrp_procurement/mrp_procurement_view.xml
@@ -86,12 +86,12 @@
             <field name="arch" type="xml">
                 <search string="Search Procurement">
                     <group col='10' colspan='4'>
-                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
-                       <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
-                       <filter icon="terp-mrp" string="Late"
+                       <filter icon="terp-check" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
+                       <filter icon="terp-emblem-important" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
+                       <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
                            help="Procurement started late" />
-                       <filter icon="terp-mrp" string="To Fix" domain="[('state', '=', 'exception'),('message','=','')]" help="Procurement Orders with exceptions and without message"/>
+                       <filter icon="terp-gtk-go-back-rtl" string="To Fix" domain="[('state', '=', 'exception'),('message','=','')]" help="Procurement Orders with exceptions and without message"/>
                        <separator orientation="vertical"/>
                        <field name="name"/>
                        <field name="origin"/>
@@ -100,11 +100,11 @@
                        <field name="state" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By" colspan="4" col="8" groups="base.group_extended">
-                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Reason" icon="terp-mrp" domain="[]" context="{'group_by':'name'}"/>
-                        <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
-                    	<filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
+                    <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="Reason" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'name'}"/>
+                        <filter string="Scheduled Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
+                    	<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -191,9 +191,9 @@
                         <field name="product_id"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="10">
-                        <filter string="Warehouse" icon="terp-stock" domain="[]"  context="{'group_by':'warehouse_id'}"/>
-                        <filter string="Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="10">
+                        <filter string="Warehouse" icon="terp-go-home" domain="[]"  context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Location" icon="terp-go-home" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 47e80be3e31..4c655099386 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -183,10 +183,10 @@
                     <field name="product_id" />
               	</group>
               	<newline/>
-                  <group expand="1" string="Group By" colspan="10" col="8" groups="base.group_extended">
-                      <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
-                      <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
-                      <filter string="Partner" icon="terp-mrp" domain="[]" context="{'group_by':'partner_id'}"/>
+                  <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'}"/>
+                      <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                   </group>
              </search>
           </field>
diff --git a/addons/olap_crm/i18n/id.po b/addons/olap_crm/i18n/id.po
new file mode 100644
index 00000000000..79dd628d9a7
--- /dev/null
+++ b/addons/olap_crm/i18n/id.po
@@ -0,0 +1,31 @@
+# Indonesian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-05-28 10:44+0000\n"
+"Last-Translator: Abdul Munif Hanafi <Unknown>\n"
+"Language-Team: Indonesian <id@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_crm
+#: model:ir.module.module,description:olap_crm.module_meta_information
+msgid ""
+"\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+
+#. module: olap_crm
+#: model:ir.module.module,shortdesc:olap_crm.module_meta_information
+msgid "olap_crm"
+msgstr "olap_crm"
diff --git a/addons/olap_extract/i18n/id.po b/addons/olap_extract/i18n/id.po
new file mode 100644
index 00000000000..80dc876351d
--- /dev/null
+++ b/addons/olap_extract/i18n/id.po
@@ -0,0 +1,56 @@
+# Indonesian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-05-28 10:43+0000\n"
+"Last-Translator: Abdul Munif Hanafi <Unknown>\n"
+"Language-Team: Indonesian <id@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_extract
+#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
+msgid "olap_extract"
+msgstr "olap_extract"
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,ok:0
+msgid "OK"
+msgstr "Setuju"
+
+#. module: olap_extract
+#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
+msgid "Olap Extract"
+msgstr ""
+
+#. module: olap_extract
+#: model:ir.module.module,description:olap_extract.module_meta_information
+msgid ""
+"\n"
+"    Extracts the schema structure.\n"
+"    "
+msgstr ""
+
+#. module: olap_extract
+#: wizard_field:olap.extract.schema,init,module_name:0
+msgid "Module Name"
+msgstr "Nama Modul"
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,end:0
+msgid "Cancel"
+msgstr "Batal"
+
+#. module: olap_extract
+#: wizard_view:olap.extract.schema,init:0
+msgid "New Module Name"
+msgstr "Nama Modul Baru"
diff --git a/addons/point_of_sale/i18n/ru.po b/addons/point_of_sale/i18n/ru.po
index fd1eda0c478..a7b04087207 100644
--- a/addons/point_of_sale/i18n/ru.po
+++ b/addons/point_of_sale/i18n/ru.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-09-08 15:56+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
+"PO-Revision-Date: 2010-05-30 08:32+0000\n"
+"Last-Translator: g0nz1k12 <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-04-17 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-05-31 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -142,7 +142,7 @@ msgstr ""
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+msgstr "Тел : + 32 (0) 2 231 04 35"
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
@@ -268,7 +268,7 @@ msgstr "Скидка"
 #: rml:pos.invoice:0
 #: rml:pos.receipt:0
 msgid "Fax :"
-msgstr ""
+msgstr "Факс :"
 
 #. module: point_of_sale
 #: wizard_view:pos.scan_product,init:0
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index ef8ae334810..62b15db0234 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -153,19 +153,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-sale" string="Running" domain="[('state','in',('payment','advance'))]"/>
+                    <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-check" string="Running" domain="[('state','in',('payment','advance'))]"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
                     <field name="partner_id" select="1"/>
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="11" col="11" groups="base.group_extended">
-                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
-                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                        <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/process/i18n/hr.po b/addons/process/i18n/hr.po
index 1c615bec606..3ddf32b0cdd 100644
--- a/addons/process/i18n/hr.po
+++ b/addons/process/i18n/hr.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-03-22 00:55+0000\n"
+"PO-Revision-Date: 2010-06-06 23:26+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -21,7 +21,7 @@ msgstr ""
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Node"
-msgstr ""
+msgstr "Procesni čvor"
 
 #. module: process
 #: constraint:ir.model:0
@@ -138,7 +138,7 @@ msgstr "ID Radnje"
 #. module: process
 #: view:process.transition:0
 msgid "Process Transition"
-msgstr "Prijelaz Procesa"
+msgstr "Promjena Procesa"
 
 #. module: process
 #: model:ir.model,name:process.model_process_condition
@@ -150,7 +150,7 @@ msgstr "Uvjet"
 #. module: process
 #: selection:process.transition.action,state:0
 msgid "Dummy"
-msgstr "Dummy"
+msgstr "Prazan"
 
 #. module: process
 #: constraint:ir.ui.view:0
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index 0bbce3e645b..fdbd15cd884 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -234,7 +234,7 @@ msgstr "Produit stockable"
 #. module: product
 #: model:product.category,name:product.product_category_services
 msgid "Services"
-msgstr "Aire de repos"
+msgstr "Services"
 
 #. module: product
 #: help:product.template,list_price:0
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 604c2b75324..634bb9da109 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -97,6 +97,21 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="product_pricelist_view_search">
+            <field name="name">product.pricelist.search</field>
+            <field name="model">product.pricelist</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Products Price Search">
+                    <field name="name" />
+                    <field name="type"/>
+                    <field name="currency_id"/>
+                    <field name="active" />
+                </search>
+            </field>
+        </record>
+        
+
         <record id="product_pricelist_view_tree" model="ir.ui.view">
             <field name="name">product.pricelist.tree</field>
             <field name="model">product.pricelist</field>
@@ -145,6 +160,7 @@
             <field name="res_model">product.pricelist</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="product_pricelist_view_search" />
         </record>
         <menuitem
             action="product_pricelist_action2" id="menu_product_pricelist_action2"
diff --git a/addons/product/product.py b/addons/product/product.py
index 18c9e6ded8d..eddbd992874 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -245,7 +245,8 @@ class product_template(osv.osv):
         result = {}
         for product in self.browse(cr, uid, ids, context):
             if product.seller_ids:
-                result[product.id] = product.seller_ids[0].delay
+                partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  product.seller_ids if partner_id and partner_id.sequence])
+                result[product.id] = partner_list and partner_list[0] and partner_list[0][1] and partner_list[0][1].delay or False
             else:
                 result[product.id] = 1
         return result
@@ -446,9 +447,9 @@ class product_product(osv.osv):
         'outgoing_qty': fields.function(_product_outgoing_qty, method=True, type='float', string='Outgoing'),
         'price': fields.function(_product_price, method=True, type='float', string='Pricelist', digits_compute=dp.get_precision('Sale Price')),
         'lst_price' : fields.function(_product_lst_price, method=True, type='float', string='List Price', digits_compute=dp.get_precision('Sale Price')),
-        'code': fields.function(_product_code, method=True, type='char', string='Code'),
+        'code': fields.function(_product_code, method=True, type='char', string='Reference'),
         'partner_ref' : fields.function(_product_partner_ref, method=True, type='char', string='Customer ref'),
-        'default_code' : fields.char('Code', size=64),
+        'default_code' : fields.char('Reference', size=64),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the product without removing it."),
         'variants': fields.char('Variants', size=64),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=False),
@@ -676,7 +677,20 @@ class pricelist_partnerinfo(osv.osv):
     _order = 'min_quantity asc'
 pricelist_partnerinfo()
 
+class res_users(osv.osv):
+    _name = 'res.users'
+    _inherit = 'res.users'
 
+    def create(self, cr, uid, data, context={}):
+        user_id = super(res_users, self).create(cr, uid, data, context)
+        data_obj = self.pool.get('ir.model.data')
+        data_id = data_obj._get_id(cr, uid, 'product', 'ir_ui_view_sc_product0')
+        view_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
+        copy_id = self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
+                                    'user_id': user_id}, context=context)
+        return user_id
+
+res_users()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index ce2cc1ee632..7c05a929a1f 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -13,6 +13,10 @@
         <record id="uom_categ_wtime" model="product.uom.categ">
             <field name="name">Working Time</field>
         </record>
+        <record id="uom_categ_length" model="product.uom.categ">
+            <field name="name">Length / Distance</field>
+        </record>
+
 
         <!--
 	Resource: product.uom
@@ -21,33 +25,39 @@
             <field name="category_id" ref="product_uom_categ_unit"/>
             <field name="name">PCE</field>
             <field name="factor">1.0</field>
-            <field name="factor_inv_data">1.0</field>
             <field name="rounding">1.0</field>
         </record>
         <record id="product_uom_kgm" model="product.uom">
             <field name="category_id" ref="product_uom_categ_kgm"/>
             <field name="name">KGM</field>
             <field name="factor">1000.0</field>
-            <field name="factor_inv_data">1.0</field>
         </record>
         <record id="uom_hour" model="product.uom">
             <field name="name">Hour</field>
             <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor">8.0</field>
-            <field name="factor_inv_data">1.0</field>
         </record>
         <record id="uom_day" model="product.uom">
             <field name="name">Day</field>
             <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor">1.0</field>
-            <field name="factor_inv_data">1.0</field>
         </record>
         <record id="product_uom_ton" model="product.uom">
             <field name="category_id" ref="product_uom_categ_kgm"/>
             <field name="name">TON</field>
             <field name="factor">1.0</field>
-            <field name="factor_inv_data">1.0</field>
         </record>
+        <record id="product_uom_meter" model="product.uom">
+            <field name="category_id" ref="uom_categ_length"/>
+            <field name="name">Meter</field>
+            <field name="factor">1.0</field>
+        </record>
+        <record id="product_uom_km" model="product.uom">
+            <field name="category_id" ref="uom_categ_length"/>
+            <field name="name">Kilometer</field>
+            <field name="factor">0.001</field>
+        </record>
+
 
         <!--
 ... to here, it should be in product_demo but we cant just move it
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index aa2f9d2d509..9f13467c4cb 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="50"/>
+        <menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="40"/>
+
         <record id="product_search_form_view" model="ir.ui.view">
             <field name="name">product.search.form</field>
             <field name="model">product.product</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
-                   <filter string="Services" icon="terp-stock" domain="[('type','=','service')]"/>
-                   <filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
+                   <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
+                   <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
                    <separator orientation="vertical"/>
-                   <filter string="Can be sold" icon="terp-stock" domain="[('sale_ok','=',1)]"/>
-                   <filter string="Can be Purchased" icon="terp-stock" domain="[('purchase_ok', '=', 1)]" />
+                   <filter string="Can be sold" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
+                   <filter string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
                    <separator orientation="vertical"/>
                    <field name="default_code"/>
                    <field name="name"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
                    <newline/>
-                   <group  expand='1' string='Group by...' groups="base.group_extended">
-                       <filter string='Category' icon="terp-stock" domain="[]" context="{'group_by' : 'categ_id'}" />
+                   <group  expand='0' string='Group by...' groups="base.group_extended">
+                       <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
                        <separator orientation="vertical"/>
-                       <filter string='Default UOM' icon="terp-stock" domain="[]" context="{'group_by' : 'uom_id'}" />
+                       <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'uom_id'}" />
                        <separator orientation="vertical"/>
-                       <filter string='Type' icon="terp-stock" domain="[]" context="{'group_by' : 'type'}" />
+                       <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
                    </group>
                    <newline/>
                    <group expand="0" string="Extended options..." groups="base.group_extended">
@@ -98,7 +99,7 @@
 
                             <group colspan="2" col="2" name="status">
                                 <separator string="Status" colspan="2"/>
-                                <field name="categ_id"/>
+                                <field name="categ_id" select="1" groups="base.group_extended"/>
                                 <field name="state"/>
                                 <field groups="base.group_extended" name="product_manager"/>
                             </group>
@@ -260,7 +261,7 @@
         <menuitem action="product_category_action_form"
             groups="base.group_extended"
             id="menu_product_category_action_form"
-            parent="prod_config_main" sequence="60"/>
+            parent="prod_config_main" sequence="2"/>
 
 
         <record id="product_normal_action_tree" model="ir.actions.act_window">
@@ -374,7 +375,7 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem
-            action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="65"/>
+            action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
 
         <record id="product_packaging_tree_view" model="ir.ui.view">
             <field name="name">product.packaging.tree.view</field>
@@ -425,7 +426,7 @@
             <field name="arch" type="xml">
                 <form string="Supplier Information">
                     <field name="name"/>
-                    <field name="sequence" invisible="1"/>
+                    <field name="sequence"/>
                     <field name="product_name" groups="base.group_extended"/>
                     <field name="product_code" groups="base.group_extended"/>
                     <field name="delay"/>
@@ -450,7 +451,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Supplier Information">
-                    <field name="sequence" string="Seq" invisible="1"/>
+                    <field name="sequence" string="Seq"/>
                     <field name="name"/>
                     <field name="delay"/>
                     <field name="qty"/>
diff --git a/addons/profile_accounting/__openerp__.py b/addons/profile_accounting/__openerp__.py
index 4e3e2e10481..9e02bd3e275 100644
--- a/addons/profile_accounting/__openerp__.py
+++ b/addons/profile_accounting/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Profile',
     'description': """Profile for Accounting""",
     'author': 'Tiny',
-    'depends': ['account', 'report_analytic', 'board_account', 'account_followup'],
+    'depends': ['account', 'board_account', 'account_followup'],
     'update_xml': ['security/ir.model.access.csv', 'profile_accounting.xml'],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/profile_crm/i18n/pl.po b/addons/profile_crm/i18n/pl.po
index 3aa36f39bd8..f69342219c5 100644
--- a/addons/profile_crm/i18n/pl.po
+++ b/addons/profile_crm/i18n/pl.po
@@ -7,16 +7,16 @@ 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 13:21+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-31 12:41+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-04-17 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-06-01 03:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
 #: model:ir.module.module,description:profile_crm.module_meta_information
 msgid "Profile for CRM"
-msgstr ""
+msgstr "Profil dla CRM"
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index f668d82bf5c..973194e0e31 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -256,5 +256,15 @@
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Latest in house tests</field>
         </record>
+        <record id="project_message_1" model="project.message">
+			<field name="date">2010-05-27</field>
+			<field name="project_id" ref="project.project_project_23"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field name="description">Follow the procedure of Configuration wizard.
+- Add all required modules
+- Add chat of accounts
+- Create Users</field>
+			<field name="subject">Configuration steps</field>
+		</record>
     </data>
 </openerp>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index a127333544f..f7c46066178 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -22,6 +22,9 @@
                  position="attributes">
             <attribute name="string">Various OpenERP applications are available to bring your project management to the next levels of control and flexibility.</attribute>
           </xpath>
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
+                   <attribute name="string">Configure</attribute>
+          </xpath>
           <group colspan="8">
             <field name="project_crm"/>
             <field name="project_long_term" groups="base.group_extended"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e2f6ae53e3c..f58f026d484 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -93,7 +93,7 @@
             <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
-                <tree string="Projects">
+                <tree colors="blue:state in ('pending');black:state in ('open','template','close');gray:state in ('cancelled') " string="Projects">
                     <field name="complete_name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
                     <field name="partner_id" string="Partner"/>
@@ -111,21 +111,20 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group col='15' colspan='4'>
-                       <filter icon="terp-project" string="Open" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" default="1"/>
-                       <filter icon="terp-project" string="Pending" domain="[('state', '=', 'pending')]" help="Pending Projects"/>
+                       <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-project" string="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
-                       <filter icon="terp-project" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
-                       <separator orientation="vertical"/>
-                       <filter icon="terp-project" string="Templates" domain="[('state','=','template')]" help="Template Projects"/>
+                       <filter icon="terp-personal" string="Manager" name="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
+                       <filter icon="terp-personal-" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
                        <separator orientation="vertical"/>
                        <field name="name" string="Project Name"/>
                        <field name="user_id" string="Project Manager" default="1"/>
                        <field name="partner_id" string="Partner"/>
                    </group>
-                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Users" name="Users"  icon="terp-project" domain = "[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" name="Partner"  icon="terp-project" domain = "[]" context="{'group_by':'partner_id'}"/>
+                   <newline />
+                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                        <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>
                </search>
             </field>
@@ -158,6 +157,7 @@
             <field name="domain">[]</field>
             <field name="view_id" ref="view_project"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
+            <field name="context">{'search_default_Current':1}</field>
         </record>
         <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
 
@@ -168,8 +168,8 @@
             <field name="domain">[('state','=','template')]</field>
             <field name="view_id" ref="view_project"/>
         </record>
-        <menuitem  id="menu_template_project_specification" parent="project.menu_definitions" name="Specification" sequence="1"/>
-        <menuitem action="open_view_template_project" id="menu_template_project" parent="project.menu_template_project_specification" name="Specification Template"/>
+<!--        <menuitem  id="menu_template_project_specification" parent="project.menu_definitions" name="Specification" sequence="1"/>-->
+<!--        <menuitem action="open_view_template_project" id="menu_template_project" parent="project.menu_template_project_specification" name="Specification Template"/>-->
 
         <record id="view_task_work_form" model="ir.ui.view">
             <field name="name">project.task.work.form</field>
@@ -212,7 +212,7 @@
                     <separator string="" colspan="4"/>
                     <group col="4" colspan="4">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-refresh" name="compute_hours" string="Update" type="object" default_focus="1"/>
+                        <button icon="gtk-apply" name="compute_hours" string="Update" type="object" default_focus="1"/>
                     </group>
                 </form>
             </field>
@@ -276,7 +276,7 @@
                                 <button name="%(action_config_compute_remaining)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                 <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-                                <button name="do_close" states="pending,open" string="Done" type="object" icon="gtk-jump-to"/>
+                                <button name="do_close" states="pending,open" string="Done" type="object" icon="gtk-apply"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -331,8 +331,8 @@
             <field name="type">tree</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
-                    <field name="sequence" invisible="1"/>
+                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0 and state in ('pending');red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
+                    <field name="sequence" />
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
                     <field name="user_id"/>
@@ -354,8 +354,8 @@
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-                    <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
-                    <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="gtk-jump-to" help="For changing to done state"/>
+                    <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
+                    <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
                 </tree>
             </field>
@@ -408,30 +408,30 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter name="current" string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project" default="1"/>
-                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
-                        <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-project"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-check" default="1"/>
+                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-camera_test"/>
+                        <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
-                        <filter string="Deadlines" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-project"/>
+                        <filter string="Deadlines" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="project_id" select="1" widget="selection">
-                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
+                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">
                             <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
                         </field>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Users" name="group_user_id" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
-                        <filter string="Project" name="group_project_id" icon="terp-project" domain="[]" context="{'group_by':'project_id'}" default = "1"/>
-                        <filter string="Stage" name="group_stage_id" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
-                        <filter string="State" name="group_state" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
+                    <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="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"/>
-                        <filter string="Deadline" icon="terp-project" domain="[]" context="{'group_by':'date_deadline'}"/>
-                        <filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/>
-                        <filter string="End Date" icon="terp-project" domain="[]" context="{'group_by':'date_end'}"/>
+                        <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
+                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="End Date" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'date_end'}"/>
                     </group>
                 </search>
             </field>
@@ -590,10 +590,10 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Messages">
+                    <field name="date" select="1"/>
                     <field name="subject" select="1"/>
                     <field name="project_id" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="date" select="1"/>
                 </tree>
             </field>
        </record>
@@ -605,8 +605,8 @@
            <field name="arch" type="xml">
                <search string="Messages">
                    <group col="20" colspan="4">
-                       <filter domain="[('date','&gt;=',time.strftime('%%Y-%%m-01'))]" icon="terp-project" string="This Month" />
-                       <filter domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" icon="terp-project" string="Today" />
+                       <filter domain="[('date','&gt;=',time.strftime('%%Y-%%m-01'))]" icon="terp-go-month" string="This Month" />
+                       <filter domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" icon="terp-go-today" string="Today" />
 	                   <separator orientation="vertical"/>
 	                   <field name="subject"/>
 	                   <field name="project_id" select="1" widget="selection"/>
@@ -614,10 +614,10 @@
 	                   </field>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20">
-                       <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
-                       <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
-                       <filter string="Date" icon="terp-project" domain="[]" context="{'group_by':'date'}"/>
+                   <group expand="0" string="Group By..." colspan="4" col="20">
+                       <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                       <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                       <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                    </group>
                </search>
            </field>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index dc9ad3adb22..b115b576859 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -41,11 +41,13 @@ class report_project_task_user(osv.osv):
         'hours_effective': fields.float('Effective Hours', readonly=True),
         'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
         'remaining_hours': fields.float('Remaining Hours', readonly=True),
+        'progress': fields.float('Progress', readonly=True),
         'total_hours': fields.float('Total Hours', readonly=True),
         'closing_days': fields.float('Days to Close', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the task"),
         'opening_days': fields.float('Days to Open', digits=(16,2), readonly=True, group_operator="avg",
                                        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'),
@@ -62,7 +64,7 @@ class report_project_task_user(osv.osv):
                ('cancelled', 'Cancelled'),
                ('done', 'Done')],
             'State', readonly=True),
-        'company_id': fields.many2one('res.company', 'Company',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),
 
@@ -71,49 +73,61 @@ class report_project_task_user(osv.osv):
     def init(self, cr):
         tools.sql.drop_view_if_exists(cr, 'report_project_task_user')
         cr.execute("""
-            create or replace view report_project_task_user as (
-                select
-                    min(t.id) as id,
+            create view report_project_task_user as
+              select
+                    (select 1 ) AS nbr,
+                    t.id as id,
                     to_char(date_start, 'YYYY') as year,
                     to_char(date_start, 'MM') as month,
                     to_char(date_start, 'YYYY-MM-DD') as day,
-                    count(distinct t.id) as nbr,
                     date_trunc('day',t.date_start) as date_start,
                     date_trunc('day',t.date_end) as date_end,
                     to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_deadline,
-                    sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
+--                    sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
+                    (extract('epoch' from (t.date_end-t.date_start)))/(3600*24)  as no_of_days,
                     t.user_id,
+                    progress as progress,
                     t.project_id,
                     t.state,
+                    t.effective_hours as hours_effective,
                     t.priority,
                     t.name as name,
                     t.company_id,
                     t.partner_id,
                     t.type,
-                    sum(remaining_hours) as remaining_hours,
-                    sum(total_hours) as total_hours,
-                    sum(planned_hours) as hours_planned,
-                    avg(extract('epoch' from (t.date_end-t.create_date)))/(3600*24)  as closing_days,
-                    avg(extract('epoch' from (t.date_start-t.create_date)))/(3600*24)  as opening_days,
-                    sum(w.hours) as hours_effective,
-                    ((sum(planned_hours)-sum(w.hours))/count(distinct t.id))::decimal(16,2) as hours_delay
-                from project_task t
-                    left join project_task_work w on (t.id=w.task_id)
-                group by
-                    to_char(date_start, 'YYYY'),
-                    to_char(date_start, 'MM'),
-                    t.priority,
+                    remaining_hours as remaining_hours,
+                    total_hours as total_hours,
+                    t.delay_hours as hours_delay,
+                    planned_hours as hours_planned,
+                    (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
+
+                group by 
+                    t.id,
+                    remaining_hours,
+                    t.effective_hours,
+                    progress,
+                    total_hours,
+                    planned_hours,
+                    hours_delay,
+                    year,
+                    month,
+                    day,
+                    create_date,
+                    date_start,
+                    date_end,
+                    date_deadline,
                     t.user_id,
+                    t.project_id,
                     t.state,
-                    date_trunc('day',t.date_end),
-                    to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY'),
+                    t.priority,
+                    name,
                     t.company_id,
                     t.partner_id,
-                    t.type,
-                    t.name,
-                    t.project_id,
-                    t.date_start
-            )
+                    t.type
+
         """)
 report_project_task_user()
 
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 5955cb810a2..9b685001664 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -31,6 +31,8 @@
                     <field name="hours_delay" sum='Avg. Plan.-Eff.'/>
                     <field name="opening_days" sum='Days to Open'/>
                     <field name="closing_days" sum='Days to Close'/>
+                    <field name="delay_endings_days" sum='OverPass delay'/>
+                    <field name="progress" sum='Progress' widget='progressbar'/>
                 </tree>
             </field>
         </record>
@@ -54,70 +56,70 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
-                	<group>
-	                    <filter icon="gtk-media-rewind" string="  365 Days  "
+                	<group colspan="10" col="12">
+	                    <filter icon="terp-go-year" string="  365 Days  "
 	                    	    domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Tasks performed in last 365 Days"/>
-	                    <filter icon="gtk-media-rewind" string="   30 Days   "
+	                    <filter icon="terp-go-month" string="   30 Days   "
 	                    		name="month"
 	                    		domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                    		help="Tasks performed in last 30 days"/>
-		                <filter icon="gtk-media-rewind"
+		                <filter icon="terp-go-week"
 	                            string="    7 Days    "
 	                            separator="1"
 	                            domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&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-project"
+	                    		icon="terp-document-new"
 	                    		domain="[('state','=','draft')]"
 	                    		help = "Draft tasks"/>
 		                <filter string="Current"
-		                		icon="terp-project"
+		                		icon="terp-check"
 		                		domain="[('state', '=' ,'open')]"
 		                		help = "In progress tasks"/>
 	                   	<filter string="Pending"
-	                   			icon="terp-project"
+	                   			icon="terp-gtk-media-pause"
 	                   			domain="[('state','=','pending')]"
 	                   			help = "Pending tasks"/>
                       	<filter string="Done"
-                    			icon="terp-project"
+                    			icon="terp-dialog-close"
                     			name="done"
                     			domain="[('state','=','done')]"/>
-	  					<separator orientation="vertical"/>
-	  					<field name="partner_id" />
-	                    <field name="user_id" widget="selection">
-	                        <filter icon="terp-project"
-	                        		string="My Task"
-	                        		help = "My tasks"
-	                        		domain="[('user_id','=',uid)]" />
-	                        <filter icon="terp-project"
-	                        		string="Non Assigned Tasks to users"
-	                        		help="Non Assigned Tasks to users"
-	                        		domain="[('user_id','=',False)]"/>
-	                    </field>
+                      <separator orientation="vertical"/>
 	                    <field name="project_id">
-	                        <filter icon="terp-project"
+	                        <filter icon="terp-folder-blue"
 	                        		string="My Projects"
 	                        		help="My Projects"
 	                        		domain="[('project_id','=',context.get('project_id', False)]"/>
-	                    </field>
+                          </field>
+                          <field name="user_id" widget="selection">
+	                        <filter icon="terp-personal"
+	                        		string="My Task"
+	                        		help = "My tasks"
+	                        		domain="[('user_id','=',uid)]" />
+	                        <filter icon="terp-personal-"
+	                        		string="Non Assigned Tasks to users"
+	                        		help="Non Assigned Tasks to users"
+	                        		domain="[('user_id','=',False)]"/>
+                          </field>
+                      <field name="partner_id" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="10" col="11">
-                        <filter string="User" name="User" icon="terp-project" context="{'group_by':'user_id'}" />
-                        <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}"/>
+                    <group expand="1" string="Group By..." colspan="10" col="12">
+                        <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-project" context="{'group_by':'partner_id'}" />
-                        <filter string="Task" icon="terp-project" context="{'group_by':'name'}" />
+                       <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-project" context="{'group_by':'state'}"/>
-                        <filter string="Company" icon="terp-project" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
-                        <filter string="Stage" icon="terp-project" context="{'group_by':'type'}" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
+                        <filter string="Stage" icon="terp-stage" context="{'group_by':'type'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-project" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-project" context="{'group_by':'year'}"/>
+                        <filter string="Day" icon="terp-go-month" 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>
                     <newline/>
 	                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
@@ -125,6 +127,7 @@
 	                    <separator orientation="vertical"/>
                         <field name="date_start"/>
                         <field name="date_deadline"/>
+                        <field name="date_end"/>
 	                    <separator orientation="vertical"/>
 	                    <field name="priority"/>
 	                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -139,7 +142,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_task_project_user_search"/>
-            <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
+            <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"/>
 
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 059c19e0f40..d680e533505 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -120,8 +120,8 @@ project_gtd_timebox()
 class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
-        'timebox_id': fields.many2one('project.gtd.timebox', "Timebox"),
-        'context_id': fields.many2one('project.gtd.context', "Context"),
+        'timebox_id': fields.many2one('project.gtd.timebox', "Timebox",help="Time-laps during which task has to be treated"),
+        'context_id': fields.many2one('project.gtd.context', "Context",help="The context place where user has to treat task"),
      }
 
     def copy_data(self, cr, uid, id, default=None, context=None):
@@ -169,7 +169,7 @@ class project_task(osv.osv):
         timebox_obj = self.pool.get('project.gtd.timebox')
         if res['type'] == 'search':
             tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]))
-            search_extended ='''<newline/><group col="%d" expand="1" string="%s" groups="project_gtd.group_project_getting">''' % (len(tt)+7,_('Getting Things Done'))
+            search_extended ='''<newline/><group col="%d" expand="0" string="%s" groups="project_gtd.group_project_getting">''' % (len(tt)+7,_('Getting Things Done'))
             search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True}" icon="gtk-new" string="%s"/>''' % (_('Inbox'),)
             search_extended += '''<filter domain="[('state', 'in', ('draft','open','pending'))]" context="{'set_editable':True,'set_visible':True}" icon="gtk-new" string="%s"/>''' % (_('All'),)
             search_extended += '''<separator orientation="vertical"/>'''
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 1615319c7b9..64f6bcdfbd1 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -8,7 +8,8 @@
         <field name="arch" type="xml">
             <tree string="Context">
                 <field name="sequence" invisible="1"/>
-                <field name="name"/>
+                <field name="name" select="1"/>
+                <field name="project_default_id" select="1"/>
             </tree>
         </field>
     </record>
@@ -75,7 +76,7 @@
         <field name="inherit_id" ref="project.view_task_tree2" />
         <field name="arch" type="xml">
             <field name="remaining_hours" position="after">
-                <field string="xxxxxx" name="timebox_id" groups="project_gtd.group_project_getting" invisible=" not context.get('set_visible',True)"/>
+                <field string="Timebox" name="timebox_id" groups="project_gtd.group_project_getting" invisible=" not context.get('set_visible',True)"/>
                 <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open" groups="project_gtd.group_project_getting" invisible=" not context.get('set_visible',True)"/>
                 <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open" groups="project_gtd.group_project_getting" invisible=" not context.get('set_visible',False)"/>
                 <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks" invisible="not context.get('set_visible',False)"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 795c9883eca..92f671aa82e 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -63,36 +63,45 @@ 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):
             for field in fields:
                 res[issue.id] = {}
                 duration = 0
                 ans = False
-                if field == 'day_open':
+                hours = 0
+                
+                if field in ['working_hours_open','day_open']:
                     if issue.date_open:
                         date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
                         date_open = datetime.strptime(issue.date_open, "%Y-%m-%d %H:%M:%S")
                         ans = date_open - date_create
                         date_until = issue.date_open
-                elif field == 'day_close':
+                        #Calculating no. of working hours to open the issue
+                        hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id,
+                                mx.DateTime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
+                                mx.DateTime.strptime(issue.date_open, '%Y-%m-%d %H:%M:%S'))
+                elif field in ['working_hours_close','day_close']:
                     if issue.date_closed:
                         date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
                         date_close = datetime.strptime(issue.date_closed, "%Y-%m-%d %H:%M:%S")
                         date_until = issue.date_closed
                         ans = date_close - date_create
+                        #Calculating no. of working hours to close the issue
+                        hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id,
+                                mx.DateTime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
+                                mx.DateTime.strptime(issue.date_closed, '%Y-%m-%d %H:%M:%S'))
                 if ans:
                     resource_id = False
                     if issue.user_id:
                         resource_ids = res_obj.search(cr, uid, [('user_id','=',issue.user_id.id)])
                         if resource_ids and len(resource_ids):
                             resource_id = resource_ids[0]
-
                     duration = float(ans.days)
-                    if issue.section_id and issue.section_id.resource_calendar_id:
-                        duration =  float(ans.days) * 24
-                        new_dates = cal_obj.interval_get(cr,
+                    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.section_id.resource_calendar_id and issue.section_id.resource_calendar_id.id or False,
+                            issue.project_id.resource_calendar_id.id,
                             mx.DateTime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
                             duration,
                             resource=resource_id
@@ -104,16 +113,18 @@ class project_issue(osv.osv, crm.crm_case):
                                 no_days.append(in_time.date)
                             if out_time > date_until:
                                 break
-                        duration =  len(no_days)
-                res[issue.id][field] = abs(float(duration))
-
+                        duration = len(no_days)
+                if field in ['working_hours_open','working_hours_close']:
+                    res[issue.id][field] = hours
+                else:
+                    res[issue.id][field] = abs(float(duration))
         return res
 
     _columns = {
         'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
         'id': fields.integer('ID'),  
         'name': fields.char('Name', size=128, required=True),
-        'active': fields.boolean('Active', required=False),
+        'active': fields.boolean('Active', required=False), 
         'create_date': fields.datetime('Creation Date' , readonly=True),
         'write_date': fields.datetime('Update Date' , readonly=True),
         'date_deadline': fields.date('Deadline'),
@@ -164,8 +175,10 @@ class project_issue(osv.osv, crm.crm_case):
         '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'),
-        'working_hours_open': fields.float('Working Hours to Open the Issue'),
-        'working_hours_close': fields.float('Working Hours to Close the Issue'),
+        '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', \
+                                method=True, multi='working_days_close', type="float", store=True),
     }
     
     def _get_project(self, cr, uid, context):
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 9362e858b1e..dd3ed036691 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,6 +2,8 @@
 <openerp>
     <data>
 
+       <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="1"/>
+
         <record id="project_issue_categ_action" model="ir.actions.act_window">
             <field name="name">Issue Categories</field>
             <field name="res_model">crm.case.categ</field>
@@ -19,7 +21,8 @@
             <field name="domain">[('object_id.model', '=', 'project.issue')]</field>
             <field name="context">{'object_id':'project.issue'}</field>
         </record>
-        <menuitem action="project_issue_stage_act" id="menu_project_issue_stage_act" parent="crm.menu_crm_case_stage"/>
+
+        <menuitem action="project_issue_stage_act" name="Stages" id="menu_project_issue_stage_act" parent="menu_project_confi"/>
 
         <record model="ir.ui.view" id="project_issue_form_view">
             <field name="name">Project Issue Tracker Form</field>
@@ -114,20 +117,27 @@
                                         <field name="date"/>
                                         <field name="email_to"/>
                                         <field name="email_from"/>
-                                   </group>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(crm.action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'project.issue'}"
-                                   	icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email_to"/>
-                                   <field name="date"/>
-                               </tree>
+                                    </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': 'project.issue'}"
+                                    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"
@@ -177,12 +187,18 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group colspan="4" col="20">
-                        <filter icon="gtk-home" string="   Today   "
+						<filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft and Open Issues" icon="terp-check" default="1"/>
+                        <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="gtk-media-rewind"
+                        <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"
@@ -191,24 +207,27 @@
                         <field name="name" select='1' string="Subject"/>
                         <field name="user_id" select="1" widget="selection"/>
                         <field name="state" select="1">
-                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" name="current_bugs"/>
-                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
+                            <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Bugs" name="current_bugs"/>
+                            <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Bugs"/>
                         </field>
                         <field name="project_id" select="1" widget="selection" string="Project"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-	                    <filter string="Stage" icon="terp-crm" domain="[]"
+                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+	                    <filter string="Stage" icon="terp-stage" domain="[]"
 	                        context="{'group_by':'stage_id'}" />
-	                    <filter string="Priority" icon="terp-crm" domain="[]"
+	                    <filter string="Priority" icon="terp-rating-rated" domain="[]"
 	                        context="{'group_by':'priority'}" />
-	                    <filter string="Campaign" icon="terp-crm"
+	                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
 	                        domain="[]" context="{'group_by':'type_id'}" />
 	                    <separator orientation="vertical" />
-	                    <filter string="Partner" icon="terp-crm" domain="[]"
+	                    <filter string="Partner" icon="terp-personal" domain="[]"
 	                        context="{'group_by':'partner_id'}" />
-	                    <filter string="Salesman" icon="terp-crm"
+	                    <filter string="Salesman" icon="terp-personal"
 	                        domain="[]" context="{'group_by':'user_id'}" />
+						<separator orientation="vertical" />
+						<filter string="Month" icon="terp-go-month"
+	                        domain="[]" context="{'group_by':'create_date'}" />
 	                    <separator orientation="vertical" />
                 	</group>
                 </search>
@@ -269,12 +288,12 @@
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
                     <group>
-                        <filter icon="gtk-home" string="   Today   "
+                        <filter icon="terp-go-today" string="   Today   "
                             separator="1"
                             domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
                             help="Today's features"
                             />
-                        <filter icon="gtk-media-rewind"
+                        <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"
@@ -285,8 +304,8 @@
                         <field name="name" select='1' string="Feature description"/>
                         <field name="user_id" select="1" widget="selection"/>
                         <field name="state" select="1">
-                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
-                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
+                            <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
+                            <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
                         </field>
                         <field name="project_id" select="1" widget="selection" string="Project"/>
 
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 70a08e2c7b4..92f170eb556 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -9,7 +9,6 @@ AVAILABLE_STATES = [
     ('done', 'Closed'),
     ('pending','Pending')
 ]
-
 class project_issue_report(osv.osv):
     _name = "project.issue.report"
     _auto = False
@@ -51,9 +50,9 @@ class project_issue_report(osv.osv):
 
     _columns = {
         'name': fields.char('Year', size=64, required=False, readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
+        'user_id2':fields.many2one('res.users', 'Assigned To', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
-        'nbr': fields.integer('# of Cases', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
         'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
@@ -65,23 +64,30 @@ class project_issue_report(osv.osv):
                                   ('09', 'September'), ('10', 'October'),\
                                   ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
         '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),
+        'opening_date': fields.date('Opening Date', readonly=True),
+        'creation_date': fields.date('Creation Date', readonly=True),
+        'date_closed': fields.date('Closed Date', readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
         'nbr': fields.integer('# of Issues', readonly=True),
+        'working_hours_open': fields.float('# Working Open Hours', readonly=True),
+        'working_hours_close': fields.float('# Working Closing Hours', readonly=True),
+        'delay_open': fields.float('Avg opening Delay', digits=(16,2), readonly=True, group_operator="avg",
+                                       help="Number of Days to close the project issue"),
         'delay_close': fields.float('Avg Closing Delay', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the project issue"),
         'company_id' : fields.many2one('res.company', 'Company'),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'project_id':fields.many2one('project.project', 'Project',readonly=True),
-        'type_id': fields.many2one('crm.case.resource.type', 'Type', domain="[('object_id.model', '=', 'project.issue')]"),
-        'date_closed': fields.datetime('Close Date', readonly=True),
+        'type_id': fields.many2one('crm.case.resource.type', 'Version', domain="[('object_id.model', '=', 'project.issue')]"),
+        'user_id2losed': fields.date('Close Date', readonly=True),
         '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')]" )
     }
+
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'project_issue_report')
         cr.execute("""
@@ -91,51 +97,60 @@ class project_issue_report(osv.osv):
                     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.date_open, 'YYYY-MM-DD') as opening_date,
+                    to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
                     c.state,
                     c.user_id,
+                    c.working_hours_open,
+                    c.working_hours_close,
                     c.section_id,
                     c.categ_id,
                     c.stage_id,
-                    to_char(c.date_closed, 'YYYY/mm/dd') as date_closed,
-                    u.company_id as company_id,
+                    to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
+                    c.company_id as company_id,
                     c.priority as priority,
                     c.project_id as project_id,
                     c.type_id as type_id,
-                    count(*) as nbr,
+                    (select 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
                     project_issue c
-                left join
-                    res_users u on (c.id = u.id)
+                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.date_closed,
-                    u.company_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
-            )""")
-
+            )""") 
 
 project_issue_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/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 5694d33993b..b4d0af02185 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -12,10 +12,9 @@
                     <field name="month" invisible="1"/>
                     <field name="project_id" invisible="1"/>
                     <field name="stage_id" invisible="1"/>
-                    <field name="type_id" string="Type" invisible="1"/>
+                    <field name="type_id" string="Version" invisible="1"/>
                     <field name="priority" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
-                    <field name="delay_close" avg='Avg Closing Delay'/>
                     <field name="section_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
@@ -24,10 +23,13 @@
                     <field name="task_id" invisible="1"/>
                     <field name="assigned_to" invisible="1"/>
                     <field name="date_closed" invisible="1"/>
-                    <field name="create_date" 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="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'/>
                   </tree>
             </field>
         </record>
@@ -51,29 +53,25 @@
             <field name="arch" type="xml">
 				<search string="Search">
                   <group col="16" colspan="8">
-                   		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
-                   			domain="[('name','=',time.localtime()[0])]"/>-->
-                   		<filter string="This Year" icon="terp-hr"
+                   		<filter string="365 Days" icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
 
-                   		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
-                   			domain="[('month','=',time.strftime('%%m'))]" />-->
-                       <filter string="This Month" icon="terp-hr" name="This Month"
+                       <filter string="30 Days" icon="terp-go-month" name="This Month"
                     	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
 
-                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                       <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'))]"/>
 
                    		<separator orientation="vertical" />
-                        <filter icon="terp-hr"
-                    		string="Draft"
-                    		domain="[('state','=','draft')]"/>
-					   <filter icon="terp-hr"
-                    		string="Open"
-                    		domain="[('state','=','open')]"/>
-					   <filter icon="terp-hr"
+                        <filter  icon="terp-camera_test"
+                    		string="Current"
+                    		domain="[('state','in',('draft','open'))]"/>
+                       <filter icon="terp-gtk-media-pause"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
+                       <filter icon="terp-dialog-close"
+                    		string="Done"
+                    		domain="[('state','=','done')]"/>
 
                    		<separator orientation="vertical" />
                    		<field name="section_id"
@@ -87,89 +85,66 @@
                    				help="My section" />
 
                    		</field>
-                   		<field name="company_id" widget="selection">
-                           <filter icon="terp-crm"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id.company_id','=',uid)]"
-                        help="My company"/>
-                        </field>
+                  			<field name="project_id"/>
                       	<field name="user_id"  select="1" widget="selection"/>
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" name="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}" />
-
-                        <filter string="Company" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
-
+                        <filter string="Project"  name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
+                        <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
+                        <separator orientation="vertical" />
+                        <filter name="User" string="Responsible" icon="terp-personal" 
+                        domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Assigned to" name="Responsible" icon="terp-personal"
+                        domain="[]" context="{'group_by':'assigned_to'}" />
+                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                        <separator orientation="vertical" />
                         <filter string="Section" icon="terp-sale"
                         	domain="[]"
                         	context="{'group_by':'section_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'state'}" />
-
-                        <filter string="Category" icon="terp-sale"
+                        <filter string="Category" icon="terp-stock_symbol-selection"
                         	domain="[]" context="{'group_by':'categ_id'}" />
-
-						<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
-	            		<separator orientation="vertical"/>
-	            		<filter string="Project"  icon="terp-sale" domain="[]" context="{'group_by':'project_id'}" />
-	            		<filter string="Priority"  icon="terp-sale" domain="[]" context="{'group_by':'priority'}" />
-	            		<separator orientation="vertical"/>
-	            		<filter string="Type"  icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
-	            		<filter string="Task"  icon="terp-sale" domain="[]" context="{'group_by':'task_id'}"/>
-	            		<newline/>
-	            		<filter string="Assigned To"  icon="terp-sale" domain="[]" context="{'group_by':'assigned_to'}"/>
-	            		<filter string="Partner"  icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
-	            		<filter string="Channel"  icon="terp-sale" domain="[]" context="{'group_by':'canal_id'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                        	domain="[]" context="{'group_by':'state'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Company" icon="terp-go-home"
+                        	domain="[]"
+                        	context="{'group_by':'company_id'}" />
 
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-sale"
                         	domain="[]" context="{'group_by':'day'}"/>
 
-                        <filter string="Month" icon="terp-sale"
+                        <filter string="Month" icon="terp-go-month"
                         	domain="[]" context="{'group_by':'month'}" />
 
-                        <filter string="Year" icon="terp-sale"
+                        <filter string="Year" icon="terp-go-year"
                         	domain="[]" context="{'group_by':'name'}" />
 
                   </group>
                    <newline/>
                    <group  expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
-                         <filter icon="terp-sale"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
-
-                    	<filter icon="terp-sale"
-                    		string="Cancel"
-                    		domain="[('state','=','cancel')]"/>
-                    	<group>
+                    		<field name="partner_id"  />
+                    		<field name="assigned_to" widget="selection"/>
                     		<separator orientation="vertical"/>
-                  			<field name="project_id" widget="selection" />
                     		<field name="priority" />
                     		<separator orientation="vertical"/>
                     		<field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                    		<field name="task_id"/>
-                    		<separator orientation="vertical"/>
-                    		<field name="assigned_to" widget="selection">
-                    			<filter icon="terp-crm"  help = "Project Issue Assigned To Me" domain="[('assigned_to','=',uid)]" />
- 						    	<filter icon="terp-crm"  help="Non Assigned Project Issue"  domain="[('assigned_to','=',False)]"/>
-                    		</field>
-                    		<newline/>
                     		<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
                     		<field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
                     		<separator orientation="vertical"/>
-                    		<field name="partner_id"  />
-                    		<field name="canal_id" widget="selection"/>
-                            <separator orientation="vertical"/>
+                   		<field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    		<newline/>
+                            <field name="creation_date"/>
+                            <field name="opening_date"/>
                             <field name="date_closed" string="Date Closed"/>
                         </group>
-
-                   </group>
                </search>
             </field>
         </record>
@@ -179,7 +154,7 @@
             <field name="res_model">project.issue.report</field>
             <field name="view_type">form</field>
   			<field name="view_mode">graph,tree</field>
-  			<field name="context">{"search_default_This Month":1,"search_default_User":1,"search_default_user_id":uid,'group_by_no_leaf':1,'group_by':[]}</field>
+  			<field name="context">{'search_default_This Month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_project_issue_report_tree"/>
             <field name="search_view_id" ref="view_project_issue_report_filter"/>
         </record>
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index c48ff73b0f0..4027dab3572 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -19,17 +19,7 @@
 #
 ##############################################################################
 
-import base64
-import os
-import re
-import time
-import mx.DateTime
-from datetime import datetime, timedelta
-
-import tools
-from crm import crm
 from osv import fields,osv,orm
-from osv.orm import except_orm
 from tools.translate import _
 
 class project_issue(osv.osv):
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 95e9099f549..212af8a30dc 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -93,7 +93,7 @@ class project_phase(osv.osv):
         'next_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'prv_phase_id', 'next_phase_id', 'Next Phases'),
         'previous_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'next_phase_id', 'prv_phase_id', 'Previous Phases'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of phases."),
-        'duration': fields.float('Duration', required=True),
+        'duration': fields.float('Duration', required=True, help="By default in days"),
         '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"),
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7eedf814817..92b8a34ee9c 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -47,7 +47,7 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter name="resource" string="Resource" icon="terp-project" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <filter name="resource" string="Resource" icon="terp-folder-blue" domain="[]" context="{'group_by':'resource_id'}"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
@@ -102,7 +102,7 @@
                                 <field name="state" select="1"/>
                                 <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
                                 <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                                <button string="Done" name="set_done" states="draft,pending,open" icon="gtk-jump-to"/>
+                                <button string="Done" name="set_done" states="draft,pending,open" icon="gtk-apply"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
                                 <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                             </group>
@@ -218,23 +218,23 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group colspan="4" col="20">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" default="1"/>
-                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-project"/>
-                        <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-project"/>
+                        <filter string="Draft" domain="[('state','=','draft')]" help="Draft Phases" icon="terp-check" default="1"/>
+                        <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-camera_test"/>
+                        <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id" widget="selection">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
+                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
                         </field>
                         <field name="responsible_id" widget="selection"/>
                         <field name="date_start"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'responsible_id'}"/>
-                        <filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
+                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
                     </group>
                 </search>
             </field>
@@ -249,6 +249,16 @@
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
+        <record id="act_project_phase_list" model="ir.actions.act_window">
+            <field name="name">Project Phases</field>
+            <field name="res_model">project.phase</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar</field>
+ 			<field name="context">{'search_default_responsible_id':uid}</field>
+            <field name="search_view_id" ref="view_project_phase_search"/>
+        </record>
+
+
     # ------------------------------------------------------
     # Project
     # ------------------------------------------------------
@@ -323,7 +333,7 @@
 		<menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
             name="Resource Allocations" parent="menu_project_long_term" />
 
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <!--<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>-->
         <menuitem id="menu_pm_resources_project1"
             groups="base.group_extended"
             name="Resources" parent="base.menu_main_pm" sequence="2"/>
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index 5353db25be6..ce2e2c0bbb1 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -165,7 +165,7 @@ class project_compute_phases(osv.osv_memory):
             context = {}
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
-        result = mod_obj._get_id(cr, uid, 'project_long_term', 'act_project_phase')
+        result = mod_obj._get_id(cr, uid, 'project_long_term', 'act_project_phase_list')
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = act_obj.read(cr, uid, [id], context=context)[0]
         result['domain'] = [('state', 'not in', ['cancelled','done'])]
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 d6f055e6807..0a3b2e12336 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -8,20 +8,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Compute Scheduling of Phases">
-	                  <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 height="170" width="500">
+		                  <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>
 		</record>
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 c89c83b3058..eff475b4f11 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -8,15 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Compute Scheduling of Phases">
-	                  <group colspan="4" col="4">
-              		  <label colspan="4" string="This wizard will schedule start date, end date, and assign user to tasks for specified project" />
-              		  <newline />
-		              <field colspan="4" name="project_id"/>
-		              </group>
-		              <group colspan="4" col="6">
-		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-		            		<button icon="gtk-ok" name="compute_date" string="Compute" type="object"/>
+	                <group colspan="4" height="100" width="500">
+                        <field name="project_id"/>
+                        <group colspan="4" col="6">
+                            <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+		            	    <button icon="gtk-ok" name="compute_date" string="Compute" type="object"/>
 		              </group>
+		            </group>
 			  	</form>
             </field>
 		</record>
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 1011f366aa5..b62a3c107d9 100644
--- a/addons/project_long_term/wizard/project_schedule_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_schedule_tasks_view.xml
@@ -8,10 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Schedule Tasks">
-              		  <label string="Task Scheduling completed successfully."/>
-		              <group colspan="4" col="6">
-		            		<button  icon="gtk-ok" colspan="4" special="cancel" string="_Ok"/>
-		              </group>
+              		  <group height="90" width="275">
+	              		  <label string="Task Scheduling completed successfully."/>
+			              <group colspan="4" col="6">
+			            		<button  icon="gtk-ok" colspan="4" special="cancel" string="_Ok"/>
+			              </group>
+						</group>
 			  	</form>
             </field>
 		</record>
diff --git a/addons/project_mrp/mrp.py b/addons/project_mrp/mrp.py
index 350d6b006b7..6287ca3ad30 100644
--- a/addons/project_mrp/mrp.py
+++ b/addons/project_mrp/mrp.py
@@ -55,10 +55,11 @@ class mrp_procurement(osv.osv):
                     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 = self.pool.get('project.project').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 = self.pool.get('project.project').create(cr, uid, {'name':proj_name,'category_id':analytic_account_id, '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]
                 
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 0ebbcd8e519..fd9d586f21e 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -162,7 +162,7 @@
             <field name="arch" type="xml">
                 <search string="Planning by Account">
                     <group col="8" colspan="4">
-                        <filter icon="terp-project" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
+                        <filter icon="terp-check" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="code" select="1"/>
diff --git a/addons/project_retro_planning/i18n/pl.po b/addons/project_retro_planning/i18n/pl.po
index 3edfe6ebb85..b6d03844595 100644
--- a/addons/project_retro_planning/i18n/pl.po
+++ b/addons/project_retro_planning/i18n/pl.po
@@ -7,16 +7,16 @@ 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:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-31 12:41+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-04-17 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-06-01 03:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
 #: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
 msgid "Project Retro planning"
-msgstr ""
+msgstr "Wsteczne planowanie projektu"
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 35a7c9f3de6..5a653985a20 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -148,16 +148,16 @@
             <field name="arch" type="xml">
             	<search string="Tasks by User">
             		<group colspan="4" col="3">
-	            		<filter icon="terp-project" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" />
-	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" />
+	            		<filter icon="terp-go-year" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" />
+	            		<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" />
 	            		<separator orientation="vertical"/>
 	                    <field name="user_id" select="1" widget="selection"/>
                 	</group>
                 	<newline/>
                 	<group expand="1" string="Group By..." colspan="4" col="3">
-                	    <filter string="User" icon="terp-project" context="{'group_by':'user_id'}" default="1" />
-                    	<filter string="Year" icon="terp-project" context="{'group_by':'year'}" />
-                    	<filter string="Month" icon="terp-project" context="{'group_by':'month'}" />
+                	    <filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" default="1" />
+                    	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" />
+                    	<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" />
                 	</group>
             	</search>
             </field>
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 46d7c3296b9..e172e5e73f1 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -34,7 +34,7 @@
     'depends': ['base', 'account', 'stock', 'process', 'mrp_procurement'],
     'init_xml': [],
     'update_xml': [
-                   
+
         'security/purchase_security.xml',
         'security/ir.model.access.csv',
         'purchase_workflow.xml',
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 214ea309fba..2e46481a6e1 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.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-02-18 15:42+0000\n"
+"PO-Revision-Date: 2010-06-04 18:08+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-04-17 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -195,11 +195,11 @@ msgid ""
 msgstr ""
 "Stan zamówienia zakupu lub zapytania ofertowego. Zapytanie ofertowe jest "
 "zamówieniem zakupu w stanie 'Projekt'. Następnie zamówienie może być "
-"potwierdzone i jego stan zmieni się w 'Zatwierdzone'. Następnie po "
-"potwierdzeniu przez dostawcę stan zmienia się w 'Zaaprobowane'. Kiedy "
+"potwierdzone i jego stan zmieni się w 'Potwierdzone'. Następnie po "
+"zaaprobowaniu przez dostawcę stan zmienia się w 'Zaaprobowane'. Kiedy "
 "zamówienie jest zrealizowane i zapłacone stan zmienia się na 'Wykonano'. "
-"Jeśłi wystąpi operacja anulowania lub w trakcie fakturowania lub "
-"przyjmowania towarów, to stan zmieni się na Wyjątek."
+"Jeśli wystąpi operacja anulowania w trakcie fakturowania lub przyjmowania "
+"towarów, to stan zmieni się na Wyjątek."
 
 #. module: purchase
 #: field:purchase.order,origin:0
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 849e586335c..2cfd4247bcf 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -59,12 +59,13 @@ class purchase_order(osv.osv):
             val = val1 = 0.0
             cur=order.pricelist_id.currency_id
             for line in order.order_line:
-                for c in self.pool.get('account.tax').compute(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id):
+                for c in self.pool.get('account.tax').compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id)['taxes']:
                     val+= c['amount']
                 val1 += line.price_subtotal
             res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val)
             res[order.id]['amount_untaxed']=cur_obj.round(cr, uid, cur, val1)
             res[order.id]['amount_total']=res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']
+            print res
         return res
 
     def _set_minimum_planned_date(self, cr, uid, ids, name, value, arg, context):
@@ -223,7 +224,7 @@ class purchase_order(osv.osv):
             else:
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!' % s['state']))
 
-        # TODO: temporary fix in 5.0, to remove in 5.2 when subflows support 
+        # TODO: temporary fix in 5.0, to remove in 5.2 when subflows support
         # automatically sending subflow.delete upon deletion
         wf_service = netsvc.LocalService("workflow")
         for id in unlink_ids:
@@ -248,7 +249,7 @@ class purchase_order(osv.osv):
         return {'value':{'location_id': res, 'dest_address_id': False}}
 
     def onchange_partner_id(self, cr, uid, ids, part):
-        
+
         if not part:
             return {'value':{'partner_address_id': False, 'fiscal_position': False}}
         addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['default'])
@@ -261,17 +262,15 @@ class purchase_order(osv.osv):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': time.strftime('%Y-%m-%d')})
         return True
 
+    #TODO: implement messages system
     def wkf_confirm_order(self, cr, uid, ids, context={}):
         todo = []
         for po in self.browse(cr, uid, ids):
-            
-            if self.pool.get('res.partner.event.type').check(cr, uid, 'purchase_open'):
-                self.pool.get('res.partner.event').create(cr, uid, {'name':'Purchase Order: '+po.name, 'partner_id':po.partner_id.id, 'date':time.strftime('%Y-%m-%d %H:%M:%S'), 'user_id':uid, 'partner_type':'retailer', 'probability': 1.0, 'planned_cost':po.amount_untaxed})
             if not po.order_line:
                 raise osv.except_osv(_('Error !'),_('You can not confirm purchase order without Purchase Order Lines.'))
-            for line in po.order_line:            
+            for line in po.order_line:
                 if line.state=='draft':
-                    todo.append(line.id)            
+                    todo.append(line.id)
         current_name = self.name_get(cr, uid, ids)[0][1]
         self.pool.get('purchase.order.line').action_confirm(cr, uid, todo, context)
         for id in ids:
@@ -315,13 +314,13 @@ class purchase_order(osv.osv):
         wf_service = netsvc.LocalService("workflow")
         for p_id in ids:
             # Deleting the existing instance of workflow for PO
-            wf_service.trg_delete(uid, 'purchase.order', p_id, cr)            
+            wf_service.trg_delete(uid, 'purchase.order', p_id, cr)
             wf_service.trg_create(uid, 'purchase.order', p_id, cr)
         return True
 
     def action_invoice_create(self, cr, uid, ids, *args):
         res = False
-       
+
         journal_obj = self.pool.get('account.journal')
         for o in self.browse(cr, uid, ids):
             il = []
@@ -439,7 +438,7 @@ class purchase_order(osv.osv):
                     })
                     if order_line.move_dest_id:
                         self.pool.get('stock.move').write(cr, uid, [order_line.move_dest_id.id], {'location_id':order.location_id.id})
-                    todo_moves.append(move)    
+                    todo_moves.append(move)
             self.pool.get('stock.move').action_confirm(cr, uid, todo_moves)
             self.pool.get('stock.move').force_assign(cr, uid, todo_moves)
             wf_service = netsvc.LocalService("workflow")
@@ -461,26 +460,26 @@ class purchase_order(osv.osv):
 
 
     def do_merge(self, cr, uid, ids, context):
-        """ 
-        To merge similar type of purchase orders.        
-        Orders will only be merged if: 
-        * Purchase Orders are in draft  
-        * Purchase Orders belong to the same partner   
+        """
+        To merge similar type of purchase orders.
+        Orders will only be merged if:
+        * Purchase Orders are in draft
+        * Purchase Orders belong to the same partner
         * Purchase Orders are have same stock location, same pricelist
-        Lines will only be merged if: 
-        * Order lines are exactly the same except for the quantity and unit 
+        Lines will only be merged if:
+        * Order lines are exactly the same except for the quantity and unit
 
          @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: new purchase order id
-            
-        """          
-        wf_service = netsvc.LocalService("workflow")    
-        def make_key(br, fields):                    
+
+        """
+        wf_service = netsvc.LocalService("workflow")
+        def make_key(br, fields):
             list_key = []
             for field in fields:
                 field_val = getattr(br, field)
@@ -498,9 +497,9 @@ class purchase_order(osv.osv):
             return tuple(list_key)
 
     # compute what the new orders should contain
-  
+
         new_orders = {}
-    
+
         for porder in [order for order in self.browse(cr, uid, ids) if order.state == 'draft']:
             order_key = make_key(porder, ('partner_id', 'location_id', 'pricelist_id'))
             new_order = new_orders.setdefault(order_key, ({}, []))
@@ -543,7 +542,7 @@ class purchase_order(osv.osv):
                         o_line[field] = field_val
                     o_line['uom_factor'] = order_line.product_uom and order_line.product_uom.factor or 1.0
 
-        
+
 
         allorders = []
         for order_key, (order_data, old_ids) in new_orders.iteritems():
@@ -571,12 +570,14 @@ class purchase_order(osv.osv):
 purchase_order()
 
 class purchase_order_line(osv.osv):
-    def _amount_line(self, cr, uid, ids, prop, unknow_none,unknow_dict):
+    def _amount_line(self, cr, uid, ids, prop, arg,context):
         res = {}
         cur_obj=self.pool.get('res.currency')
-        for line in self.browse(cr, uid, ids):
+        tax_obj = self.pool.get('account.tax')
+        for line in self.browse(cr, uid, ids, context=context):
+            taxes = tax_obj.compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty)
             cur = line.order_id.pricelist_id.currency_id
-            res[line.id] = cur_obj.round(cr, uid, cur, line.price_unit * line.product_qty)
+            res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
         return res
 
     _columns = {
@@ -603,7 +604,7 @@ class purchase_order_line(osv.osv):
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner"),
         'date_order': fields.related('order_id','date_order',string='Order Date',readonly=True,type="date")
-        
+
     }
     _defaults = {
         'product_qty': lambda *a: 1.0,
@@ -623,7 +624,7 @@ class purchase_order_line(osv.osv):
             partner_id, date_order=False, fiscal_position=False, date_planned=False,
             name=False, price_unit=False, notes=False):
         if not pricelist:
-            raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist in the purchase form !\nPlease set one before choosing a product.'))
+            raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist or a supplier in the purchase form !\nPlease set one before choosing a product.'))
         if not  partner_id:
             raise osv.except_osv(_('No Partner!'), _('You have to select a partner in the purchase form !\nPlease set one partner before choosing a product.'))
         if not product:
@@ -694,7 +695,7 @@ class purchase_order_line(osv.osv):
         return res
     def action_confirm(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'confirmed'}, context)
-        return True    
+        return True
 purchase_order_line()
 
 class mrp_procurement(osv.osv):
@@ -702,7 +703,7 @@ class mrp_procurement(osv.osv):
     _columns = {
         'purchase_id': fields.many2one('purchase.order', 'Latest Requisition'),
     }
-    
+
     def action_po_assign(self, cr, uid, ids, context={}):
         """ This is action which call from workflow to assign purchase order to procurements
         @return: True
@@ -725,22 +726,24 @@ class mrp_procurement(osv.osv):
         po_obj = self.pool.get('purchase.order')
         for procurement in self.browse(cr, uid, ids):
             res_id = procurement.move_id.id
-            partner = procurement.product_id.seller_ids[0].name
-            partner_id = partner.id
+            partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  procurement.product_id.seller_ids if partner_id])
+            partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False
+            partner = partner_rec.name or False
+            partner_id = partner_rec.id or False
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             pricelist_id = partner.property_product_pricelist_purchase.id
 
             uom_id = procurement.product_id.uom_po_id.id
 
             qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
-            if procurement.product_id.seller_ids[0].qty:
-                qty = max(qty,procurement.product_id.seller_ids[0].qty)
+            if partner_rec.qty:
+                qty = max(qty,partner_rec.qty)
 
             price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, False, {'uom': uom_id})[pricelist_id]
 
             newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
             newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
-            newdate = newdate - procurement.product_id.seller_ids[0].delay
+            newdate = newdate - partner_rec.delay
 
             #Passing partner_id to context for purchase order line integrity of Line name
             context.update({'lang': partner.lang, 'partner_id': partner_id})
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index 0a6659d244f..2b57a2a75bc 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -7,11 +7,6 @@
             <field name="object">purchase.order</field>
         </record>
         
-        <record id="event_type_purchase_open" model="res.partner.event.type">
-            <field name="name">Purchase: Purchase Confirmation</field>
-            <field name="key">purchase_open</field>
-        </record>
-        
         <record id="pricelist_type_purchase" model="product.pricelist.type">
             <field name="name">Purchase Pricelist</field>
             <field name="key">purchase</field>
diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml
index 00678589999..d32f2f30a53 100644
--- a/addons/purchase/purchase_unit_test.xml
+++ b/addons/purchase/purchase_unit_test.xml
@@ -29,7 +29,7 @@
             <field name="product_qty">3</field>
         </record>
 
-        <assert model="purchase.order" id="test_purchase_1" string="The amount of Test purchase is correctly computed" severity="error">
+        <assert model="purchase.order" id="test_purchase_1" string="The amount of Test purchase is correctly computed">
             <test expr="sum([l.price_subtotal for l in order_line]) == amount_untaxed" />
         </assert>
 
@@ -50,9 +50,11 @@
             <test expr="bool(invoice_id)" />
         </assert>
 
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase's invoice has the same amount and is currently a draft" severity="error">
+        <assert model="purchase.order" id="test_purchase_1" string="Test purchase's invoice has the same amount and is currently a draft">
+            <!--
             <test expr="invoice_id.amount_untaxed == amount_untaxed" />
             <test expr="invoice_id.amount_total == amount_total" />
+            -->
             <test expr="invoice_id.state">draft</test>
         </assert>
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8aa643d1c43..17fd47b7012 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -23,6 +23,7 @@
               name="Incoming Shipments" sequence="9"/>
         <menuitem action="stock.action_reception_picking_move" id="menu_action_reception_picking_move"
               name="Incoming Products" parent="menu_procurement_management_inventory" sequence="10"/>
+      <menuitem action="stock.action_picking_tree_out" id="menu_action_picking_treeout" parent="menu_procurement_management_inventory" sequence="11"/>
 
      <!--Invoice control-->
       <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
@@ -150,12 +151,12 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group col='10' colspan='4'>
-                    <filter icon="terp-purchase" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
-                    <filter icon="terp-purchase" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
-                    <filter icon="terp-purchase" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1"/>
-                    <filter icon="terp-purchase" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1"/>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
+                    <filter icon="terp-camera_test" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
+                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1"/>
+                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1" string="Reference"/>
                     <field name="partner_id" select="1"/>
@@ -163,10 +164,13 @@
                     <field name="create_uid" select="1" widget="selection"/>
                 </group>
                 <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="10" groups="base.group_extended">
-                    <filter string="Supplier" icon="terp-purchase" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Order Date" icon="terp-purchase" domain="[]" context="{'group_by':'date_order'}"/>
+                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                    <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
+                    <filter string="Source Document" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                 </group>
               </search>
             </field>
@@ -176,7 +180,7 @@
             <field name="model">purchase.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Purchase Order">
+                <tree colors="grey:state in ('approved','done');blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
                     <field name="name" string="Reference"/>
                     <field name="date_order" string="Order Date"/>
                     <field name="partner_id"/>
@@ -265,7 +269,7 @@
                 <tree colors="red:date_planned&lt;=current_date;black:date_planned&gt;current_date" string="Purchase Order Lines">
                     <field name="order_id"/>
                     <field name="name"/>
-                    <field name="date_planned" widget="date"/>
+                    <field name="date_planned" widget="date" width="135"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
@@ -276,6 +280,25 @@
             </field>
         </record>
 
+          <record id="purchase_order_line_search" model="ir.ui.view">
+            <field name="name">purchase.order.line.search</field>
+            <field name="model">purchase.order.line</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Purchase Order">
+                        <group>
+                        <field name='order_id'/>
+                        <field name="product_id" widget="selection" />
+                        </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'}" />
+                        </group>
+               </search>
+            </field>
+        </record>
+
         <act_window
             context="{'partner_id': active_id}"
             domain="[('partner_id', '=', active_id)]"
@@ -309,6 +332,7 @@
             <field name="domain">[('state','in',('confirmed','done')), ('invoiced','=',False)]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+             <field name="search_view_id" ref="purchase_order_line_search"/>
         </record>
         <record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index cf177319ea5..71f2638d628 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -31,7 +31,7 @@ class purchase_report(osv.osv):
     _description = "Purchases Orders"
     _auto = False
     _columns = {
-        'date': fields.date('Date', readonly=True),
+        'date': fields.date('Date order', readonly=True),
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'state': fields.selection([
@@ -61,7 +61,11 @@ class purchase_report(osv.osv):
         'expected_date':fields.date('Expected Date', readonly=True),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
+        'shipped_qty':fields.integer('Received Qty', readonly=True),
+        'invoiced_qty':fields.integer('Invoiced Qty', readonly=True),
         'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
+        'delay':fields.float('Days to Close', digits=(16,2), readonly=True),
+        'delay_pass':fields.float('Overpassed expected', digits=(16,2), readonly=True),
         'quantity': fields.float('# of Products', readonly=True),
         'price_total': fields.float('Total Price', readonly=True),
         'price_average': fields.float('Average Price', readonly=True),
@@ -94,9 +98,13 @@ class purchase_report(osv.osv):
                     s.create_uid as user_id,
                     s.company_id as company_id,
                     s.invoice_method,
+                    s.shipped::integer as shipped_qty,
+                    l.invoiced::integer as invoiced_qty,
                     l.product_id,
                     s.location_id as location_id,
                     sum(l.product_qty*u.factor) as quantity,
+                    extract(epoch from age(s.date_approve,s.date_order))/(24*60*60)::decimal(16,2) as delay,
+                    extract(epoch from age(s.minimum_planned_date,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
                     count(*) as nbr,
                     sum(l.product_qty*l.price_unit) as price_total,
                     (sum(l.product_qty*l.price_unit)/sum(l.product_qty*u.factor))::decimal(16,2) as price_average
@@ -107,9 +115,12 @@ class purchase_report(osv.osv):
                 group by
                     s.company_id,
                     s.create_uid,
+                    s.shipped,
+                    l.invoiced,
                     s.partner_id,
                     s.location_id,
                     s.date_approve,
+                    s.minimum_planned_date,
                     date_trunc('day',s.minimum_planned_date),
                     s.partner_address_id,
                     s.pricelist_id,
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 0cfc357b51f..468f3892a13 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -27,21 +27,21 @@
                 	<field name="partner_id" invisible="1"/>
                     <field name="product_id" invisible="1"/>
                     <field name="quantity" invisible="1"/>
-                    <field name="nbr" sum="# of Lines"/>
-                    <field name="price_average" avg="Average Price"/>
-                	<field name="price_total" sum="Total Price"/>
                 	<field name="day" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="warehouse_id" invisible="1"/>
-                    <field name="partner_address_id" invisible="1"/>
-                    <field name="dest_address_id" invisible="1"/>
-                    <field name="pricelist_id" invisible="1"/>
                     <field name="validator" invisible="1"/>
                     <field name="company_id" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="location_id" invisible="1"/>
-                    <field name="fiscal_position" invisible="1"/>
+                    <field name="shipped_qty" sum="# of received"/>
+                    <field name="invoiced_qty" sum="# of invoiced"/>
+                    <field name="nbr" sum="# of Lines"/>
+                    <field name="price_average" avg="Average Price"/>
+                	<field name="price_total" sum="Total Price"/>
+                    <field name="delay" sum="# Days to close"/>
+                	<field name="delay_pass" sum="Total Price"/>
                 </tree>
             </field>
         </record>
@@ -75,6 +75,7 @@
                 <filter icon="terp-purchase"
                 		string="Manual in progress"
                 		domain="[('state','=','manual')]"/>
+                <filter icon="terp-purchase" string="Done" domain="[('state','=','done')]"/>
 
                 <separator orientation="vertical"/>
                 <field name="partner_id" string="Supplier"/>
@@ -85,55 +86,37 @@
                     		help="Purchase Non User"
                     		domain="[('user_id','=',False)]"/>
                 </field>
-                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
 				<newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
-                    <filter string="Location" icon="terp-purchase" context="{'group_by':'location_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
-                    <filter string="Pricelist" icon="terp-purchase" context="{'group_by':'pricelist_id'}"/>
+                    <filter string="Supplier" name="partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
                     <filter string="Validated by" icon="terp-purchase" context="{'group_by':'validator'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Address Contact Name" icon="terp-purchase" context="{'group_by':'partner_address_id'}"/>
-                    <filter string="Dest. Contact Name" icon="terp-purchase" context="{'group_by':'dest_address_id'}"/>
                     <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Supplier" name="partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
                     <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
-                    <filter string="Fiscal Position" icon="terp-purchase" context="{'group_by':'fiscal_position'}"/>
-                    <newline/>
+                    <separator orientation="vertical"/>
+                    <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
+                    <filter string="Destination" icon="terp-purchase" context="{'group_by':'location_id'}"/>
+                    <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-purchase" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-purchase" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-purchase" context="{'group_by':'name'}"/>
                 </group>
 				<newline/>
                 <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
-                    <filter icon="terp-purchase" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
-                    <filter icon="terp-purchase" string="Done" domain="[('state','=','done')]"/>
-                    <separator orientation="vertical"/>
+                    <field name="date"/>
                     <field name="date_approve"/>
-                    <separator orientation="vertical"/>
-                    <field name="partner_address_id"/>
+                    <field name="expected_date"/>
+                    <newline/>
                     <field name="invoice_method"/>
                     <field name="warehouse_id" widget="selection"/>
                     <field name="validator" widget="selection"/>
-
-                    <newline/>
-                    <filter icon="terp-purchase" string="Invoice Exception  " domain="[('state','=','invoice_except')]"/>
-                    <filter icon="terp-purchase" string="Cancel" domain="[('state','=','cancel')]"/>
                     <separator orientation="vertical"/>
-                    <field name="expected_date"/>
-                    <separator orientation="vertical"/>
-                    <field name="dest_address_id"/>
-                    <field name="fiscal_position" widget="selection"/>
-                    <field name="location_id" widget="selection"/>
-                    <field name="pricelist_id" widget="selection"/>
-
- 					<newline/>
-					<field name="date"/>
+                    <field name="location_id"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
             </search>
         </field>
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index b105b6ba3aa..635297d0f21 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -22,7 +22,9 @@
 	                 position="attributes">
 	            <attribute name="string">After having installed the core purchase application, you can extend it with more modules on needs of your organization</attribute>
 	          </xpath>
-
+              <xpath expr="//button[@string='Install Modules']" position="attributes">
+                   <attribute name="string">Configure</attribute>
+               </xpath>
                 <group colspan="8">
                   <field name="purchase_requisition"/>
                 </group>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 4a4587f5f04..186815c9bc3 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -39,7 +39,7 @@
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="origin"/>
-					<field name="company_id" groups="base.group_multi_company" widget="selection"/>                    
+					<field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
 
                 <notebook colspan="4">
@@ -65,7 +65,7 @@
 	                    <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
 						<button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
 						<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
-	                </group>                        
+	                </group>
                     </page>
                     <page string="Quotations">
 						<field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
@@ -77,8 +77,8 @@
 			                    <field name="location_id"/>
 			                    <field name="minimum_planned_date"/>
 			                    <field name="origin"/>
-			                    <field name="state"/>	
-			                    </tree>	
+			                    <field name="state"/>
+			                    </tree>
                      	</field>
 						<separator colspan="4" string=""/>
                      	<group col="8" colspan="4">
@@ -117,8 +117,8 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
                  <group col='10' colspan='4'>
-                    <filter icon="terp-purchase" string="Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
-					<filter icon="terp-purchase" string="Done" domain="[('state','=','done')]" separator="1" help="Current Purchaes Requisition"/>                    
+                    <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"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1" string="Requisition Reference"/>
                     <field name="purchase_ids" select="1"/>
@@ -127,13 +127,13 @@
                     <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="10" groups="base.group_extended">
-                    <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-  					<separator orientation="vertical"/>                    
-                    <filter string="Date Start" icon="terp-purchase" domain="[]" context="{'group_by':'date_start'}"/>
-                    <filter string="Date End" icon="terp-purchase" domain="[]" context="{'group_by':'date_end'}"/>
-                    <separator orientation="vertical"/>                    
-					<filter string="Origin" icon="terp-purchase" domain="[]" context="{'group_by':'origin'}"/>
+                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+  					<separator orientation="vertical"/>
+                    <filter string="Date Start" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
+                    <filter string="Date End" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'date_end'}"/>
+                    <separator orientation="vertical"/>
+					<filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                 </group>
               </search>
             </field>
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index e886ba302b9..3f74e857035 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -82,15 +82,15 @@ class purchase_requisition_partner(osv.osv_memory):
             purchase_order_line={}
             for tender in tender_obj.browse(cr, uid, record_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            
                     newdate = DateTime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S')
                     newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
-                    newdate = newdate -(line.product_id.seller_ids and line.product_id.seller_ids[0].delay or DateTime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') )
-                    
-
-                    partner = line.product_id.seller_ids and line.product_id.seller_ids[0].name or supplier_data
-                    pricelist_id = partner.property_product_pricelist_purchase and partner.property_product_pricelist_purchase.id 
+                    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 
                     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)
         
diff --git a/addons/report_account/i18n/hr.po b/addons/report_account/i18n/hr.po
index 27ea37fd939..55cdcb73b85 100644
--- a/addons/report_account/i18n/hr.po
+++ b/addons/report_account/i18n/hr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-25 00:58+0000\n"
+"PO-Revision-Date: 2010-06-06 23:33+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Povrat novca  kupcu"
 
 #. module: report_account
 #: constraint:ir.model:0
diff --git a/addons/report_analytic/i18n/hr.po b/addons/report_analytic/i18n/hr.po
index 4a2873d8fad..2eb92737c78 100644
--- a/addons/report_analytic/i18n/hr.po
+++ b/addons/report_analytic/i18n/hr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-25 10:39+0000\n"
+"PO-Revision-Date: 2010-06-06 23:37+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
 #. module: report_analytic
 #: model:ir.model,name:report_analytic.model_report_analytic_account_close
 msgid "Analytic account to close"
-msgstr ""
+msgstr "Analitički konto koji treba zatvoriti"
 
 #. module: report_analytic
 #: constraint:ir.model:0
diff --git a/addons/report_analytic_planning/i18n/hr.po b/addons/report_analytic_planning/i18n/hr.po
index 2d5dabb1225..8fad3d2c47d 100644
--- a/addons/report_analytic_planning/i18n/hr.po
+++ b/addons/report_analytic_planning/i18n/hr.po
@@ -7,20 +7,20 @@ 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-03-25 10:49+0000\n"
+"PO-Revision-Date: 2010-06-06 23:40+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
-msgstr ""
+msgstr "Za:"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
@@ -202,7 +202,7 @@ msgstr "Korisnik"
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
@@ -317,7 +317,7 @@ msgstr "Planiranje"
 #. module: report_analytic_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index bcd0250fb7e..6a48c919460 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -22,6 +22,9 @@
             <attribute name="string"
                        >OpenERP's built-in reporting abilities can be improved even further with some of the following applications</attribute>
           </xpath>
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
+                   <attribute name="string">Configure</attribute>
+          </xpath>
           <group colspan="8">
             <field name="base_report_designer"/>
             <field name="base_report_creator"/>
diff --git a/addons/report_document/i18n/hr.po b/addons/report_document/i18n/hr.po
index c357a52df8f..5670e89f04f 100644
--- a/addons/report_document/i18n/hr.po
+++ b/addons/report_document/i18n/hr.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-03-25 10:49+0000\n"
+"PO-Revision-Date: 2010-06-06 23:40+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -21,7 +21,7 @@ msgstr ""
 #: field:report.document.user,create_date:0
 #: field:report.files.partner,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "Datum stvaranja"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_files_by_partner
diff --git a/addons/report_intrastat/i18n/hr.po b/addons/report_intrastat/i18n/hr.po
index 70646bd777f..b89b14d5461 100644
--- a/addons/report_intrastat/i18n/hr.po
+++ b/addons/report_intrastat/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-25 10:49+0000\n"
+"PO-Revision-Date: 2010-06-06 23:41+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -174,7 +174,7 @@ msgstr "Porezi"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Amount"
-msgstr ""
+msgstr "Iznos"
 
 #. module: report_intrastat
 #: view:report.intrastat:0
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index e7a12e8ac5e..0449b097ec4 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -97,8 +97,8 @@
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
                     <group col="10" colspan="4">
-                        <filter string="This Year" icon="terp-stock" domain="[('name','=',time.localtime()[0])]"/>
-                        <filter string="This Month" icon="terp-stock" domain="[('month','=',time.localtime()[1])]"/>
+                        <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
+                        <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="month" select="1"/>
diff --git a/addons/report_project/i18n/hr.po b/addons/report_project/i18n/hr.po
index e5bfa077090..185c661427d 100644
--- a/addons/report_project/i18n/hr.po
+++ b/addons/report_project/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-22 19:24+0000\n"
+"PO-Revision-Date: 2010-06-06 23:41+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -21,7 +21,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:report_project.action_project_task_tree_month
 #: model:ir.ui.menu,name:report_project.menu_project_task_tree_month
 msgid "Tasks finished by project (this month)"
-msgstr ""
+msgstr "Izvršeni zadaci prema Projektu (Ovaj mjesec)"
 
 #. module: report_project
 #: constraint:ir.model:0
diff --git a/addons/report_purchase/i18n/hr.po b/addons/report_purchase/i18n/hr.po
index 35c7a3d8ce8..164b32e6849 100644
--- a/addons/report_purchase/i18n/hr.po
+++ b/addons/report_purchase/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-22 21:23+0000\n"
+"PO-Revision-Date: 2010-06-06 23:42+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -21,7 +21,7 @@ msgstr ""
 #: field:report.purchase.order.category,price_average:0
 #: field:report.purchase.order.product,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Prosječna cijena"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,state:0
diff --git a/addons/report_sale/i18n/hr.po b/addons/report_sale/i18n/hr.po
index 6e2d5c4d644..e9e89fc8e0c 100644
--- a/addons/report_sale/i18n/hr.po
+++ b/addons/report_sale/i18n/hr.po
@@ -7,33 +7,33 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-22 21:28+0000\n"
+"PO-Revision-Date: 2010-06-06 23:42+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
 #. module: report_sale
 #: selection:report.sale.order.created,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "U razvoju"
 
 #. module: report_sale
 #: field:report.sale.order.category,price_average:0
 #: field:report.sale.order.product,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Prosječna cijena"
 
 #. module: report_sale
 #: field:report.sale.order.category,state:0
 #: field:report.sale.order.created,state:0
 #: field:report.sale.order.product,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Stanje Narudžbe"
 
 #. module: report_sale
 #: model:ir.model,name:report_sale.model_report_sale_order_created
diff --git a/addons/report_task/i18n/es.po b/addons/report_task/i18n/es.po
index 0f580ae034e..419b48300af 100644
--- a/addons/report_task/i18n/es.po
+++ b/addons/report_task/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: 2009-11-17 10:28+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-04 12:29+0000\n"
+"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
@@ -179,7 +179,7 @@ msgstr "Proyecto"
 #. module: report_task
 #: field:report.task.user.pipeline.open,task_nbr:0
 msgid "Task Number"
-msgstr ""
+msgstr "Número de tarea"
 
 #. module: report_task
 #: model:ir.model,name:report_task.model_report_timesheet_task_user
@@ -194,13 +194,13 @@ msgstr "Tareas por usuario y proyecto"
 #. module: report_task
 #: view:report.closed.task:0
 msgid "Planned"
-msgstr ""
+msgstr "Planificado"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: report_task
 #: view:report.timesheet.task.user:0
@@ -210,22 +210,22 @@ msgstr ""
 #. module: report_task
 #: field:report.task.user.pipeline.open,task_progress:0
 msgid "Task Progress"
-msgstr ""
+msgstr "Progreso de la tarea"
 
 #. module: report_task
 #: field:report.closed.task,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Fecha de cierre"
 
 #. module: report_task
 #: field:report.closed.task,user_id:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Asignado a"
 
 #. module: report_task
 #: field:report.closed.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
 
 #. module: report_task
 #: model:ir.model,name:report_task.model_report_closed_task
@@ -235,17 +235,17 @@ msgstr ""
 #. module: report_task
 #: field:report.timesheet.task.user,name:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "Urgente"
 
 #. module: report_task
 #: field:report.closed.task,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Fecha límite"
 
 #. module: report_task
 #: field:report.timesheet.task.user,timesheet_hrs:0
@@ -255,12 +255,12 @@ msgstr ""
 #. module: report_task
 #: view:report.closed.task:0
 msgid "Closed Tasks"
-msgstr ""
+msgstr "Tareas cerradas"
 
 #. module: report_task
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #. module: report_task
 #: field:report.closed.task,planned_hours:0
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 225a6626ab1..d8eb378b7d8 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -35,23 +35,30 @@ class resource_calendar(osv.osv):
         'manager' : fields.many2one('res.users', 'Workgroup manager'),
     }
     _defaults = {
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', context=c)
+        'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', context=context)
     }
-
-    def interval_min_get(self, cr, uid, id, dt_from, hours, resource=False):
+    
+    def _get_leaves(self, cr, uid, id, resource):
         resource_cal_leaves = self.pool.get('resource.calendar.leaves')
         dt_leave = []
-        if not id:
-            return [(dt_from - mx.DateTime.RelativeDateTime(hours=int(hours)*3), dt_from)]
+        
         resource_leave_ids = resource_cal_leaves.search(cr, uid, [('calendar_id','=',id), '|', ('resource_id','=',False), ('resource_id','=',resource)])
         res_leaves = resource_cal_leaves.read(cr, uid, resource_leave_ids, ['date_from', 'date_to'])
+        
         for leave in res_leaves:
             dtf = mx.DateTime.strptime(leave['date_from'], '%Y-%m-%d %H:%M:%S')
             dtt = mx.DateTime.strptime(leave['date_to'], '%Y-%m-%d %H:%M:%S')
             no = dtt - dtf
             [dt_leave.append((dtf + mx.DateTime.RelativeDateTime(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
             dt_leave.sort()
-            dt_leave.reverse()
+        
+        return dt_leave
+    
+    def interval_min_get(self, cr, uid, id, dt_from, hours, resource=False):
+        if not id:
+            return [(dt_from - mx.DateTime.RelativeDateTime(hours=int(hours)*3), dt_from)]
+        dt_leave = self._get_leaves(cr, uid, id, resource)
+        dt_leave.reverse()
         todo = hours
         cycle = 0
         result = []
@@ -85,18 +92,9 @@ class resource_calendar(osv.osv):
         return result
 
     def interval_get(self, cr, uid, id, dt_from, hours, resource=False, byday=True):
-        resource_cal_leaves = self.pool.get('resource.calendar.leaves')
-        dt_leave = []
         if not id:
             return [(dt_from,dt_from + mx.DateTime.RelativeDateTime(hours=int(hours)*3))]
-        resource_leave_ids = resource_cal_leaves.search(cr, uid, [('calendar_id','=',id), '|', ('resource_id','=',False), ('resource_id','=',resource)])
-        res_leaves = resource_cal_leaves.read(cr, uid, resource_leave_ids, ['date_from', 'date_to'])
-        for leave in res_leaves:
-            dtf = mx.DateTime.strptime(leave['date_from'], '%Y-%m-%d %H:%M:%S')
-            dtt = mx.DateTime.strptime(leave['date_to'], '%Y-%m-%d %H:%M:%S')
-            no = dtt - dtf
-            [dt_leave.append((dtf + mx.DateTime.RelativeDateTime(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
-            dt_leave.sort()
+        dt_leave = self._get_leaves(cr, uid, id, resource)
         todo = hours
         cycle = 0
         result = []
@@ -105,29 +103,70 @@ class resource_calendar(osv.osv):
         while (todo>0) and maxrecur:
             cr.execute("select hour_from,hour_to from resource_calendar_week where dayofweek='%s' and calendar_id=%s order by hour_from", (dt_from.day_of_week,id))
             for (hour_from,hour_to) in cr.fetchall():
-                    leave_flag  = False
-                    if (hour_to>current_hour) and (todo>0):
-                        m = max(hour_from, current_hour)
-                        if (hour_to-m)>todo:
-                            hour_to = m+todo
-                        dt_check = dt_from.strftime('%Y-%m-%d')
-                        for leave in dt_leave:
-                            if dt_check == leave:
-                                dt_check = mx.DateTime.strptime(dt_check, "%Y-%m-%d") + mx.DateTime.RelativeDateTime(days=1)
-                                leave_flag = True
-                        if leave_flag:
-                            break
-                        else:
-                            d1 = mx.DateTime.DateTime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(m)), int((m%1) * 60))
-                            d2 = mx.DateTime.DateTime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_to)), int((hour_to%1) * 60))
-                            result.append((d1, d2))
-                            current_hour = hour_to
-                            todo -= (hour_to - m)
+                leave_flag  = False
+                if (hour_to>current_hour) and (todo>0):
+                    m = max(hour_from, current_hour)
+                    if (hour_to-m)>todo:
+                        hour_to = m+todo
+                    dt_check = dt_from.strftime('%Y-%m-%d')
+                    for leave in dt_leave:
+                        if dt_check == leave:
+                            dt_check = mx.DateTime.strptime(dt_check, "%Y-%m-%d") + mx.DateTime.RelativeDateTime(days=1)
+                            leave_flag = True
+                    if leave_flag:
+                        break
+                    else:
+                        d1 = mx.DateTime.DateTime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(m)), int((m%1) * 60))
+                        d2 = mx.DateTime.DateTime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_to)), int((hour_to%1) * 60))
+                        result.append((d1, d2))
+                        current_hour = hour_to
+                        todo -= (hour_to - m)
             dt_from += mx.DateTime.RelativeDateTime(days=1)
             current_hour = 0
             maxrecur -= 1
         return result
+    
+    def interval_hours_get(self, cr, uid, id, dt_from, dt_to, resource=False):
+        result = []
+        if not id:
+            return 0.0
+        dt_leave = self._get_leaves(cr, uid, id, resource)
+        hours = 0.0
+        
+        current_hour = dt_from.hour
 
+        while (dt_from <= dt_to):
+            cr.execute("select hour_from,hour_to from resource_calendar_week where dayofweek='%s' and calendar_id=%s order by hour_from", (dt_from.day_of_week,id))
+            der =  cr.fetchall()
+            for (hour_from,hour_to) in der:
+                if hours != 0.0:#For first time of the loop only,hours will be 0
+                    current_hour = hour_from
+                leave_flag = False
+                if (hour_to>=current_hour):
+                    dt_check = dt_from.strftime('%Y-%m-%d')
+                    for leave in dt_leave:
+                        if dt_check == leave:
+                            dt_check = mx.DateTime.strptime(dt_check, "%Y-%m-%d") + mx.DateTime.RelativeDateTime(days=1)
+                            leave_flag = True
+                    
+                    if leave_flag:
+                        break
+                    else:
+                        d1 = dt_from
+                        d2 = mx.DateTime.DateTime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_to)), int((hour_to%1) * 60))
+                        
+                        if hours != 0.0:#For first time of the loop only,hours will be 0
+                            d1 = mx.DateTime.DateTime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(current_hour)), int((current_hour%1) * 60))
+                            
+                        if dt_from.day == dt_to.day:
+                            if hour_from <= dt_to.hour <= hour_to:
+                                d2 = dt_to
+                        dt_from = d2
+                        hours += (d2-d1).seconds
+            dt_from = mx.DateTime.DateTime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(current_hour)), int((current_hour%1) * 60)) + mx.DateTime.RelativeDateTime(days=1)     
+            current_hour = 0.0
+        return (hours/3600)
+    
 resource_calendar()
 
 class resource_calendar_week(osv.osv):
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 7638de41ce2..df0974fd9ed 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -17,10 +17,10 @@
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Type" icon="terp-project" domain="[]" context="{'group_by':'resource_type'}"/>
-                        <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}"/>
-                        <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
+                   <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="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     </group>
                </search>
             </field>
@@ -55,9 +55,9 @@
                        <field name="resource_id" string="Resource" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Resouce" icon="terp-project" domain="[]" context="{'group_by':'resource_id'}"/>
-                        <!--<filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>-->
+                   <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"/>
                     </group>
                </search>
             </field>
@@ -162,12 +162,12 @@
             <field name="arch" type="xml">
                 <form string="Resource">
                     <field name="name" />
-                    <field name="active"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <field name="calendar_id" widget="selection"/>
-                    <field name="resource_type" />
                     <field name="user_id" attrs="{'required':[('resource_type','=','user')]}"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <field name="resource_type" />
+                    <field name="calendar_id" widget="selection"/>
                     <field name="time_efficiency" groups="base.group_extended"/>
+                    <field name="active"/>
                 </form>
             </field>
         </record>
@@ -178,11 +178,11 @@
             <field name="arch" type="xml">
                 <tree string="Resources">
                     <field name="name" />
+                    <field name="user_id" />
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="resource_type" />
                     <field name="calendar_id" />
                     <field name="time_efficiency" groups="base.group_extended"/>
-                    <field name="user_id" />
                 </tree>
             </field>
         </record>
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 40ef81e54c5..3514576e132 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/i18n/ca.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-31 12:42+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
-"tic.com>\n"
+"PO-Revision-Date: 2010-06-04 09:30+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -659,8 +659,8 @@ msgid ""
 "This Configuration step use to set default picking policy when make sale "
 "order"
 msgstr ""
-"Aquest pas en la configuració fixa la política d'empaquetament per defecte "
-"quan es crea una comanda de venda"
+"Aquest pas fixa la política d'empaquetament per defecte quan es crea una "
+"comanda de venda"
 
 #. module: sale
 #: model:process.process,name:sale.process_process_salesprocess0
@@ -734,7 +734,7 @@ msgstr "Proveïment de venda"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sale Order Logistic"
-msgstr "Configura logística comanda de venda"
+msgstr "Configureu la logística de les comandes de venda"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
@@ -749,7 +749,7 @@ msgstr "Estat"
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Packing Policy"
-msgstr "Política d'enviament"
+msgstr "Forma d'enviament"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
@@ -1200,10 +1200,10 @@ msgid ""
 "and simple methods to deliver products to the customer in one or two "
 "operations by the worker."
 msgstr ""
-"Por defecte, OpenERP pot gestionar rutes complexes i rutes de productes en "
-"el vostre magatzem i en les ubicacions d'empreses. Això configurarà els "
-"mètodes més comuns i senzills per enviar productes al client en una o dues "
-"operacions realitzades pel treballador."
+"Per defecte, OpenERP pot gestionar rutes complexes i rutes de productes en "
+"el vostre magatzem i en les ubicacions d'empreses. Aquesta opció us "
+"configurarà els mètodes més comuns i senzills per enviar productes al client "
+"en una o dues operacions realitzades pel treballador."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index b2ba5dbc8d4..071135f332d 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-24 00:11+0000\n"
+"PO-Revision-Date: 2010-06-06 23:44+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -797,7 +797,7 @@ msgstr "Ponuda"
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 msgid "Advance Product"
-msgstr ""
+msgstr "Proslijediti Proizvod"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
@@ -1031,7 +1031,7 @@ msgstr "Želite li zaista kreirati Račune?"
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
 msgid "Invoice based on packing lists"
-msgstr ""
+msgstr "Račun napravljen prema tovarnom listi"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index cad05c8dcc8..68f50068ec0 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -29,7 +29,12 @@ class sale_report(osv.osv):
     _auto = False
     _rec_name = 'date'
     _columns = {
-        'date': fields.date('Date', readonly=True),
+        'date': fields.date('Date Order', readonly=True),
+        'date_confirm': fields.date('Date Confirm', readonly=True),
+        'shipped':fields.boolean('Shipped', readonly=True),
+        'paid':fields.float('Picked', readonly=True),
+        'shipped_qty_1':fields.integer('Shipped Qty', readonly=True),
+        'paid_qty':fields.float('Paid Qty', 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'),
@@ -65,45 +70,40 @@ class sale_report(osv.osv):
         tools.drop_view_if_exists(cr, 'sale_report')
         cr.execute("""
             create or replace view sale_report as (
-                 select
-                     min(l.id) as id,
+            select el.*,
+                   -- (select count(1) from sale_order_line where order_id = s.id) as nbr,
+                    (select 1) as nbr,
                      s.date_order as date,
+                     s.date_confirm as date_confirm,
                      to_char(s.date_order, 'YYYY') as year,
                      to_char(s.date_order, 'MM') as month,
                      to_char(s.date_order, 'YYYY-MM-DD') as day,
-                     l.product_id as product_id,
-                     u.name as uom_name,
-                     sum(l.product_uom_qty * u.factor) as product_uom_qty,
                      s.partner_id as partner_id,
                      s.user_id as user_id,
                      s.shop_id as shop_id,
                      s.company_id as company_id,
-                     extract(epoch from avg(s.date_confirm-s.create_date))/(24*60*60)::decimal(16,2) as delay,
-                     sum(l.product_uom_qty*l.price_unit) as price_total,
-                     (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor))::decimal(16,2) as price_average,
-                     count(*) as nbr,
+                     extract(epoch from (s.date_confirm-s.create_date))/(24*60*60)::decimal(16,2) as delay,
                      s.state,
-                     pt.categ_id,
+                     s.shipped,
+                     s.shipped::integer as shipped_qty_1,
                      s.pricelist_id as pricelist_id,
                      s.project_id as analytic_account_id
-                     from
+    from 
+    sale_order s,
+    (
+        select l.id as id,
+                     l.product_id as product_id,
+                     u.name as uom_name,
+                     sum(l.product_uom_qty * u.factor) as product_uom_qty,
+                     sum(l.product_uom_qty*l.price_unit) as price_total,
+                     (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor))::decimal(16,2) as price_average,
+                     pt.categ_id, l.order_id
+        from
                  sale_order_line l
-                 left join sale_order s on (s.id=l.order_id)
                  left join product_uom u on (u.id=l.product_uom)
                  left join product_template pt on (pt.id=l.product_id)
-                 group by
-                     s.date_order,
-                     s.partner_id,
-                     l.product_id,
-                     l.product_uom,
-                     s.user_id,
-                     pt.categ_id,
-                     u.name,
-                     s.state,
-                     s.shop_id,
-                     s.company_id,
-                     s.pricelist_id,
-                     s.project_id
+        group by l.id, l.order_id, l.product_id, u.name, pt.categ_id) el
+    where s.id = el.order_id
             )
         """)
 sale_report()
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 98ae326fc14..f6090638891 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -19,13 +19,13 @@
                 <field name="product_id" invisible="1"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
-                <field name="product_uom_qty" sum="# of Qty"/>
+                <field name="product_uom_qty" avg="# of Qty"/>
+                <field name="shipped_qty_1"/>
                 <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay" avg="Days to Close"/>
                 <field name="state" invisible="1"/>
-                <field name="pricelist_id" invisible="1"/>
                 <field name="analytic_account_id" invisible="1"/>
             </tree>
         </field>
@@ -51,30 +51,34 @@
         <field name="arch" type="xml">
             <search string="Sales Analysis">
             	<group>
-            	    <filter icon="gtk-media-rewind" string="  365 Days  "
+            	    <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="gtk-media-rewind" string="   30 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="gtk-media-rewind"
+	                <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="Tasks during last 7 days"/>
 	                <separator orientation="vertical"/>
-	                <filter icon="terp-sale"
+	                <filter icon="terp-document-new"
 	                    string="Quotations"
 	                    domain="[('state','=','draft')]"/>
-	                <filter icon="terp-sale"
+	                <filter icon="terp-dolar"
 	                	string="Sales"
 	                	domain="[('state','not in',('draft','done','cancel'))]"/>
 	                <separator orientation="vertical"/>
+	                <filter icon="terp-sale"
+	                    string="Picked"
+	                    domain="[('shipped','=',True)]"/>
+	                <separator orientation="vertical"/>
 	                <field name="partner_id"/>
                     <field name="product_id"/>
 	                <field name="user_id" widget="selection">
-	                    <filter icon="terp-sale"
+	                    <filter icon="terp-dolar"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
@@ -82,29 +86,29 @@
 				</group>
 				<newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Salesman" icon="terp-sale" name="User" context="{'group_by':'user_id'}"/>
-                    <filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
-                    <filter string="Company" icon="terp-sale" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                    <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-sale" context="{'group_by':'product_id','set_visible':True}"/>
-                    <filter string="Default UoM" icon="terp-sale" context="{'group_by':'uom_name'}"/>
-                    <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
-                    <filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
+                    <filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
+                    <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
+                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Pricelist" icon="terp-sale" context="{'group_by':'pricelist_id'}"/>
-                    <filter string="Analytic Account" icon="terp-sale" context="{'group_by':'analytic_account_id'}"/>
-                    <filter string="Category of Product" icon="terp-sale" context="{'group_by':'categ_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-					<filter string="Day" icon="terp-sale" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-sale" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
+                    <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
+                    <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                    <separator orientation="vertical"/>
+                   <filter string="Day" icon="terp-go-month" 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>
 				<newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
                     <field name="date"/>
+                    <field name="date_confirm"/>
                     <separator orientation="vertical"/>
                     <field name="shop_id" widget="selection"/>
-                    <field name="state"/>
                     <field name="categ_id" widget="selection"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 43d8d6768cc..07c66ef91dc 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -49,7 +49,6 @@ def _incoterm_get(self, cr, uid, context=None):
     cr.execute('select code, code||\', \'||name from stock_incoterms where active')
     return cr.fetchall()
 
-
 class sale_order(osv.osv):
     _name = "sale.order"
     _log_create = True
@@ -73,7 +72,7 @@ class sale_order(osv.osv):
         if context is None:
             context = {}
         val = 0.0
-        for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id):
+        for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)['taxes']:
             val += c['amount']
         return val
 
@@ -511,12 +510,12 @@ class sale_order(osv.osv):
     def action_invoice_end(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-            
+
         for order in self.browse(cr, uid, ids, context=context):
             for line in order.order_line:
                 if line.state == 'exception':
                     self.pool.get('sale.order.line').write(cr, uid, [line.id], {'state': 'confirmed'}, context=context)
-            
+
             if order.state == 'invoice_except':
                 self.write(cr, uid, [order.id], {'state' : 'progress'}, context=context)
 
@@ -775,23 +774,16 @@ sale_order()
 # - update it on change product and unit price
 # - use it in report if there is a uos
 class sale_order_line(osv.osv):
-    def _amount_line_net(self, cr, uid, ids, field_name, arg, context=None):
-        if context is None:
-            context = {}
-        res = {}
-        for line in self.browse(cr, uid, ids, context=context):
-            res[line.id] = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
-        return res
-
     def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
-        if context is None:
-            context = {}
         res = {}
+        context = context or {}
+        tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids, context=context):
-            res[line.id] = line.price_unit * line.product_uom_qty * (1 - (line.discount or 0.0) / 100.0)
+            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)
             cur = line.order_id.pricelist_id.currency_id
-            res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
+            res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
         return res
 
     def _number_packages(self, cr, uid, ids, field_name, arg, context=None):
@@ -800,7 +792,7 @@ class sale_order_line(osv.osv):
         res = {}
         for line in self.browse(cr, uid, ids, context=context):
             try:
-                res[line.id] = int(line.product_uom_qty / line.product_packaging.qty)
+                res[line.id] = int((line.product_uom_qty+line.product_packaging.qty-0.0001) / line.product_packaging.qty)
             except:
                 res[line.id] = 1
         return res
@@ -817,7 +809,6 @@ class sale_order_line(osv.osv):
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'procurement_id': fields.many2one('mrp.procurement', 'Procurement'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}),
-        'price_net': fields.function(_amount_line_net, method=True, string='Net Price', digits_compute= dp.get_precision('Sale Price')),
         'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft':[('readonly',False)]}),
         'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -1086,7 +1077,7 @@ class sale_order_line(osv.osv):
             warning = {
                 'title': 'No Pricelist !',
                 'message':
-                    'You have to select a pricelist in the sale form !\n'
+                    'You have to select a pricelist or a customer in the sale form !\n'
                     'Please set one before choosing a product.'
                 }
         else:
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index e1a8998e1d3..2be5a50ff81 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -9,16 +9,6 @@
             <field name="object">sale.order</field>
         </record>
         
-        <!--
-	Partner event type 
-	-->
-        <record id="event_type_sale_open" model="res.partner.event.type">
-            <field name="name">SALE: Sale Confirmation</field>
-            <field name="key">sale_open</field>
-        </record>
-        
-        
-        
         <!--
 	Resource: sale.shop
 	-->
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c3a8708decb..c236b669580 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -43,8 +43,9 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_shop_tree"/>
         </record>
+
         <menuitem action="action_shop_form" id="menu_action_shop_form"
-            parent="base.menu_base_config" sequence="70"
+            parent="product.prod_config_main" sequence="0"
             groups="base.group_extended"/>
 
         <record id="view_sale_order_calendar" model="ir.ui.view">
@@ -130,8 +131,7 @@
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
                                                 />
                                             <field name="product_uom"
-                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"
-                                                widget="selection"/>
+                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
                                             <field
                                                 name="product_packaging"
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
@@ -182,16 +182,16 @@
                                     <field name="product_uom" string="UoM"/>
                                     <field name="discount"/>
                                     <field name="price_unit"/>
-                                    <field name="price_net"/>
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
                             <newline/>
-                            <group col="8" colspan="5">
+                            <group col="8" colspan="10">
                                 <field name="amount_untaxed" sum="Untaxed amount"/>
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
+                                <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute"/>
                             </group>
                             <group col="13" colspan="4">
                                 <field name="state"/>
@@ -251,21 +251,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-sale" string="Running" domain="[('state','in',('manual','progress'))]"/>
-                    <filter icon="terp-sale" string="Sales To Invoice" domain="[('state','=','manual')]"/>
+                    <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-check" string="Running" domain="[('state','in',('manual','progress'))]"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="Sales To Invoice" domain="[('state','=','manual')]"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
                     <field name="partner_id" select="1"/>
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="11" col="11" groups="base.group_extended">
-                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                        <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                </search>
             </field>
@@ -349,7 +349,6 @@
                     <field name="product_uom_qty" string="Qty"/>
                     <field name="product_uom" string="UoM"/>
                     <field name="salesman_id"/>
-                    <field name="price_net"/>
                     <field name="price_subtotal"/>
                     <field name="th_weight"/>
                     <field name="state"/>
@@ -384,6 +383,11 @@
                             <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" nolabel="1"/>
                             <separator colspan="4" string="States"/>
                             <field name="state"/>
+                            <button colspan="1"
+                              name="%(action_view_sale_order_line_make_invoice)d"
+                              string="Make Invoice"
+                              type="action"
+                              icon="gtk-print" />
                             <group col="2" colspan="2">
                                 <button name="button_done"
                                     states="confirmed,exception"
@@ -415,21 +419,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
                     <field name="salesman_id" widget="selection">
-                        <filter icon="terp-sale" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
-                        <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
+                        <filter icon="terp-dolar" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
+                        <filter icon="terp-personal+" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
                     </field>
                     <newline/>
                     <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
-                        <filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
-                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'salesman_id'}"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'salesman_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -441,14 +445,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
-                    <filter icon="terp-purchase" string="Shipped"
+                    <filter icon="terp-accessories-archiver" string="Shipped"
                         domain="[('state','=','done')]"
                         name="unshipped"
                         />
-                    <filter icon="terp-purchase" string="Uninvoiced" name="uninvoiced"
+                    <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced"
                         domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"
                         />
-                    <filter icon="terp-purchase" string="Sale Order"
+                    <filter icon="terp-dolar" string="Sale Order"
                         domain="[('state','=','confirmed')]"
                         name="sale order"
                         />
@@ -458,10 +462,10 @@
                     <field name="product_id"/>
                     <field name="state"/>
                     <newline />
-                    <group expand="1" string="Group By..." colspan="9" col="8">
-                        <filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By..." colspan="9" col="8">
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 436fabc91fc..0420a8c3404 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -14,13 +14,14 @@
             </field>
 		</record>
 
-        <act_window name="Make Invoices"		    
-		    res_model="sale.order.line.make.invoice"
-		    src_model="sale.order.line"
-		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_view_sale_order_line_make_invoice"/>		
+		<record id="action_view_sale_order_line_make_invoice" model="ir.actions.act_window">
+            <field name="name">Make Invoices</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order.line.make.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/sale_crm/i18n/hr.po b/addons/sale_crm/i18n/hr.po
index 5ab251827fc..9118f4fc765 100644
--- a/addons/sale_crm/i18n/hr.po
+++ b/addons/sale_crm/i18n/hr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-22 00:56+0000\n"
+"PO-Revision-Date: 2010-06-06 23:44+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_crmopportunityquotation
 msgid "Crm opportunity quotation"
-msgstr ""
+msgstr "Ponuda CRM prilici"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityanalytic0
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 7a8cd419718..bf5f1aaac52 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,7 +9,7 @@
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
         <field name="arch" type="xml">
             <field name="priority" position="after">
-                <button string="Convert to Quote" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/>
+                <button string="Create a Sale Order" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/>
                 <label colspan="2"  string=""/>
             </field>
         </field>
@@ -35,7 +35,7 @@
         <field name="arch" type="xml">
             <field name="date_order" position="after">
             <field name="section_id" default="context.get('section_id', False)" widget="selection" string="Sale Team" groups="base.group_extended">
-                    <filter icon="terp-crm"
+                    <filter icon="terp-personal+"
                             domain="[('section_id','=',context.get('section_id',False))]"
                             groups="base.group_extended"
                             help="My Sales Team"/>
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
index 1a1d2387da9..e4aacce1044 100644
--- a/addons/sale_crm/wizard/makesale.py
+++ b/addons/sale_crm/wizard/makesale.py
@@ -28,7 +28,7 @@ import pooler
 from tools.translate import _
 
 sale_form = """<?xml version="1.0"?>
-<form string="Convert to Quote">
+<form string="Create a Sale Order">
     <field name="partner_id" required="True"/>
     <field name="shop_id" required="True"/>
     <field name="analytic_account"/>
@@ -135,10 +135,10 @@ class make_sale(wizard.interface):
 
         if data['form']['close']:
             case_obj.case_close(cr, uid, data['ids'])
-        
+
         if not new_ids:
             return {}
-            
+
         if len(new_ids)<=1:
             value = {
                 'domain': str([('id', 'in', new_ids)]),
@@ -159,7 +159,7 @@ class make_sale(wizard.interface):
                 'type': 'ir.actions.act_window',
                 'res_id':new_ids
                 }
-                
+
         return value
 
     states = {
diff --git a/addons/sale_journal/__init__.py b/addons/sale_journal/__init__.py
index 4cb6588ed18..f846067a3b4 100644
--- a/addons/sale_journal/__init__.py
+++ b/addons/sale_journal/__init__.py
@@ -18,10 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-
 import sale_journal
-import sale_journal_inherit
-import sale_journal_report
-import sale_journal_picking_report
+import report
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index d204d4a3ee5..94d343debb9 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -28,7 +28,7 @@
     The sale journal modules allows you to categorise your
     sales and deliveries (picking lists) between different journals.
     This module is very helpful for bigger companies that
-    work by departments.
+    works by departments.
 
     You can use journal for different purposes, some examples:
     * isolate sales of different departments
@@ -54,8 +54,7 @@
     'update_xml': [
         'security/ir.model.access.csv',
         'sale_journal_view.xml',
-        'picking_journal_view.xml',
-        'picking_journal_view_report.xml'
+        'report/sale_journal_report_view.xml',
     ],
     'demo_xml': ['sale_journal_demo.xml'],
     'installable': True,
diff --git a/addons/sale_journal/i18n/hr.po b/addons/sale_journal/i18n/hr.po
index 87f36a5ca04..adb16bbb9f7 100644
--- a/addons/sale_journal/i18n/hr.po
+++ b/addons/sale_journal/i18n/hr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-24 00:49+0000\n"
+"PO-Revision-Date: 2010-06-06 23:45+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_journal_sale_stats
 msgid "Monthly sales"
-msgstr ""
+msgstr "Mjesečne prodaje"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned
@@ -378,7 +378,7 @@ msgstr "Pregled Pakiranja"
 #: selection:sale_journal.sale.journal,state:0
 #: selection:sale_journal.sale.stats,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
@@ -441,7 +441,7 @@ msgstr "Tip Računa"
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "invoiced"
-msgstr ""
+msgstr "Izdan račun"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
deleted file mode 100644
index f6b59668150..00000000000
--- a/addons/sale_journal/picking_journal_view.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<openerp>
-<data>
-
-    <record model="ir.ui.view" id="view_picking_journal_form">
-        <field name="name">sale_journal.picking.journal.form</field>
-        <field name="model">sale_journal.picking.journal</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Picking Journal">
-                <notebook>
-                <page string="Journal">
-                    <separator string="Journal Information" colspan="4"/>
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="user_id"/>
-                    <field name="date"/>
-                    <field name="date_created"/>
-                    <field name="date_validation"/>
-                    <separator string="States" colspan="4"/>
-                    <field name="state"/>
-                    <group col="3" 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"/>
-                    </group>
-                </page>
-                <page string="Picking">
-                    <button string="Cancel Picking" name="button_picking_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
-                    <newline/>
-                    <field name="picking_stats_ids" colspan="4" nolabel="1"/>
-                </page><page string="Notes">
-                    <field name="note" colspan="4" nolabel="1"/>
-                </page>
-                </notebook>
-            </form>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_picking_journal_tree">
-        <field name="name">sale_journal.picking.journal.tree</field>
-        <field name="model">sale_journal.picking.journal</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Picking Journal">
-                <field name="name"/>
-                <field name="code"/>
-                <field name="user_id"/>
-                <field name="date"/>
-                <field name="state"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_picking_journal_search">
-        <field name="name">sale_journal.picking.journal.search</field>
-        <field name="model">sale_journal.picking.journal</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Picking Journal">
-                <group col="8" colspan="4">
-                    <filter icon="terp-hr" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="user_id" widget="selection"/>
-                    <field name="date"/>
-                </group>
-            </search>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_definition_picking_journal">
-        <field name="name">Picking journals</field>
-        <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>
-
-    <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
-
-    <record model="ir.actions.act_window" id="action_invoice_type_tree">
-        <field name="name">Picking by invoice_method</field>
-        <field name="name">sale_journal.invoice.type.tree</field>
-        <field name="res_model">sale_journal.invoice.type</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="view_type">tree</field>
-    </record>
-
-
-    <!--<menuitem name="Picking to Invoice" id="menu_definition_journal_picking_invoice" parent="stock.menu_action_picking_tree"/>-->
-    <!--<menuitem name="Picking by Invoice Method" id="menu_definition_journal_picking_invoice_method" parent="menu_definition_journal_picking_invoice" action="action_invoice_type_tree"/>-->
-
-    <record model="ir.actions.act_window" id="action_invoice_type_picking_open">
-        <field name="name">Picking to invoice</field>
-        <field name="res_model">stock.picking</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','done'),('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
-    </record>
-    <record model="ir.values" id="ir_open_invoice_type">
-        <field name="key2">tree_but_open</field>
-        <field name="model">sale_journal.invoice.type</field>
-        <field name="name">Picking to invoice</field>
-        <field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
-        <field name="object" eval="True"/>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/sale_journal/picking_journal_view_report.xml b/addons/sale_journal/picking_journal_view_report.xml
deleted file mode 100644
index 62c8d0a9ca1..00000000000
--- a/addons/sale_journal/picking_journal_view_report.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<openerp>
-<data>
-
-	#
-	# Pickings by invoice type
-	#
-
-	<record model="ir.ui.view" id="view_picking_invoice_type_stats_form">
-		<field name="name">sale_journal.invoice.type.stats.form</field>
-		<field name="model">sale_journal.invoice.type.stats</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Picking by invoice method">
-				<field name="name"/>
-				<field name="month"/>
-				<field name="invoice_state"/>
-				<field name="state"/>
-				<field name="invoice_type_id"/>
-				<field name="quantity"/>
-				<field name="count"/>
-				<field name="price_total"/>
-				<field name="price_average"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_picking_invoice_type_stats_tree">
-		<field name="name">sale_journal.invoice.type.stats.tree</field>
-		<field name="model">sale_journal.invoice.type.stats</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Picking by invoice method">
-				<field name="name"/>
-				<field name="month"/>
-				<field name="invoice_state"/>
-				<field name="state"/>
-				<field name="invoice_type_id"/>
-				<field name="quantity"/>
-				<field name="count"/>
-				<field name="price_total"/>
-				<field name="price_average"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_picking_invoice_type_stats_search">
-		<field name="name">sale_journal.invoice.type.stats.search</field>
-		<field name="model">sale_journal.invoice.type.stats</field>
-		<field name="type">search</field>
-		<field name="arch" type="xml">
-			<search string="Picking by invoice method">
-				<group col="8" colspan="4">
-					<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by invoice method in this year"/>
-	               	<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by invoice method in this month"/>
-	               	<separator orientation="vertical"/>
-					<field name="name"/>
-					<field name="month"/>
-					<field name="invoice_state"/>
-					<field name="state"/>
-				</group>
-			</search>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_invoice_type_picking_stats_open">
-		<field name="name">Statistics on picking to invoice</field>
-		<field name="res_model">sale_journal.invoice.type.stats</field>
-		<field name="type">ir.actions.act_window</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
-	</record>
-
-	<menuitem name="Picking Journal" id="menu_definition_journal_reporting" parent="stock.next_id_61"/>
-
-	<record model="ir.actions.act_window" id="action_invoice_type_picking_stats_open_menu_all">
-		<field name="name">Picking by invoice method</field>
-		<field name="res_model">sale_journal.invoice.type.stats</field>
-		<field name="type">ir.actions.act_window</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="search_view_id" ref="view_picking_invoice_type_stats_search"/>
-	</record>
-
-	<menuitem name="Picking by Invoice Method" id="menu_invoice_type_picking_stats_open_all" parent="menu_definition_journal_reporting" action="action_invoice_type_picking_stats_open_menu_all"/>
-
-	#
-	# Packing by journal
-	#
-
-	<record model="ir.ui.view" id="view_picking_journal_stats_form">
-		<field name="name">sale_journal.picking.stats.form</field>
-		<field name="model">sale_journal.picking.stats</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Picking by journals">
-				<field name="name"/>
-				<field name="month"/>
-				<field name="state"/>
-				<field name="journal_id"/>
-				<field name="quantity"/>
-				<field name="count"/>
-				<field name="price_total"/>
-				<field name="price_average"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_picking_journal_stats_tree">
-		<field name="name">sale_journal.picking.stats.tree</field>
-		<field name="model">sale_journal.picking.stats</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Picking by journals">
-				<field name="name"/>
-				<field name="state"/>
-				<field name="journal_id"/>
-				<field name="quantity"/>
-				<field name="count"/>
-				<field name="price_total"/>
-				<field name="price_average"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_picking_journal_stats_search">
-		<field name="name">sale_journal.picking.stats.search</field>
-		<field name="model">sale_journal.picking.stats</field>
-		<field name="type">search</field>
-		<field name="arch" type="xml">
-			<search string="Picking by journals">
-				<group col="8" colspan="4">
-					<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by journals in this year"/>
-	               	<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by journals in this month"/>
-	               	<separator orientation="vertical"/>
-					<field name="name"/>
-					<field name="month"/>
-					<field name="state"/>
-				</group>
-			</search>
-		</field>
-	</record>
-
-	<record model="ir.actions.act_window" id="action_picking_picking_stats_open_menu_all">
-		<field name="name">Picking by journal</field>
-		<field name="res_model">sale_journal.picking.stats</field>
-		<field name="type">ir.actions.act_window</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="search_view_id" ref="view_picking_journal_stats_search"/>
-	</record>
-
-	<menuitem name="Picking by Journal" id="menu_picking_picking_stats_open_all" parent="menu_definition_journal_reporting" action="action_picking_picking_stats_open_menu_all"/>
-
-</data>
-</openerp>
diff --git a/addons/sale_journal/report/__init__.py b/addons/sale_journal/report/__init__.py
new file mode 100644
index 00000000000..0f9b6da35da
--- /dev/null
+++ b/addons/sale_journal/report/__init__.py
@@ -0,0 +1,24 @@
+# -*- 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 sale_journal_report 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_journal/report/sale_journal_report.py b/addons/sale_journal/report/sale_journal_report.py
new file mode 100644
index 00000000000..0607f3be607
--- /dev/null
+++ b/addons/sale_journal/report/sale_journal_report.py
@@ -0,0 +1,141 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+import tools
+
+class sale_journal_report(osv.osv):
+    _name = "sale.journal.report"
+    _description = "Sales Orders by Journal"
+    _auto = False
+    _columns = {
+        'name': fields.char('Year', size=64, required=False, 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', '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), 
+        'journal_id':fields.many2one('sale_journal.sale.journal', 'Journal', readonly=True), 
+        'quantity': fields.float('Quantities', readonly=True), 
+        'price_total': fields.float('Total Price', readonly=True), 
+        'price_average': fields.float('Average Price', readonly=True), 
+        'count': fields.integer('# of Lines', readonly=True), 
+    }
+    
+    _order = 'journal_id, name desc,price_total desc'
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'sale_journal_report')
+        cr.execute("""
+            create or replace view sale_journal_report as (
+                select
+                    min(l.id) as id,
+                    to_char(s.date_order, 'YYYY') as name,
+                    to_char(s.date_order,'MM') as month,
+                    s.state,
+                    s.journal_id,
+                    sum(l.product_uom_qty) as quantity,
+                    count(*),
+                    sum(l.product_uom_qty*l.price_unit) as price_total,
+                    (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty))::decimal(16,2) as price_average
+                from sale_order s
+                    right join sale_order_line l on (s.id=l.order_id)
+                group by s.journal_id , to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'), s.state
+            )
+        """)
+        
+sale_journal_report()
+
+#==========================================
+#picking report
+#==========================================
+
+
+class sale_journal_picking_report(osv.osv):
+    """
+    Picking list by journal and by invoice
+    """
+    _name = "sale.journal.picking.report"
+    _description = "Picking lists"
+    _auto = False
+    _columns = {
+        'name': fields.char('Year', size=64, required=False, 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), 
+
+        'invoice_state':fields.selection([
+            ("invoiced", "invoiced"), 
+            ("2binvoiced", "to be invoiced"), 
+            ("none", "None")
+        ], "Invoice state", readonly=True), 
+        'state': fields.selection([
+            ('draft', 'draft'), 
+            ('auto', 'waiting'), 
+            ('confirmed', 'confirmed'), 
+            ('assigned', 'assigned'), 
+            ('done', 'done'), 
+            ('cancel', 'cancel'), 
+        ], 'State', readonly=True), 
+        'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoicing method', readonly=True), 
+        'journal_id':fields.many2one('sale_journal.picking.journal', 'Journal', readonly=True), 
+        'quantity': fields.float('Quantities', readonly=True), 
+        'price_total': fields.float('Total Price', readonly=True), 
+        'price_average': fields.float('Average Price', readonly=True), 
+        'count': fields.integer('# of Lines', readonly=True), 
+    }
+    _order = 'journal_id, name desc, price_total desc'
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'sale_journal_picking_report')
+
+        cr.execute("""
+            create or replace view sale_journal_picking_report as (
+                select
+                    min(l.id) as id,
+                    to_char(s.date, 'YYYY') as name,
+                    to_char(s.date, 'MM') as month,
+                    s.state,
+                    s.invoice_state,
+                    s.invoice_type_id,
+                    s.journal_id,
+                    sum(l.product_qty) as quantity,
+                    count(*) as count,
+                    sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0)) as price_total,
+                    (sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0))/sum(l.product_qty))::decimal(16,2) as price_average
+                from stock_picking s
+                    right join stock_move l on (s.id=l.picking_id)
+                    left join sale_order_line ol on (l.sale_line_id=ol.id)
+                group by s.journal_id, s.invoice_type_id, to_char(s.date, 'YYYY'),to_char(s.date, 'MM'),s.state, s.invoice_state
+                order by s.invoice_type_id, s.invoice_state, s.state
+                )
+        """)
+        
+sale_journal_picking_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/report/sale_journal_report_view.xml b/addons/sale_journal/report/sale_journal_report_view.xml
new file mode 100644
index 00000000000..aa0a9cf06fe
--- /dev/null
+++ b/addons/sale_journal/report/sale_journal_report_view.xml
@@ -0,0 +1,187 @@
+<openerp>
+   <data>
+
+   <!-- Sales by journal's view  -->
+
+	    <record model="ir.ui.view" id="view_sale_journal_report_tree">
+	        <field name="name">sale.journal.report.tree</field>
+	        <field name="model">sale.journal.report</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Sales by Journal">
+	                <field name="name" invisible="1"/>
+	                <field name="state" invisible="1"/>
+	                <field name="journal_id" invisible="1"/>
+	                <field name="quantity"/>
+	                <field name="count"/>
+	                <field name="price_average"/>
+	                <field name="price_total"/>
+	            </tree>
+	        </field>
+	    </record>
+
+	    <!-- sales journal graph view -->
+
+	    <record id="view_sale_journal_graph" model="ir.ui.view">
+	        <field name="name">sale.journal.report.graph</field>
+            <field name="model">sale.journal.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+               <graph string="Sales journal Statistics" type="bar">
+                 <field name="journal_id"/>
+                 <field name="price_total"/>
+              </graph>
+           </field>
+       </record>
+
+	  <!-- sales by journal search view -->
+
+	    <record model="ir.ui.view" id="view_sale_journal_report_search">
+	        <field name="name">sale.journal.report.search</field>
+	        <field name="model">sale.journal.report</field>
+	        <field name="type">search</field>
+	        <field name="arch" type="xml">
+	            <search string="Sales by Journal">
+	            	<group col="8" colspan="4">
+		            	<filter icon="terp-go-year" string="This Year" domain="[('name','!=','')]" help="Sale journal in this year"/>
+		               	<filter icon="terp-go-month" string="This Month" domain="[('name','=',time.strftime('%%Y-%%m-01'))]" help="Sale journal in this month"/>
+		               	<separator orientation="vertical"/>
+		                <filter icon="terp-document-new"
+		                    	string="Quotations"
+		                    	domain="[('state','=','draft')]"/>
+		                <filter icon="terp-gtk-media-pause"
+		                		string="Waiting Schedule"
+		                		domain="[('state','=','waiting_date')]"/>
+		                <filter icon="terp-camera_test"
+		                		string="In progress"
+		                		domain="[('state','=','progress')]"/>
+		                <separator orientation="vertical"/>
+		                <field name="name" select="1"/>
+		                <field name="state" select="1"/>
+		                <field name="journal_id" widget="selection"/>
+					</group>
+					<newline/>
+					<group expand="1" string="Group By..." colspan="4" col="12">
+						<filter string="journal" name="journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+						<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+					</group>
+	            </search>
+	        </field>
+	    </record>
+
+	<!-- Action of sales by journal view-->
+
+	    <record model="ir.actions.act_window" id="action_sale_journal_report_open_menu_all">
+	    	<field name="name">Sales by Journal</field>
+	        <field name="res_model">sale.journal.report</field>
+	        <field name="type">ir.actions.act_window</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,graph</field>
+	        <field name="search_view_id" ref="view_sale_journal_report_search"/>
+	        <field name="context">{'search_default_journal': 1,'group_by_no_leaf':1,'group_by':[]}</field>
+	    </record>
+
+	    <menuitem name="Sales by Journal" id="menu_sale_journal_report_open_all" parent="base.next_id_64" action="action_sale_journal_report_open_menu_all"/>
+
+	 <!-- picking by journal and invoice's tree view-->
+
+
+		<record model="ir.ui.view" id="view_sale_journal_picking_report_tree">
+			<field name="name">sale.journal.picking.report.tree</field>
+			<field name="model">sale.journal.picking.report</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Picking Journal">
+					<field name="name" invisible="1"/>
+					<field name="month" invisible="1"/>
+					<field name="invoice_state" invisible="1"/>
+					<field name="state" invisible="1"/>
+					<field name="invoice_type_id" invisible="1"/>
+					<field name="journal_id" invisible="1"/>
+					<field name="quantity" />
+					<field name="count" />
+					<field name="price_average"/>
+					<field name="price_total"/>
+				</tree>
+			</field>
+		</record>
+
+		<!-- picking journal's graph view -->
+
+		<record id="view_sale_journal_picking_graph" model="ir.ui.view">
+	        <field name="name">sale.journal.picking.report.graph</field>
+            <field name="model">sale.journal.picking.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+               <graph string="Picking journal Statistics" type="bar">
+                 <field name="journal_id"/>
+                 <field name="invoice_type_id"/>
+                 <field name="price_total"/>
+              </graph>
+           </field>
+       </record>
+
+       <!-- Picking journal search view -->
+
+		<record model="ir.ui.view" id="view_sale_journal_picking_report_search">
+			<field name="name">sale.journal.picking.report.search</field>
+			<field name="model">sale.journal.picking.report</field>
+			<field name="type">search</field>
+			<field name="arch" type="xml">
+				<search string="Picking journal">
+					<group col="8" colspan="4">
+						<filter icon="terp-go-year" string="This Year" name="year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by invoice or by journal method in this year"/>
+		               	<filter icon="terp-go-month" string="This Month" name="month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by invoice or by journal method in this month"/>
+		               	<separator orientation="vertical"/>
+		                <filter icon="terp-document-new"
+		                    	string="Draft"
+		                    	domain="[('state','=','draft')]"/>
+		                <filter icon="terp-gtk-media-pause"
+		                		string="Pending"
+		                		domain="[('state','=','waiting')]"/>
+		                <filter icon="terp-camera_test"
+		                		string="Confirmed"
+		                		domain="[('state','=','confirmed')]"/>
+		               	<separator orientation="vertical"/>
+						<field name="name" select="1"/>
+						<field name="month" select="1"/>
+						<field name="invoice_state" select="1"/>
+						<field name="state" select="1"/>
+		            </group>
+		            <newline/>
+		            <group expand="1" string="Group By..." colspan="4" col="12">
+	                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+	                    <filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_type_id'}"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="Invoice state" icon="terp-stock_effects-object-colorize" context="{'group_by':'invoice_state'}"/>
+	                    <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+					</group>
+				</search>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="action_sale_journal_picking_report_open">
+			<field name="name">Statistics on picking to invoice</field>
+			<field name="res_model">sale.journal.picking.report</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="domain">[('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
+		</record>
+
+	<!-- Action for picking journal view -->
+
+		<record model="ir.actions.act_window" id="action_sale_journal_picking_report_open_menu_all">
+			<field name="name">Picking Journal</field>
+			<field name="res_model">sale.journal.picking.report</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,graph</field>
+			<field name="search_view_id" ref="view_sale_journal_picking_report_search"/>
+			<field name="context">{'search_default_month':1, 'group_by_no_leaf':1,'group_by':[]}</field>
+		</record>
+
+		<menuitem name="Picking journal" id="menu_invoice_type_picking_stats_open_all" parent="stock.next_id_61" action="action_sale_journal_picking_report_open_menu_all"/>
+
+	</data>
+</openerp>
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 8b636241285..50e09a96997 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -25,7 +25,7 @@ import time
 
 class sale_journal_invoice_type(osv.osv):
     _name = 'sale_journal.invoice.type'
-    _description = 'Invoice Type'
+    _description = 'Invoice Types'
     _columns = {
         'name': fields.char('Invoice Type', size=64, required=True),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the invoice type without removing it."),
@@ -48,12 +48,12 @@ class sale_journal(osv.osv):
         'date': fields.date('Journal date', required=True),
         'date_created': fields.date('Creation date', readonly=True, required=True),
         'date_validation': fields.date('Validation date', readonly=True),
-        'sale_stats_ids': fields.one2many("sale_journal.sale.stats", "journal_id", 'Sale Stats', readonly=True),
+        'sale_stats_ids': fields.one2many("sale.journal.report", "journal_id", 'Sale Stats', readonly=True),
         'state': fields.selection([
             ('draft','Draft'),
             ('open','Open'),
             ('done','Done'),
-        ], 'State', required=True),
+        ], 'State', required=True, readonly=True),
         'note': fields.text('Note'),
     }
     _defaults = {
@@ -98,12 +98,12 @@ class picking_journal(osv.osv):
         'date': fields.date('Journal date', required=True),
         'date_created': fields.date('Creation date', readonly=True, required=True),
         'date_validation': fields.date('Validation date', readonly=True),
-        'picking_stats_ids': fields.one2many("sale_journal.picking.stats", "journal_id", 'Journal Stats', readonly=True),
+        'picking_stats_ids': fields.one2many("sale.journal.picking.report", "journal_id", 'Journal Stats', readonly=True),
         'state': fields.selection([
             ('draft','Draft'),
             ('open','Open'),
             ('done','Done'),
-        ], 'Creation date', required=True),
+        ], 'Creation date', required=True, readonly=True),
         'note': fields.text('Note'),
     }
     _defaults = {
@@ -130,5 +130,55 @@ class picking_journal(osv.osv):
         return True
 picking_journal()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+#==============================================
+# sale journal inherit
+#==============================================
 
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+    _columns = {
+        'property_invoice_type': fields.property(
+        'sale_journal.invoice.type',
+        type='many2one',
+        relation='sale_journal.invoice.type',
+        string="Invoicing Method",
+        method=True,
+        view_load=True,
+        group_name="Accounting Properties",
+        help="The type of journal used for sales and picking."),
+    }
+res_partner()
+
+class picking(osv.osv):
+    _inherit="stock.picking"
+    _columns = {
+        'journal_id': fields.many2one('sale_journal.picking.journal', 'Journal'),
+        '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"
+    _columns = {
+        'journal_id': fields.many2one('sale_journal.sale.journal', 'Journal'),
+        'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type')
+    }
+    def action_ship_create(self, cr, uid, ids, *args):
+        result = super(sale, self).action_ship_create(cr, uid, ids, *args)
+        for order in self.browse(cr, uid, ids, context={}):
+            pids = [ x.id for x in order.picking_ids]
+            self.pool.get('stock.picking').write(cr, uid, pids, {
+                'invoice_type_id': order.invoice_type_id.id,
+                'sale_journal_id': order.journal_id.id
+            })
+        return result
+
+    def onchange_partner_id(self, cr, uid, ids, part):
+        result = super(sale, self).onchange_partner_id(cr, uid, ids, part)
+        if part:
+            itype = self.pool.get('res.partner').browse(cr, uid, part).property_invoice_type.id
+            result['value']['invoice_type_id'] = itype
+        return result
+sale()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/sale_journal_inherit.py b/addons/sale_journal/sale_journal_inherit.py
deleted file mode 100644
index f9834862aa7..00000000000
--- a/addons/sale_journal/sale_journal_inherit.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-
-
-class res_partner(osv.osv):
-    _inherit = 'res.partner'
-    _columns = {
-        'property_invoice_type': fields.property(
-        'sale_journal.invoice.type',
-        type='many2one',
-        relation='sale_journal.invoice.type',
-        string="Invoicing Method",
-        method=True,
-        view_load=True,
-        group_name="Accounting Properties",
-        help="The type of journal used for sales and picking."),
-    }
-res_partner()
-
-class picking(osv.osv):
-    _inherit="stock.picking"
-    _columns = {
-        'journal_id': fields.many2one('sale_journal.picking.journal', 'Journal'),
-        '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"
-    _columns = {
-        'journal_id': fields.many2one('sale_journal.sale.journal', 'Journal'),
-        'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type')
-    }
-    def action_ship_create(self, cr, uid, ids, *args):
-        result = super(sale, self).action_ship_create(cr, uid, ids, *args)
-        for order in self.browse(cr, uid, ids, context={}):
-            pids = [ x.id for x in order.picking_ids]
-            self.pool.get('stock.picking').write(cr, uid, pids, {
-                'invoice_type_id': order.invoice_type_id.id,
-                'sale_journal_id': order.journal_id.id
-            })
-        return result
-
-    def onchange_partner_id(self, cr, uid, ids, part):
-        result = super(sale, self).onchange_partner_id(cr, uid, ids, part)
-        if part:
-            itype = self.pool.get('res.partner').browse(cr, uid, part).property_invoice_type.id
-            result['value']['invoice_type_id'] = itype
-        return result
-sale()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale_journal/sale_journal_picking_report.py b/addons/sale_journal/sale_journal_picking_report.py
deleted file mode 100644
index e13b64cc4d6..00000000000
--- a/addons/sale_journal/sale_journal_picking_report.py
+++ /dev/null
@@ -1,124 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields,osv
-import tools
-
-class report_sale_journal_invoice_type_stats(osv.osv):
-    _name = "sale_journal.invoice.type.stats"
-    _description = "Stats on picking by invoice method"
-    _auto = False
-    _columns = {
-        'name': fields.char('Year',size=64,required=False, readonly=True),
-        'invoice_state':fields.selection([
-            ("invoiced","invoiced"),
-            ("2binvoiced","to be invoiced"),
-            ("none","None")
-        ], "Invoice state", readonly=True),
-        'state': fields.selection([
-            ('draft','draft'),
-            ('auto','waiting'),
-            ('confirmed','confirmed'),
-            ('assigned','assigned'),
-            ('done','done'),
-            ('cancel','cancel'),
-        ], 'State', readonly=True),
-        'invoice_type_id':fields.many2one('sale_journal.invoice.type', 'Invoicing method', readonly=True),
-        'quantity': fields.float('Quantities', readonly=True),
-        'price_total': fields.float('Total Price', readonly=True),
-        'price_average': fields.float('Average Price', readonly=True),
-        'count': fields.integer('# of Lines', 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),
-
-    }
-    _order = 'state,invoice_state,name desc'
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'sale_journal_invoice_type_stats')
-        cr.execute("""
-            create or replace view sale_journal_invoice_type_stats as (
-                select
-                    min(l.id) as id,
-                    to_char(s.date, 'YYYY') as name,
-                    to_char(s.date, 'MM') as month,
-                    s.state,
-                    s.invoice_state,
-                    s.invoice_type_id,
-                    sum(l.product_qty) as quantity,
-                    count(*) as count,
-                    sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0)) as price_total,
-                    (sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0))/sum(l.product_qty))::decimal(16,2) as price_average
-                from stock_picking s
-                    left join stock_move l on (s.id=l.picking_id)
-                    left join sale_order_line ol on (l.sale_line_id=ol.id)
-                group by s.invoice_type_id, to_char(s.date, 'YYYY'),to_char(s.date, 'MM'),s.state, s.invoice_state
-                order by s.invoice_type_id, s.invoice_state, s.state
-            )
-        """)
-report_sale_journal_invoice_type_stats()
-
-class report_sale_journal_picking(osv.osv):
-    _name = "sale_journal.picking.stats"
-    _description = "Picking lists by Journal"
-    _auto = False
-    _columns = {
-        'name': fields.char('Year',size=64,required=False, readonly=True),
-        'state': fields.selection([
-            ('draft','draft'),
-            ('auto','waiting'),
-            ('confirmed','confirmed'),
-            ('assigned','assigned'),
-            ('done','done'),
-            ('cancel','cancel'),
-        ], 'State', readonly=True),
-        'journal_id':fields.many2one('sale_journal.picking.journal', 'Journal', readonly=True),
-        'quantity': fields.float('Quantities', readonly=True),
-        'price_total': fields.float('Total Price', readonly=True),
-        'price_average': fields.float('Average Price', readonly=True),
-        'count': fields.integer('# of Lines', 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),
-
-    }
-    _order = 'journal_id,name desc,price_total desc'
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'sale_journal_picking_stats')
-        cr.execute("""
-            create or replace view sale_journal_picking_stats as (
-                select
-                    min(l.id) as id,
-                    to_char(s.date, 'YYYY') as name,
-                    to_char(s.date, 'MM') as month,
-                    s.state,
-                    s.journal_id,
-                    sum(l.product_qty) as quantity,
-                    count(*) as count,
-                    sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0)) as price_total,
-                    (sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0))/sum(l.product_qty))::decimal(16,2) as price_average
-                from stock_picking s
-                    right join stock_move l on (s.id=l.picking_id)
-                    right join sale_order_line ol on (l.sale_line_id=ol.id)
-                group by s.journal_id, to_char(s.date, 'YYYY'),to_char(s.date, 'MM'),s.state
-            )
-        """)
-report_sale_journal_picking()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale_journal/sale_journal_report.py b/addons/sale_journal/sale_journal_report.py
deleted file mode 100644
index e77d7569004..00000000000
--- a/addons/sale_journal/sale_journal_report.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import fields,osv
-import tools
-
-class report_sale_journal_sale(osv.osv):
-    _name = "sale_journal.sale.stats"
-    _description = "Sales Orders by Journal"
-    _auto = False
-    _columns = {
-        'name': fields.char('Year',size=64,required=False, 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),
-        'journal_id':fields.many2one('sale_journal.sale.journal', 'Journal', readonly=True),
-        'quantity': fields.float('Quantities', readonly=True),
-        'price_total': fields.float('Total Price', readonly=True),
-        'price_average': fields.float('Average Price', readonly=True),
-        'count': fields.integer('# of Lines', 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),
-    }
-    _order = 'journal_id,name desc,price_total desc'
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'sale_journal_sale_stats')
-        cr.execute("""
-            create or replace view sale_journal_sale_stats as (
-                select
-                    min(l.id) as id,
-                    to_char(s.date_order, 'YYYY') as name,
-                    to_char(s.date_order,'MM') as month,
-                    s.state,
-                    s.journal_id,
-                    sum(l.product_uom_qty) as quantity,
-                    count(*),
-                    sum(l.product_uom_qty*l.price_unit) as price_total,
-                    (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty))::decimal(16,2) as price_average
-                from sale_order s
-                    right join sale_order_line l on (s.id=l.order_id)
-                group by s.journal_id, to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),s.state
-            )
-        """)
-report_sale_journal_sale()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index c1e415b8833..7e4cc33b283 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -1,385 +1,469 @@
 <openerp>
-<data>
-    <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
-        <field name="name">sale_journal.invoice.type.form</field>
-        <field name="model">sale_journal.invoice.type</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Invoice Type">
-                <field name="name" select="1"/>
-                <field name="active" select="1"/>
-                <field name="invoicing_method" select="1"/>
-                <newline/>
-                <field name="note" colspan="4"/>
-            </form>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
-        <field name="name">sale_journal.invoice.type.tree</field>
-        <field name="model">sale_journal.invoice.type</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Invoice Type">
-                <field name="name"/>
-                <field name="invoicing_method"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
-        <field name="res_model">sale_journal.invoice.type</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-    </record>
+   <data>
 
-<!--    <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/>-->
+   <!--  sale journal invoice Type's Form  view -->
 
-    <record model="ir.ui.view" id="view_sale_journal_form">
-        <field name="name">sale_journal.sale.journal.form</field>
-        <field name="model">sale_journal.sale.journal</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Sale Journal">
-                <notebook>
-                <page string="Journal">
-                    <separator string="Journal Information" colspan="4"/>
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="user_id"/>
-                    <field name="date"/>
-                    <field name="date_created"/>
-                    <field name="date_validation"/>
-                    <separator string="States" colspan="4"/>
-                    <field name="state"/>
-                    <group col="3" 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"/>
-                    </group>
-                </page>
-                <page string="Sales">
-                    <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"/>
-                    <newline/>
-                    <field name="sale_stats_ids" colspan="4" nolabel="1">
-                        <tree string="Sales">
-                            <field name="name"/>
-                            <field name="quantity"/>
-                            <field name="price_total"/>
-                            <field name="price_average"/>
-                            <field name="count"/>
-                            <field name="state"/>
-                        </tree>
-                    </field>
-                </page><page string="Notes">
-                    <field name="note" colspan="4" nolabel="1"/>
-                </page>
-                </notebook>
-            </form>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_sale_journal_tree">
-        <field name="name">sale_journal.sale.journal.tree</field>
-        <field name="model">sale_journal.sale.journal</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Sale Journal">
-                <field name="name"/>
-                <field name="code"/>
-                <field name="user_id"/>
-                <field name="date"/>
-                <field name="state"/>
-            </tree>
-        </field>
-    </record>
+	    <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
+	        <field name="name">sale_journal.invoice.type.form</field>
+	        <field name="model">sale_journal.invoice.type</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Invoice Type">
+	                <field name="name" select="1"/>
+	                <field name="active" select="1"/>
+	                <field name="invoicing_method" select="1"/>
+	                <newline/>
+	                <field name="note" colspan="4"/>
+	            </form>
+	        </field>
+	    </record>
 
-    <record model="ir.ui.view" id="view_sale_journal_search">
-        <field name="name">sale_journal.sale.journal.search</field>
-        <field name="model">sale_journal.sale.journal</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Sales by Journal">
-            	<group col="8" colspan="4">
-	               	<filter icon="terp-sale" string="Open" domain="[('state','=','open')]" help="Open Sale Journals"/>
-	               	<separator orientation="vertical"/>
+	  <!--  sale journal invoice Type's tree  view -->
+
+	    <record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
+	        <field name="name">sale_journal.invoice.type.tree</field>
+	        <field name="model">sale_journal.invoice.type</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Invoice Type">
 	                <field name="name"/>
-	                <field name="code"/>
-	                <field name="user_id"/>
-	                <field name="date" />
-				</group>
-            </search>
-        </field>
-    </record>
+	                <field name="invoicing_method"/>
+	            </tree>
+	        </field>
+	    </record>
 
-    <record model="ir.actions.act_window" id="action_definition_journal">
-        <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>
+	  <!-- Action for sale journal invoice Type -->
 
-<!--    <menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>-->
-	<menuitem id="menu_sale_journal" name="Journal" parent="base.menu_base_config" sequence="60" />
-	<menuitem name="Sales Journals" id="menu_definition_journal" parent="menu_sale_journal" action="action_definition_journal"/>
+	    <record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
+	        <field name="res_model">sale_journal.invoice.type</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,form</field>
+	    </record>
 
-    <record model="ir.ui.view" id="sale_journal_sale_order">
-        <field name="name">sale.order.journal.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">
-            <field name="invoiced" position="after">
-                <field name="journal_id" select="1"/>
-                <field name="invoice_type_id" select="1"/>
-            </field>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="sale_journal_sale_order_tree">
-        <field name="name">sale.order.journal.view.tree</field>
-        <field name="type">tree</field>
-        <field name="model">sale.order</field>
-        <field name="inherit_id" ref="sale.view_order_tree" />
-        <field name="arch" type="xml">
-            <field name="state" position="after">
-                <field name="invoice_type_id"/>
-                <field name="journal_id"/>
-            </field>
-        </field>
-    </record>
+	<!-- <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/> -->
 
-    <record model="ir.ui.view" id="sale_journal_picking_order">
-        <field name="name">stock.picking.journal.view.form</field>
-        <field name="type">form</field>
-        <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_form" />
-        <field name="arch" type="xml">
-            <field name="origin" position="after">
-                <field name="journal_id" select="1"/>
-                <field name="sale_journal_id" select="1"/>
-                <field name="invoice_type_id" select="1"/>
-            </field>
-        </field>
-    </record>
+	<!-- sale journal Form view  -->
 
-    <record model="ir.ui.view" id="sale_journal_picking_order_tree">
-        <field name="name">stock.picking.journal.view.tree</field>
-        <field name="type">tree</field>
-        <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.vpicktree" />
-        <field name="arch" type="xml">
-            <field name="invoice_state" position="after">
-                <field name="journal_id" select="1"/>
-                <field name="invoice_type_id" select="1"/>
-                <field name="sale_journal_id" select="1"/>
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="sale_journal_picking_order_del">
-        <field name="name">stock.picking.journal.view.form</field>
-        <field name="type">form</field>
-        <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_delivery_form" />
-        <field name="arch" type="xml">
-            <field name="origin" position="after">
-                <field name="journal_id" select="1"/>
-                <field name="sale_journal_id" select="1"/>
-                <field name="invoice_type_id" select="1"/>
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="sale_journal_picking_order_tree_del">
-        <field name="name">stock.picking.journal.view.tree</field>
-        <field name="type">tree</field>
-        <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_delivery_tree" />
-        <field name="arch" type="xml">
-            <field name="origin" position="after">
-                <field name="journal_id" select="1"/>
-                <field name="invoice_type_id" select="1"/>
-                <field name="sale_journal_id" select="1"/>
-            </field>
-        </field>
-    </record>
-
-
-    <record model="ir.ui.view" id="sale_journal_picking_order_in">
-        <field name="name">stock.picking.journal.view.form</field>
-        <field name="type">form</field>
-        <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_in_form" />
-        <field name="arch" type="xml">
-            <field name="origin" position="after">
-                <field name="journal_id" select="1"/>
-                <field name="sale_journal_id" select="1"/>
-                <field name="invoice_type_id" select="1"/>
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="sale_journal_picking_order_tree_in">
-        <field name="name">stock.picking.journal.view.tree</field>
-        <field name="type">tree</field>
-        <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_in_tree" />
-        <field name="arch" type="xml">
-            <field name="invoice_state" position="after">
-                <field name="journal_id" select="1"/>
-                <field name="invoice_type_id" select="1"/>
-                <field name="sale_journal_id" select="1"/>
-            </field>
-        </field>
-    </record>
-
-
-    <record model="ir.ui.view" id="sale_journal_picking_order_out">
-        <field name="name">stock.picking.journal.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="arch" type="xml">
-            <field name="origin" position="after">
-                <field name="journal_id" select="1"/>
-                <field name="sale_journal_id" select="1"/>
-                <field name="invoice_type_id" select="1"/>
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="sale_journal_picking_order_tree_out">
-        <field name="name">stock.picking.journal.view.tree</field>
-        <field name="type">tree</field>
-        <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_out_tree" />
-        <field name="arch" type="xml">
-            <field name="invoice_state" position="after">
-                <field name="journal_id" select="1"/>
-                <field name="invoice_type_id" select="1"/>
-                <field name="sale_journal_id" select="1"/>
-            </field>
-        </field>
-    </record>
-
-
-
-    <record model="ir.ui.view" id="view_sale_journal_sale_stats_tree">
-        <field name="name">sale_journal.sale.stats.tree</field>
-        <field name="model">sale_journal.sale.stats</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Sales by Journal">
-                <field name="name"/>
-                <field name="state"/>
-                <field name="journal_id"/>
-                <field name="quantity"/>
-                <field name="count"/>
-                <field name="price_total"/>
-                <field name="price_average"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_sale_journal_sale_stats_form">
-        <field name="name">sale_journal.sale.stats.form</field>
-        <field name="model">sale_journal.sale.stats</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Sales by Journal">
-                <field name="name"/>
-                <field name="state"/>
-                <field name="journal_id"/>
-                <field name="quantity"/>
-                <field name="count"/>
-                <field name="price_total"/>
-                <field name="price_average"/>
-            </form>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_sale_journal_sale_stats_search">
-        <field name="name">sale_journal.sale.stats.search</field>
-        <field name="model">sale_journal.sale.stats</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Sales by Journal">
-            	<group col="8" colspan="4">
-	            	<filter icon="terp-sale" string="This Year" domain="[('name','!=','')]" help="Sale journal in this year"/>
-	               	<filter icon="terp-sale" string="This Month" domain="[('name','=',time.strftime('%%Y-%%m-01'))]" help="Sale journal in this month"/>
-	               	<separator orientation="vertical"/>
-	                <field name="name"/>
+	    <record model="ir.ui.view" id="view_sale_journal_form">
+	        <field name="name">sale_journal.sale.journal.form</field>
+	        <field name="model">sale_journal.sale.journal</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Sales Journals">
+					<group colspan="4"	col="6">
+	                    <field name="name" select="1"/>
+	                    <field name="code" select="1"/>
+	                    <field name="user_id" select="1"/>
+	                    <field name="date" select="1"/>
+	                    <field name="date_created" select="1"/>
+	                    <field name="date_validation" select="1"/>
+	                </group>
+					<notebook colspan="4">
+		                <page string="Sales">
+		                    <field name="sale_stats_ids" colspan="4" nolabel="1">
+		                        <tree string="Sales">
+		                            <field name="name"/>
+		                            <field name="quantity"/>
+		                            <field name="price_total"/>
+		                            <field name="price_average"/>
+		                            <field name="count"/>
+		                            <field name="state"/>
+		                        </tree>
+		                    </field>
+		                </page>
+		                <page string="Notes">
+		                    <field name="note" colspan="4" nolabel="1"/>
+		                </page>
+	                </notebook>
 	                <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 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"/>
+	                    </group>
+	            </form>
+	        </field>
+	    </record>
+
+  <!-- Sale journal tree view -->
+
+	    <record model="ir.ui.view" id="view_sale_journal_tree">
+	        <field name="name">sale_journal.sale.journal.tree</field>
+	        <field name="model">sale_journal.sale.journal</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Sales Journals">
+	                <field name="name" select="1"/>
+	                <field name="code" select="1"/>
+	                <field name="user_id" select="1"/>
+	                <field name="date" select="1"/>
+	                <field name="state"/>
+	            </tree>
+	        </field>
+	    </record>
+
+	<!-- Sale journal search view -->
+
+	    <record model="ir.ui.view" id="view_sale_journal_search">
+	        <field name="name">sale_journal.sale.journal.search</field>
+	        <field name="model">sale_journal.sale.journal</field>
+	        <field name="type">search</field>
+	        <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"/>
+					</group>
+	            </search>
+	        </field>
+	    </record>
+
+      <!-- Action for sale journal view -->
+
+	    <record model="ir.actions.act_window" id="action_definition_journal">
+	        <field name="res_model">sale_journal.sale.journal</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,form</field>
+	        <field name="search_view_id" ref="view_sale_journal_search"/>
+	    </record>
+
+		<menuitem id="menu_definition_journal" name="Sales Journals" parent="base.menu_base_config"  action="action_definition_journal" sequence="60" />
+
+	<!-- Inherit sales order form view -->
+
+	    <record model="ir.ui.view" id="sale_journal_sale_order">
+	        <field name="name">sale.order.journal.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">
+	            <field name="user_id" position="after">
+                    <separator string="Journal" colspan="4"/>
+	                <field name="journal_id" select="1" widget="selection"/>
+	                <field name="invoice_type_id" select="1" widget="selection"/>
+	            </field>
+	        </field>
+	    </record>
+
+	    <!-- Inherit sales order tree view-->
+
+	    <record model="ir.ui.view" id="sale_journal_sale_order_tree">
+	        <field name="name">sale.order.journal.view.tree</field>
+	        <field name="type">tree</field>
+	        <field name="model">sale.order</field>
+	        <field name="inherit_id" ref="sale.view_order_tree" />
+	        <field name="arch" type="xml">
+	            <field name="state" position="after">
+	                <field name="invoice_type_id"/>
 	                <field name="journal_id"/>
-				</group>
-            </search>
-        </field>
-    </record>
+	            </field>
+	        </field>
+	    </record>
 
-    <record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_all">
-    	<field name="name">Sales by Journal</field>
-        <field name="res_model">sale_journal.sale.stats</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_sale_journal_sale_stats_search"/>
-    </record>
+<!--  Inherit stock picking's form view  -->
 
-	<menuitem name="Reporting" id="menu_definition_report_sales" parent="base.menu_base_partner" sequence="8"/>
-    <menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales" action="action_sale_sale_stats_open_menu_all"/>
+	    <record model="ir.ui.view" id="sale_journal_picking_order">
+	        <field name="name">stock.picking.journal.view.form</field>
+	        <field name="type">form</field>
+	        <field name="model">stock.picking</field>
+	        <field name="inherit_id" ref="stock.view_picking_form" />
+	        <field name="arch" type="xml">
+	            <field name="origin" position="after">
+	                <field name="journal_id" select="1"/>
+	                <field name="sale_journal_id" select="1"/>
+	                <field name="invoice_type_id" select="1"/>
+	            </field>
+	        </field>
+	    </record>
 
-    <act_window name="Monthly sales"
-        domain="[('journal_id', '=', active_id)]"
-        res_model="sale_journal.sale.stats"
-        src_model="sale_journal.sale.journal"
-        id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
+<!--  Inherit stock picking's tree view  -->
 
-    <act_window name="Assigned picking"
-        domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
-        res_model="stock.picking"
-        src_model="sale_journal.picking.journal"
-        id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
+	    <record model="ir.ui.view" id="sale_journal_picking_order_tree">
+	        <field name="name">stock.picking.journal.view.tree</field>
+	        <field name="type">tree</field>
+	        <field name="model">stock.picking</field>
+	        <field name="inherit_id" ref="stock.vpicktree" />
+	        <field name="arch" type="xml">
+	            <field name="origin" position="after">
+	                <field name="journal_id" select="1"/>
+	                <field name="invoice_type_id" select="1"/>
+	                <field name="sale_journal_id" select="1"/>
+	            </field>
+	        </field>
+	    </record>
 
-    <act_window name="Confirmed picking"
-        domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
-        res_model="stock.picking"
-        src_model="sale_journal.picking.journal"
-        id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
+	<!--  Inherit stock picking delivery's form  view.-->
 
-    <act_window name="Assigned picking"
-        domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
-        res_model="stock.picking"
-        src_model="sale_journal.sale.journal"
-        id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
+	    <record model="ir.ui.view" id="sale_journal_picking_order_del">
+	        <field name="name">stock.picking.journal.view.form</field>
+	        <field name="type">form</field>
+	        <field name="model">stock.picking</field>
+	        <field name="inherit_id" ref="stock.view_picking_delivery_form" />
+	        <field name="arch" type="xml">
+	            <field name="origin" position="after">
+	                <field name="journal_id" select="1"/>
+	                <field name="sale_journal_id" select="1"/>
+	                <field name="invoice_type_id" select="1"/>
+	            </field>
+	        </field>
+	    </record>
 
-    <act_window name="Confirmed picking"
-        domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
-        res_model="stock.picking"
-        src_model="sale_journal.sale.journal"
-        id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
+	<!--  Inherit stock picking delivery's tree  view.-->
 
-    <act_window name="Draft sales"
-        domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
-        res_model="sale.order"
-        src_model="sale_journal.sale.journal"
-        id="act_sale_journal_sale_journal_2_sale_order_draft"/>
+	    <record model="ir.ui.view" id="sale_journal_picking_order_tree_del">
+	        <field name="name">stock.picking.journal.view.tree</field>
+	        <field name="type">tree</field>
+	        <field name="model">stock.picking</field>
+	        <field name="inherit_id" ref="stock.view_picking_delivery_tree" />
+	        <field name="arch" type="xml">
+	            <field name="origin" position="after">
+	                <field name="journal_id" select="1"/>
+	                <field name="invoice_type_id" select="1"/>
+	                <field name="sale_journal_id" select="1"/>
+	            </field>
+	        </field>
+	    </record>
 
-    <act_window name="Approved sales"
-        domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
-        res_model="sale.order"
-        src_model="sale_journal.sale.journal"
-        id="act_sale_journal_sale_journal_2_sale_order_approved"/>
+	    <record model="ir.ui.view" id="sale_journal_picking_order_in">
+	        <field name="name">stock.picking.journal.view.form</field>
+	        <field name="type">form</field>
+	        <field name="model">stock.picking</field>
+	        <field name="inherit_id" ref="stock.view_picking_in_form" />
+	        <field name="arch" type="xml">
+	            <field name="origin" position="after">
+	                <field name="journal_id" select="1"/>
+	                <field name="sale_journal_id" select="1"/>
+	                <field name="invoice_type_id" select="1"/>
+	            </field>
+	        </field>
+	    </record>
 
-    <record id="view_partner_property_form" model="ir.ui.view">
-        <field name="name">res.partner.journal.property.form.inherit</field>
-        <field name="model">res.partner</field>
-        <field name="type">form</field>
-        <field name="inherit_id" ref="base.view_partner_form"/>
-        <field name="arch" type="xml">
-            <page string="Sales &amp; Purchases" position="inside">
-                <field name="property_invoice_type"/>
-            </page>
-        </field>
-    </record>
+	    <record model="ir.ui.view" id="sale_journal_picking_order_tree_in">
+	        <field name="name">stock.picking.journal.view.tree</field>
+	        <field name="type">tree</field>
+	        <field name="model">stock.picking</field>
+	        <field name="inherit_id" ref="stock.view_picking_in_tree" />
+	        <field name="arch" type="xml">
+	            <field name="origin" position="after">
+	                <field name="journal_id" select="1"/>
+	                <field name="invoice_type_id" select="1"/>
+	                <field name="sale_journal_id" select="1"/>
+	            </field>
+	        </field>
+	    </record>
 
+	    <record model="ir.ui.view" id="sale_journal_picking_order_out">
+	        <field name="name">stock.picking.journal.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="arch" type="xml">
+	            <field name="origin" position="after">
+	                <field name="journal_id" select="1"/>
+	                <field name="sale_journal_id" select="1"/>
+	                <field name="invoice_type_id" select="1"/>
+	            </field>
+	        </field>
+	    </record>
 
-</data>
+	    <record model="ir.ui.view" id="sale_journal_picking_order_tree_out">
+	        <field name="name">stock.picking.journal.view.tree</field>
+	        <field name="type">tree</field>
+	        <field name="model">stock.picking</field>
+	        <field name="inherit_id" ref="stock.view_picking_out_tree" />
+	        <field name="arch" type="xml">
+	            <field name="origin" position="after">
+	                <field name="journal_id" select="1"/>
+	                <field name="invoice_type_id" select="1"/>
+	                <field name="sale_journal_id" select="1"/>
+	            </field>
+	        </field>
+	    </record>
+
+	    <!-- Action of sale journal report in sale journal  -->
+
+	    <act_window name="Monthly sales"
+	        domain="[('journal_id', '=', active_id)]"
+	        res_model="sale.journal.report"
+	        src_model="sale_journal.sale.journal"
+	        id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
+
+	   <!-- Action  of stock picking  in picking journal  -->
+
+	    <act_window name="Assigned picking"
+	        domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
+	        res_model="stock.picking"
+	        src_model="sale_journal.picking.journal"
+	        id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
+
+	  <!-- Action  of stock picking  in picking journal  -->
+
+	    <act_window name="Confirmed picking"
+	        domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
+	        res_model="stock.picking"
+	        src_model="sale_journal.picking.journal"
+	        id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
+
+	 <!-- Action  of stock picking  in sale journal  -->
+
+	    <act_window name="Assigned picking"
+        	domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
+        	res_model="stock.picking"
+        	src_model="sale_journal.sale.journal"
+        	id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
+
+    <!-- Action  of stock picking in sale journal -->
+
+	    <act_window name="Confirmed picking"
+	        domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
+	        res_model="stock.picking"
+	        src_model="sale_journal.sale.journal"
+	        id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
+
+	<!-- Action of sale order in sale journal -->
+
+	    <act_window name="Draft sales"
+	        domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
+	        res_model="sale.order"
+	        src_model="sale_journal.sale.journal"
+	        id="act_sale_journal_sale_journal_2_sale_order_draft"/>
+
+	  <!-- Action  of sale order in sale journal -->
+
+	    <act_window name="Approved sales"
+	        domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
+	        res_model="sale.order"
+	        src_model="sale_journal.sale.journal"
+	        id="act_sale_journal_sale_journal_2_sale_order_approved"/>
+
+	    <record id="view_partner_property_form" model="ir.ui.view">
+	        <field name="name">res.partner.journal.property.form.inherit</field>
+	        <field name="model">res.partner</field>
+	        <field name="type">form</field>
+	        <field name="inherit_id" ref="base.view_partner_form"/>
+	        <field name="arch" type="xml">
+	            <page string="Sales &amp; Purchases" position="inside">
+	                <field name="property_invoice_type"/>
+	            </page>
+	        </field>
+	    </record>
+
+	<!--=====================================================-->
+	<!-- picking journal view-->
+	<!--=====================================================    -->
+
+	    <record model="ir.ui.view" id="view_picking_journal_form">
+	        <field name="name">sale_journal.picking.journal.form</field>
+	        <field name="model">sale_journal.picking.journal</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Picking Journal">
+					<group colspan="4" col="6">
+	                    <field name="name" select="1"/>
+	                    <field name="code" select="1"/>
+	                    <field name="user_id" select="1"/>
+	                    <newline/>
+	                    <field name="date" select="1"/>
+	                    <field name="date_created" select="1"/>
+	                    <field name="date_validation" select="1"/>
+	                </group>
+					<notebook colspan="4">
+		                <page string="Picking">
+		                    <field name="picking_stats_ids" colspan="4" nolabel="1"/>
+		                </page>
+		                <page string="Notes">
+		                    <field name="note" colspan="4" nolabel="1"/>
+		                </page>
+	                </notebook>
+	                <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 string="Cancel Picking" name="button_picking_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
+	                    </group>
+	            </form>
+	        </field>
+	    </record>
+
+	    <record model="ir.ui.view" id="view_picking_journal_tree">
+	        <field name="name">sale_journal.picking.journal.tree</field>
+	        <field name="model">sale_journal.picking.journal</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Picking Journal">
+	                <field name="name" select="1"/>
+	                <field name="code" select="1"/>
+	                <field name="user_id" select="1"/>
+	                <field name="date" select="1"/>
+	                <field name="state"/>
+	            </tree>
+	        </field>
+	    </record>
+
+       <!-- Picking journal tree view  -->
+
+	    <record model="ir.ui.view" id="view_picking_journal_search">
+	        <field name="name">sale_journal.picking.journal.search</field>
+	        <field name="model">sale_journal.picking.journal</field>
+	        <field name="type">search</field>
+	        <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"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="name" select="1"/>
+	                    <field name="code" select="1"/>
+	                    <field name="user_id" select="1" widget="selection"/>
+	                    <field name="date" select="1"/>
+	                </group>
+	            </search>
+	        </field>
+	    </record>
+
+<!-- Action of Picking journals -->
+
+	    <record model="ir.actions.act_window" id="action_definition_picking_journal">
+	        <field name="name">Picking Journals</field>
+	        <field name="res_model">sale_journal.picking.journal</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,form</field>
+	        <field name="search_view_id" ref="view_picking_journal_search"/>
+	    </record>
+
+	    <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
+
+	    <record model="ir.actions.act_window" id="action_invoice_type_tree">
+	        <field name="name">Picking by invoice_method</field>
+	        <field name="res_model">sale_journal.invoice.type</field>
+	        <field name="type">ir.actions.act_window</field>
+	        <field name="view_type">tree</field>
+	    </record>
+
+	    <record model="ir.actions.act_window" id="action_invoice_type_picking_open">
+	        <field name="name">Picking to invoice</field>
+	        <field name="res_model">stock.picking</field>
+	        <field name="type">ir.actions.act_window</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,form</field>
+	        <field name="domain">[('state','=','done'),('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
+	    </record>
+
+	    <record model="ir.values" id="ir_open_invoice_type">
+	        <field name="key2">tree_but_open</field>
+	        <field name="model">sale_journal.invoice.type</field>
+	        <field name="name">Picking to invoice</field>
+	        <field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
+	        <field name="object" eval="True"/>
+	    </record>
+
+   </data>
 </openerp>
diff --git a/addons/sale_journal/security/ir.model.access.csv b/addons/sale_journal/security/ir.model.access.csv
index f958ecb8420..0a7ed3742ab 100644
--- a/addons/sale_journal/security/ir.model.access.csv
+++ b/addons/sale_journal/security/ir.model.access.csv
@@ -1,12 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_sale_journal_invoice_type_stats","sale_journal.invoice.type.stats","model_sale_journal_invoice_type_stats","sale.group_sale_user",1,0,0,0
-"access_sale_journal_picking_stats","sale_journal.picking.stats","model_sale_journal_picking_stats","sale.group_sale_user",1,0,0,0
-"access_sale_journal_invoice_type","sale_journal.invoice.type","model_sale_journal_invoice_type","sale.group_sale_user",1,0,0,0
 "access_sale_journal_invoice_type_finance_invoice","sale_journal.invoice.type invoice","model_sale_journal_invoice_type","account.group_account_invoice",1,0,0,0
 "access_sale_journal_invoice_type_partner_manager","sale_journal.invoice.type partner manager","model_sale_journal_invoice_type","base.group_partner_manager",1,0,0,0
 "access_sale_journal_sale_journal","sale_journal.sale.journal","model_sale_journal_sale_journal","sale.group_sale_user",1,0,0,0
-"access_sale_journal_picking_journal","sale_journal.picking.journal","model_sale_journal_picking_journal","sale.group_sale_user",1,0,0,0
-"access_sale_journal_sale_stats","sale_journal.sale.stats","model_sale_journal_sale_stats","sale.group_sale_user",1,0,0,0
 "access_sale_journal_invoice_type_manager","sale_journal.invoice.type.manager","model_sale_journal_invoice_type","sale.group_sale_manager",1,1,1,1
 "access_sale_journal_sale_journal_manager","sale_journal.sale.journal.manager","model_sale_journal_sale_journal","sale.group_sale_manager",1,1,1,1
 "access_sale_journal_picking_journal_manager","sale_journal.picking.journal.manager","model_sale_journal_picking_journal","sale.group_sale_manager",1,1,1,1
diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py
index bccc991565f..1aed1bb1fb2 100644
--- a/addons/scrum/scrum.py
+++ b/addons/scrum/scrum.py
@@ -19,17 +19,19 @@
 #
 ##############################################################################
 import time
-import netsvc
-
-from osv import fields, osv, orm
 from mx import DateTime
+
+import netsvc
+from osv import fields, osv, orm
 import re
+import tools
+from tools.translate import _
 
 class scrum_project(osv.osv):
     _inherit = 'project.project'
     _columns = {
         'product_owner_id': fields.many2one('res.users', 'Product Owner'),
-        'sprint_size': fields.integer('Sprint Days'),
+        'sprint_size': fields.integer('Sprint Days',help="Number of days allocated for sprint"),
         'scrum': fields.integer('Is a Scrum Project'),
     }
     _defaults = {
@@ -49,8 +51,8 @@ class scrum_sprint(osv.osv):
             tot = 0.0
             prog = 0.0
             for bl in sprint.backlog_ids:
-                tot += bl.planned_hours
-                prog += bl.planned_hours * bl.progress / 100.0
+                tot += bl.expected_hours
+                prog += bl.expected_hours * bl.progress / 100.0
             res.setdefault(sprint.id, 0.0)
             if tot>0:
                 res[sprint.id] = round(prog/tot*100)
@@ -69,7 +71,7 @@ class scrum_sprint(osv.osv):
         for sprint in self.browse(cr, uid, ids):
             res.setdefault(sprint.id, 0.0)
             for bl in sprint.backlog_ids:
-                res[sprint.id] += bl.planned_hours
+                res[sprint.id] += bl.expected_hours
         return res
 
     def _calc_expected(self, cr, uid, ids, name, args, context):
@@ -105,16 +107,15 @@ class scrum_sprint(osv.osv):
         'date_start': fields.date('Starting Date', required=True),
         'date_stop': fields.date('Ending Date', required=True),
         'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)], help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
-        'product_owner_id': fields.many2one('res.users', 'Product Owner', required=True),
-        'scrum_master_id': fields.many2one('res.users', 'Scrum Manager', required=True),
+        'product_owner_id': fields.many2one('res.users', 'Product Owner', required=True,help="The person who is responsible for the product"),
+        'scrum_master_id': fields.many2one('res.users', 'Scrum Manager', required=True,help="The person who is maintains the processes for the product"),
         'meeting_ids': fields.one2many('scrum.meeting', 'sprint_id', 'Daily Scrum'),
         'review': fields.text('Sprint Review'),
         'retrospective': fields.text('Sprint Retrospective'),
         'backlog_ids': fields.one2many('scrum.product.backlog', 'sprint_id', 'Sprint Backlog'),
         'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)', help="Computed as: Time Spent / Total Time."),
         'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours', help="Computed using the sum of the task work done."),
-        'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
-        'expected_hours': fields.function(_calc_expected, method=True, string='Expected Hours', help='Estimated time to do the task.'),
+        'expected_hours': fields.function(_calc_expected, method=True, string='Planned Hours', help='Estimated time to do the task.'),
         'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('cancel','Cancelled'),('done','Done')], 'State', required=True),
     }
     _defaults = {
@@ -184,12 +185,12 @@ class scrum_product_backlog(osv.osv):
                 res[bl.id] += task.effective_hours
         return res
 
-    def _calc_planned(self, cr, uid, ids, name, args, context):
+    def _calc_task(self, cr, uid, ids, name, args, context):
         res = {}
         for bl in self.browse(cr, uid, ids):
             res.setdefault(bl.id, 0.0)
             for task in bl.tasks_id:
-                res[bl.id] += task.planned_hours
+                res[bl.id] += task.total_hours
         return res
 
     def button_cancel(self, cr, uid, ids, context={}):
@@ -216,6 +217,21 @@ class scrum_product_backlog(osv.osv):
         self.write(cr, uid, ids, {'state':'pending'}, context=context)
         return True
 
+    def button_postpone(self, cr, uid, ids, context=None):
+        for product in self.browse(cr, uid, ids, context=context):
+            tasks_id = []
+            for task in product.tasks_id:
+                if task.state != 'done':
+                    tasks_id.append(task.id)
+
+            clone_id = self.copy(cr, uid, product.id, {
+                'name': 'PARTIAL:'+ product.name ,
+                'sprint_id':False,
+                'tasks_id':[(6, 0, tasks_id)],
+                                })
+        self.write(cr, uid, ids, {'state':'cancel'}, context=context)
+        return True
+
     _columns = {
         'name' : fields.char('Feature', size=64, required=True),
         'note' : fields.text('Note'),
@@ -228,9 +244,9 @@ class scrum_product_backlog(osv.osv):
         'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
         'progress': fields.function(_calc_progress, method=True, string='Progress', help="Computed as: Time Spent / Total Time."),
         'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours', help="Computed using the sum of the task work done (Time spent on tasks)"),
-        'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
-        'expected_hours': fields.float('Expected Hours', help='Estimated total time to do the Backlog'),
+        'expected_hours': fields.float('Planned Hours', help='Estimated total time to do the Backlog'),
         'create_date': fields.datetime("Creation Date", readonly=True),
+        'task_hours': fields.function(_calc_task, method=True, string='Task Hours', help='Estimated time of the total hours of the tasks')
     }
     _defaults = {
         'state': 'draft',
@@ -251,7 +267,7 @@ class scrum_task(osv.osv):
                 result[task.id] = True
         return result.keys()
     _columns = {
-        'product_backlog_id': fields.many2one('scrum.product.backlog', 'Product Backlog'),
+        'product_backlog_id': fields.many2one('scrum.product.backlog', 'Product Backlog',help="Related product backlog that contains this task. Used in SCRUM methodology"),
         'sprint_id': fields.related('product_backlog_id','sprint_id', type='many2one', relation='scrum.sprint', string='Sprint',
             store={
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['product_backlog_id'], 10),
@@ -287,5 +303,37 @@ class scrum_meeting(osv.osv):
     _defaults = {
         'date' : time.strftime('%Y-%m-%d'),
     }
+
+    def button_send_to_master(self, cr, uid, ids, context=None):
+        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, email)
+        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):
+        meeting_id = self.browse(cr, uid, ids)[0]
+        if meeting_id.sprint_id.product_owner_id.user_email:
+            self.email_send(cr,uid,ids,email)
+        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):
+        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)
+        user_email = email_from or user.address_id.email  or email_from
+        body = "Hello " + meeting_id.sprint_id.scrum_master_id.name+",\n" +" \nI am sending you Daily Meeting Details of date %s for the Sprint  %s \n" % (meeting_id.date, meeting_id.sprint_id.name)
+        body += '\n*Tasks since yesterday: \n_______________________%s' % (meeting_id.question_yesterday) + '\n*Task for Today :\n_______________________ %s\n' % (meeting_id.question_today )+ '\n*Blocks encountered: \n_______________________ %s' % (meeting_id.question_blocks or 'No Blocks')
+        body += "\n\nThank you,\n"+ user.name
+        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 True
+
 scrum_meeting()
 
diff --git a/addons/scrum/scrum_demo.xml b/addons/scrum/scrum_demo.xml
index 9f41f17a86b..9e97e635cf3 100644
--- a/addons/scrum/scrum_demo.xml
+++ b/addons/scrum/scrum_demo.xml
@@ -8,7 +8,7 @@
             <!-- FIXME !!! -->
             <field name="tasks">[24, 25, 28, 26, 27, 29, 30, 31, 32, 33, 34, 35, 37, 36, 38]</field>
             <field model="res.users" name="manager" search="[('login','=','demo')]"/>
-            <field name="planned_hours">156.0</field>
+            <field name="expected_hours">156.0</field>
             <field name="name">Open ERP - dev branch</field>
             <field model="res.users" name="product_owner_id" search="[('login','=','demo')]"/>
         </record>
@@ -32,6 +32,7 @@
             <field name="expected_hours">6.0</field>
             <field name="note">This new system will enable you to migrate automatically from an old version of Open ERP to a new one. This system will migrate not only the Open ERP system but also the customers particularities. This happens without any kind of script or programming. It has been possible to carry out such a system thanks to the descriptive approach of Open ERP components. </field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="state">done</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
         <record id="scrum_product_backlog_1" model="scrum.product.backlog">
@@ -40,6 +41,7 @@
             <field name="expected_hours">111.0</field>
             <field name="note">The accounting module of Open ERP (financial accounting and management accounting) is being reshaped. New functionnalities will be added: intangible assets, a new way of presenting ledgers and bookings, new stock valuation calculation, and lots of predefined reports. </field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
+			<field name="state">open</field>            
             <field name="project_id" ref="scrum_project_1"/>
         </record>
         <record id="scrum_product_backlog_2" model="scrum.product.backlog">
@@ -48,18 +50,21 @@
             <field name="expected_hours">4.0</field>
             <field name="note">We have to develop a plug-in system which will enable to install/remove modules. The basic version of Open ERP will include only the required minimum, and you will select the modules thanks to the plug-in manager. This allows you to limit your system to your real needs: quality management, localisations, project and service management, marketing campaigns, and so on... </field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="state">open</field>     
             <field name="project_id" ref="scrum_project_1"/>
         </record>
         <record id="scrum_product_backlog_3" model="scrum.product.backlog">
             <field name="name">Review all terms</field>
             <field name="expected_hours">8.0</field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="state">done</field>     
             <field name="project_id" ref="scrum_project_1"/>
         </record>
         <record id="scrum_product_backlog_4" model="scrum.product.backlog">
             <field name="name">Bugfixes</field>
             <field name="expected_hours">6.0</field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="state">open</field>  
             <field name="project_id" ref="scrum_project_1"/>
         </record>
         <record id="scrum_product_backlog_5" model="scrum.product.backlog">
@@ -72,8 +77,9 @@
         <record id="scrum_product_backlog_6" model="scrum.product.backlog">
             <field name="name">Reshape the complete menu</field>
             <field name="expected_hours">4.0</field>
-            <field name="note">Restrucutre the Open ERP menu to be more like others ERP.</field>
+            <field name="note">Restructure  the Open ERP menu to be more like others ERP.</field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
+          	<field name="state">open</field>  
             <field name="project_id" ref="scrum_project_1"/>
         </record>
         <record id="scrum_product_backlog_7" model="scrum.product.backlog">
@@ -91,6 +97,8 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Review all English Terms</field>
+            <field name="state">done</field>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>            
             <field name="product_backlog_id" ref="scrum_product_backlog_3"/>
         </record>
         <record id="scrum_task_4" model="project.task">
@@ -98,6 +106,8 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Review all french terms</field>
+          	<field name="state">done</field>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>               
             <field name="product_backlog_id" ref="scrum_product_backlog_3"/>
         </record>
         <record id="scrum_task_5" model="project.task">
@@ -105,6 +115,8 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Analytic Accounting features</field>
+          	<field name="state">done</field>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>             
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_6" model="project.task">
@@ -112,6 +124,7 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Test and improve automatic migration system</field>
+            <field name="state">open</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_0"/>
         </record>
         <record id="scrum_task_7" model="project.task">
@@ -119,6 +132,7 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">General accounting features</field>
+            <field name="state">open</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_8" model="project.task">
@@ -133,7 +147,9 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="description">Cash book, general ledger, accounts list, aged trial balance</field>
-            <field name="name">Accounting Report General</field>
+             <field name="name">Accounting Report General</field>
+             <field name="state">open</field>
+			<field eval="[(6,0,[ref('scrum.scrum_task_8')])]" name="child_ids"/>             
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_10" model="project.task">
@@ -148,6 +164,7 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Accounting Report Analytic</field>
+ 			<field name="state">open</field>            
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_12" model="project.task">
@@ -155,6 +172,8 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Bugfix - memory leak</field>
+          	<field name="state">done</field>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>               
             <field name="product_backlog_id" ref="scrum_product_backlog_4"/>
         </record>
         <record id="scrum_task_13" model="project.task">
@@ -162,6 +181,8 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Bugfix - Translations</field>
+			<field name="state">open</field>          
+			 <field eval="[(6,0,[ref('scrum.scrum_task_12')])]" name="child_ids"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_4"/>
         </record>
         <record id="scrum_task_14" model="project.task">
@@ -169,6 +190,7 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Finish the automated plugin system</field>
+            <field name="state">pending</field>
             <field name="product_backlog_id" ref="scrum_product_backlog_2"/>
         </record>
         <record id="scrum_task_15" model="project.task">
@@ -183,6 +205,7 @@
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="scrum_project_1"/>
             <field name="name">Test 3.2.0 before releasing</field>
+ 			<field name="state">open</field>    
             <field name="product_backlog_id" ref="scrum_product_backlog_5"/>
         </record>
         <record id="scrum_task_17" model="project.task">
@@ -191,8 +214,56 @@
             <field name="project_id" ref="scrum_project_1"/>
             <field name="description">default values, onchange, required, add on top or bottom and shortcuts (Ctrl S, Ctrl X, ...)</field>
             <field name="name">Editable trees</field>
+			<field name="state">open</field>  
             <field name="product_backlog_id" ref="scrum_product_backlog_7"/>
         </record>
-
+		<record id="scrum_meeting_0" model="scrum.meeting">
+			<field name="question_yesterday">
+Admin: Worked on the Automatic migration system
+Demo: Worked on the Test 3.2.0 before releasing
+         </field>
+			<field name="question_today">
+Admin:Work on  Restructure  the Open ERP menu to be more like others ERP.
+Demo: Work on Editable trees</field>
+			<field name="question_blocks">
+Demo :Bugfix - memory leak
+			</field>
+			<field name="sprint_id" ref="scrum.scrum_sprint_0"/>
+			<field eval="time.strftime('%Y-%m-%d')" name="date"/>
+		</record>
+		<record id="project_task_work_scrum_task1" model="project.task.work">
+			<field name="user_id" ref="base.user_root"/>
+			<field name="name">Learn how to migration</field>
+			<field name="task_id" ref="scrum_task_6"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="1.0" name="hours"/>
+			<field eval="time.strftime('%Y-%m-%d')" name="date"/>
+		</record>
+		<record id="project_task_work_scrum_task2" model="project.task.work">
+			<field name="user_id" ref="base.user_root"/>
+			<field name="name">Create a script for migration and testing</field>
+			<field name="task_id" ref="scrum_task_6"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="5.0" name="hours"/>
+			<field eval="time.strftime('%Y-%m-%d')" name="date"/>
+		</record>
+				
+		<record id="project_task_work_scrum_task2" model="project.task.work">
+			<field name="user_id" ref="base.user_root"/>
+			<field name="name">Create a script for migration and testing</field>
+			<field name="task_id" ref="scrum_task_6"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="5.0" name="hours"/>
+			<field eval="time.strftime('%Y-%m-%d')" name="date"/>
+		</record>
+	<record id="project_task_work_scrum_task1" model="project.task.work">
+			<field name="user_id" ref="base.user_root"/>
+			<field name="name">Add on top or bottom and shortcuts</field>
+			<field name="task_id" ref="scrum_task_17"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="10.0" name="hours"/>
+			<field eval="time.strftime('%Y-%m-%d')" name="date"/>
+		</record>
+		
     </data>
 </openerp>
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 61a2c3b35ed..d4631a680ca 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -33,14 +33,14 @@
             <field name="model">scrum.product.backlog</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Product Backlog">
+                <tree colors="grey:state in ('cancel','done');blue:state in ('pending')" string="Product Backlog">
                     <field name="sequence" invisible="1"/>
                     <field name="name"/>
                     <field name="project_id"/>
                     <field name="sprint_id"/>
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar"/>
-                    <field name="expected_hours" sum="Expected hours" widget="float_time"/>
+                    <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"/>
@@ -57,10 +57,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product backlog">
-                    <group colspan="4" col="6">
+                    <group colspan="4" col="8">
                         <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"                  
+						help="Post Pone backlog" colspan="2"
+                         icon="gtk-convert"  attrs="{'invisible':[('state','=','done')]}"/>
                         <field name="user_id" select="1"/>
                         <field name="sequence" groups="base.group_extended"/>
                         <field name="create_date"/>
@@ -71,6 +74,7 @@
                             <group colspan="6" col="8">
                                 <field name="expected_hours" widget="float_time"/>
                                 <field name="effective_hours" widget="float_time"/>
+                                <field name="task_hours" widget="float_time"/>
                             </group>
                             <separator string="Feature Description" colspan="4"/>
                             <field colspan="4" name="note" nolabel="1"/>
@@ -127,18 +131,18 @@
                 <search string="Product Backlogs">
                     <group col="10" colspan="4">
                         <filter default="1"
-                            icon="terp-project"
+                            icon="terp-check"
                             string="Current"
                             name="current"
                             domain="['|','&amp;',('sprint_id.date_start','&lt;=',time.strftime('%%Y-%%m-%%d')), ('sprint_id.date_stop','&gt;=',time.strftime('%%Y-%%m-%%d')), ('state','in',['draft','open'])]"
                             help="Current Backlogs"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-project" string="Draft" domain="[('state','=','draft')]" help="Draft Backlogs"/>
-                        <filter icon="terp-project" string="Open" domain="[('state','=','open')]" help="Open Backlogs"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Backlogs"/>
+                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Backlogs"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id" widget="selection"/>
-                        <field name="sprint_id" widget="selection">
+                        <field name="sprint_id" widget="selection" domain="[('state','in',('draft','open'))]">
                             <filter icon="terp-project"
                                 string="Sprints"
                                 domain="[('sprint_id.state','=','open')]"
@@ -151,11 +155,11 @@
                         <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="Sprint" icon="terp-project" domain="[]" context="{'group_by':'sprint_id'}"/>
-                        <filter string="Responsible" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
 
                 </search>
@@ -184,7 +188,7 @@
             <field name="model">scrum.sprint</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Scrum Sprint">
+            	<tree colors="blue:state in ('pending');grey:state in ('cancel','done')" string="Scrum Sprint">
                     <field name="name"/>
                     <field name="project_id"/>
                     <field name="scrum_master_id"/>
@@ -192,8 +196,7 @@
                     <field name="date_start"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="effective_hours" sum="Effective hours" widget="float_time"/>
-                    <field name="planned_hours" sum="Planned hours" widget="float_time"/>
-                    <field name="expected_hours" sum="Expected 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="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
@@ -226,7 +229,6 @@
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Planning" colspan="2"/>
-                                <field name="planned_hours" widget="float_time"/>
                                 <field name="expected_hours" widget="float_time"/>
                                 <field name="effective_hours" widget="float_time"/>
                                 <field name="progress" widget="progressbar"/>
@@ -260,9 +262,10 @@
             <field name="arch" type="xml">
                 <search string="Sprints">
                     <group col="10" colspan="4">
-                        <filter name="filter_current" icon="terp-project" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
-                        <filter icon="terp-project" string="Draft" domain="[('state','=','draft')]" help="Draft Sprints"/>
-                        <filter icon="terp-project" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
+                        <filter name="terp-check" icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Sprints"/>
+                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id" widget="selection"/>
@@ -270,13 +273,13 @@
                         <field name="date_start"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="Masters" icon="terp-project" domain="[]"  context="{'group_by':'scrum_master_id'}"/>
-                        <filter string="Product owner" icon="terp-project" domain="[]" context="{'group_by':'product_owner_id'}"/>
-                        <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="20">
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Managers" icon="terp-personal" domain="[]"  context="{'group_by':'scrum_master_id'}"/>
+                        <filter string="Product owner" icon="terp-personal" domain="[]" context="{'group_by':'product_owner_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
                     </group>
                 </search>
             </field>
@@ -322,12 +325,15 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Scrum Meeting">
-                            <separator colspan="4" string="What did you do since the last meeeting?"/>
+                            <separator colspan="4" string="What did you do since the last meeting?"/>
                             <field colspan="4" name="question_yesterday" nolabel="1"/>
                             <separator colspan="4" string="What do you plan to do till the next meeting?"/>
                             <field colspan="4" name="question_today" nolabel="1"/>
                             <separator colspan="4" string="Are there anything blocking you?"/>
                             <field colspan="4" name="question_blocks" nolabel="1"/>
+                            <separator colspan="4" string=""/>
+							<button name="button_send_to_master" type="object" string="Send to Scrum Master" icon="gtk-ok"/>
+                            <button name="button_send_product_owner" type="object" string="Send to Product Owner" icon="gtk-ok"/>
                         </page>
                         <page string="Optional Info">
                             <separator colspan="4" string="Are your Sprint Backlog estimate accurate ?"/>
@@ -349,18 +355,18 @@
             <field name="arch" type="xml">
                 <search string="Scrum Sprint">
                     <group col="10" colspan="4">
-                        <filter name="scrum_daily" icon="terp-project" string="Daily" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Daily Meetings"/>
+                        <filter name="scrum_daily" icon="terp-go-today" string="Daily" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Daily Meetings"/>
                         <separator orientation="vertical"/>
                         <field name="sprint_id" widget="selection">
-                            <filter icon="terp-project" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints" default="1"/>
+                            <filter icon="terp-check" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints" default="1"/>
                         </field>
                         <field name="project_id" widget="selection"/>
                         <field name="date"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Sprint" icon="terp-project" domain="[]" context="{'group_by':'sprint_id'}"/>
-                        <filter string="Date" icon="terp-project" domain="[]" context="{'group_by':'date'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="20">
+                        <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
             </field>
@@ -493,7 +499,7 @@
             <field name="arch" type="xml">
                 <field name="project_id" position="after">
                     <field name="sprint_id" context="{'sprint_invisible':False}">
-                        <filter icon="terp-project" string="Current" context="{'sprint_invisible':False}" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
+                        <filter icon="terp-check" string="Current" context="{'sprint_invisible':False}" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
                     </field>
                 </field>
             </field>
@@ -506,8 +512,8 @@
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/search/group[@string='Group By...']/filter[@string='End Date']" position="after">
-                    <filter string="Sprint" icon="terp-project" domain="[]" context="{'group_by':'sprint_id'}"/>
-                    <filter string="Backlog" icon="terp-project" domain="[]" context="{'group_by':'product_backlog_id'}"/>
+                    <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
+                    <filter string="Backlog" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'product_backlog_id'}"/>
                     <separator orientation="vertical"/>
                 </xpath>
             </field>
diff --git a/addons/scrum/wizard/scrum_backlog_sprint.py b/addons/scrum/wizard/scrum_backlog_sprint.py
index 8125df1ba53..108e5a48cc3 100644
--- a/addons/scrum/wizard/scrum_backlog_sprint.py
+++ b/addons/scrum/wizard/scrum_backlog_sprint.py
@@ -49,7 +49,7 @@ class backlog_sprint_assign(osv.osv_memory):
                     'description': backlog.note,
                     'project_id': backlog.project_id.id,
                     'user_id': False,
-                    'planned_hours':backlog.planned_hours,
+                    'planned_hours':backlog.expected_hours,
                     'remaining_hours':backlog.expected_hours,
                 })
             if data['state_open'] and backlog.state == "draft":
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 1540357c590..97510e31a64 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -170,7 +170,7 @@
     <blockTable colWidths="538.0" style="Table_Title_String">
       <tr>
         <td>
-          <para style="terp_header">Packing List: [[ picking.name ]]</para>
+          <para style="terp_header">Picking List: [[ picking.name ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 673fd14e76e..a3771b4a480 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -44,16 +44,16 @@
         <field name="arch" type="xml">
             <search string="Stock Move">
                 <group>
-                <filter icon="terp-stock"
+                <filter icon="terp-go-year"
                     string="This Year"
                     domain="[('year','=',time.strftime('%%Y'))]"
                     help="Stock Moves of the year"/>
-                <filter icon="terp-stock"
+                <filter icon="terp-go-month"
                  	name="month"
                     string="This Month"
                     domain="[('month','=',time.strftime('%%m'))]"
                     help="Stock Moves of this month"/>
-	            <filter icon="terp-stock"
+	            <filter icon="terp-go-today"
                     string="Today"
                     separator="1"
                     domain="[('date_planned','&gt;=', time.strftime('%%Y-%%m-%%d')), ('date_planned','&lt;',(datetime.date.today()-datetime.timedelta(days=1)).strftime('%%Y-%%m-%%d'))]"
@@ -61,39 +61,39 @@
                 <separator orientation="vertical"/>
 
                 <filter string="Waiting"
-                    	icon="terp-stock"
+                    	icon="terp-gtk-media-pause"
                     	domain="[('state','=','waiting')]"
                     	help = "Confirmed Stock-Moves"/>
 
                 <filter string="Available"
-                    	icon="terp-stock"
+                    	icon="terp-camera_test"
                     	domain="[('state','=','assigned')]"
                     	help = "Available Stock-Moves"/>
 
                 <filter string="Done"
                 		name="done"
-                    	icon="terp-stock"
+                    	icon="terp-dialog-close"
                     	domain="[('state','=','done')]"
                     	help = "Completed Stock-Moves"/>
 
                 <separator orientation="vertical"/>
-                <filter icon="terp-stock" string="Internal Locations" domain="[('location_id.usage','=','internal')]"/>
-                <filter icon="terp-stock" string="Scrap Locations" domain="[('location_id.scrap_location','=',1)]"/>
+                <filter icon="terp-go-home" string="Internal Locations" domain="[('location_id.usage','=','internal')]"/>
+                <filter icon="terp-go-home" string="Scrap Locations" domain="[('location_id.scrap_location','=',1)]"/>
                 <separator orientation="vertical"/>
                 <field name="product_id"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." >
-                    <filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter name="product" string="Product" icon="terp-stock" context="{'group_by':'product_id'}"/>
+                <group expand="0" string="Group By..." >
+                    <filter string="Partner" name="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter name="product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter name="src_location" string="Source Location" icon="terp-stock" context="{'group_by':'location_id'}"/>
-                    <filter string="Dest. Location" icon="terp-stock"  context="{'group_by':'location_dest_id'}"/>
-                    <filter string="State" icon="terp-stock" context="{'group_by':'state'}"/>
+                    <filter name="src_location" string="Source Location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
+                    <filter string="Dest. Location" icon="terp-gtk-jump-to-ltr"  context="{'group_by':'location_dest_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-stock" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-stock" context="{'group_by':'date_planned'}"/>
-                    <filter string="Year" icon="terp-stock" context="{'group_by':'year'}"/>
+                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date_planned'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..."  groups="base.group_extended">
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index e570e2b55ea..a14298ff771 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -54,38 +54,38 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter icon="gtk-media-rewind" string="  365 Days  "
+                   		<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="Picking in last 365 days"/>
-	                	<filter icon="gtk-media-rewind" string="   30 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="Picking in last 30 days"/>
-	                	<filter icon="gtk-media-rewind"
+	                	<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="Picking during last 7 days"/>
                         <separator orientation="vertical"/>
-                        <filter string="Todo" icon="terp-stock" domain="[('state','in',('draft','auto','confirmed','assigned'))]"/>
-                        <filter string="Done" icon="terp-stock" domain="[('state','=','done')]"/>
+                        <filter string="Todo" icon="terp-gtk-go-back-rtl" domain="[('state','in',('draft','auto','confirmed','assigned'))]"/>
+                        <filter string="Done" icon="terp-dialog-close" domain="[('state','=','done')]"/>
 						<separator orientation="vertical"/>
 						<field name="partner_id"/>
 						<field name="company_id" groups="base.group_multi_company" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By...">
-                        <filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Company" icon="terp-stock" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
+                   <group expand="0" string="Group By...">
+                        <filter string="Partner" name="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Shipping Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Invoice Status" icon="terp-stock" domain="[]" context="{'group_by':'invoice_state'}"/>
+                        <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'}"/>
+                        <filter string="Invoice Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'invoice_state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-stock" domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-stock" domain="[]" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-stock" domain="[]" context="{'group_by':'year'}"/>
+                        <filter string="Day" icon="terp-go-month" domain="[]" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
                     </group>
                     <newline/>
                 	<group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 27f18d4ff43..34121d0c9ed 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -9,17 +9,17 @@
             <field name="arch" type="xml">
                 <search string="Search Location">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" name="internal_locations" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations"/>
-                        <filter icon="terp-stock" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
-                        <filter icon="terp-stock" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
+                        <filter icon="terp-go-home" name="internal_locations" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations"/>
+                        <filter icon="terp-go-home" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
+                        <filter icon="terp-go-home" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
                         <separator orientation="vertical"/>
                         <field name="location_id"/>
                         <field name="product_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
-                        <filter string="Location" icon="terp-stock" domain="[]"  context="{'group_by':'location_id'}"/>
-                        <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Location" icon="terp-go-home" domain="[]"  context="{'group_by':'location_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                     </group>
                 </search>
             </field>
@@ -155,12 +155,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Dates of Inventories">
-                    <filter icon="gtk-media-rewind" name="stockable" string="Stockable"
+                    <filter icon="terp-accessories-archiver" name="stockable" string="Stockable"
                         domain="[('product_id.type','=', 'product')]"/>
-                    <filter icon="gtk-media-rewind" string="Consumable"
+                    <filter icon="terp-accessories-archiver" string="Consumable"
                         domain="[('product_id.type','=', 'consumable')]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="gtk-media-rewind" string="Non Inv"
+                    <filter icon="terp-accessories-archiver-minus" string="Non Inv"
                         domain="[('date','=', False)]"/>
                     <separator orientation="vertical"/>
                     <field name="product_id"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index fadcd6f77f1..87d8acf05f3 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -350,7 +350,7 @@ stock_location()
 class stock_tracking(osv.osv):
     _name = "stock.tracking"
     _description = "Stock Tracking Lots"
-    
+
     def get_create_tracking_lot(self, cr, uid, ids, tracking_lot):
         tracking_lot_list = self.search(cr, uid, [('name', '=', tracking_lot)],
                                             limit=1)
@@ -478,7 +478,7 @@ class stock_picking(osv.osv):
             'delivery': _('Delivery order')
         }
         if not vals.get('auto_picking', False):
-            message = type_list.get(vals.get('type',_('Picking'))) + " '" + vals['name'] + "' "+ _("created.")
+            message = type_list.get(vals.get('type', False), _('Picking')) + " '" + (vals['name'] or "n/a") + "' "+ _("created.")
             self.log(cr, user, id, message)
         return super(stock_picking, self).create(cr, user, vals, context)
 
@@ -627,7 +627,7 @@ class stock_picking(osv.osv):
                 'internal': 'Internal picking',
                 'delivery': 'Delivery order'
             }
-            message = type_list.get(pick.type, _('Document')) + " '" + pick.name + "' "+ _("is ready to be processed.")
+            message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or 'n/a') + "' "+ _("is ready to be processed.")
             self.log(cr, uid, id, message)
         self.write(cr, uid, ids, {'state': 'assigned'})
         return True
@@ -814,7 +814,7 @@ class stock_picking(osv.osv):
                 invoices_group[partner.id] = invoice_id
             res[picking.id] = invoice_id
             for move_line in picking.move_lines:
-                origin = move_line.picking_id.name
+                origin = move_line.picking_id.name or ''
                 if move_line.picking_id.origin:
                     origin += ':' + move_line.picking_id.origin
                 if group:
@@ -893,7 +893,7 @@ class stock_picking(osv.osv):
         move_obj = self.pool.get('stock.move')
         if not context:
             context = {}
-            
+
         for pick in self.browse(cr, uid, ids, context=context):
             if pick.state in ['done','cancel']:
                 raise osv.except_osv(_('Error'), _('You cannot remove the picking which is in %s state !')%(pick.state,))
@@ -906,7 +906,7 @@ class stock_picking(osv.osv):
                     move_obj.action_cancel(cr, uid, ids2, ctx)
                 #Removing the move
                 move_obj.unlink(cr, uid, ids2, ctx)
-                    
+
         return super(stock_picking, self).unlink(cr, uid, ids, context=context)
 
     def do_partial(self, cr, uid, ids, partial_datas, context={}):
@@ -1219,7 +1219,7 @@ class stock_move(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
 
         'product_qty': fields.float('Quantity', required=True),
-        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
+        'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True),
         'product_uos_qty': fields.float('Quantity (UOS)'),
         'product_uos': fields.many2one('product.uom', 'Product UOS'),
         'product_packaging': fields.many2one('product.packaging', 'Packaging', help="It specifies attributes of packaging like type, quantity of packaging,etc."),
@@ -1294,7 +1294,7 @@ class stock_move(osv.osv):
         'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.move', context=c),
-        'date_expected': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),        
+        'date_expected': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
 
     def copy(self, cr, uid, id, default=None, context={}):
@@ -1648,14 +1648,14 @@ class stock_move(osv.osv):
                         'line_id': lines,
                         'ref': ref,
                     })
-        tracking_lot = False                    
+        tracking_lot = False
         if context:
             tracking_lot = context.get('tracking_lot', False)
             if tracking_lot:
                 rec_id = context and context.get('active_id', False)
                 tracking = self.pool.get('stock.tracking')
-                tracking_lot = tracking.get_create_tracking_lot(cr, uid,[rec_id], tracking_lot)        
-                 
+                tracking_lot = tracking.get_create_tracking_lot(cr, uid,[rec_id], tracking_lot)
+
         self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S'), 'tracking_id': tracking_lot or False})
         picking_obj = self.pool.get('stock.picking')
         for pick in picking_obj.browse(cr, uid, picking_ids):
@@ -1669,7 +1669,7 @@ class stock_move(osv.osv):
 
     def unlink(self, cr, uid, ids, context=None):
         if context is None:
-            context = {}        
+            context = {}
         for move in self.browse(cr, uid, ids, context=context):
             if move.state != 'draft':
                 raise osv.except_osv(_('UserError'),
@@ -1877,7 +1877,7 @@ class stock_move(osv.osv):
         address_id = partial_datas.get('address_id', False)
         delivery_date = partial_datas.get('delivery_date', False)
         tracking_lot = context.get('tracking_lot', False)
-        
+
         new_moves = []
 
         complete, too_many, too_few = [], [], []
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 60de8d1f74f..3084e8527a7 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -3,7 +3,7 @@
     <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_move_labels" model="stock.move" name="stock.move.label" string="Print Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
+        <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"/>
         <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Location Content (With children)" rml="stock/report/lot_overview_all.rml"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 970c55f9bd8..553d398984b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -55,9 +55,9 @@
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="4" groups="base.group_extended">
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="4" groups="base.group_extended">
+                        <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'}"/>
                     </group>
                 </search>
 
@@ -271,7 +271,7 @@
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
+                        <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
                         <field name="prefix"/>
                         <field name="name"/>
@@ -280,8 +280,8 @@
                         <field name="date"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                     </group>
                 </search>
             </field>
@@ -341,7 +341,7 @@
                     <field name="location_dest_id" />
                     <field name="date" />
                     <field name="date_planned" string="Date"/>
-                     <field name="date_expected" string="Date Expected"/>                    
+                     <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -438,11 +438,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Locations">
-                    <filter icon="terp-stock" name="in_location"
+                    <filter icon="terp-go-home" name="in_location"
                         string="Internal" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
-                    <filter icon="terp-stock" name="customer"
+                    <filter icon="terp-go-home" name="customer"
                         string="Customer" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
-                    <filter icon="terp-stock" name="supplier"
+                    <filter icon="terp-go-home" name="supplier"
                         string="Supplier" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
                     <separator orientation="vertical"/>
                     <field name="name"/>
@@ -588,6 +588,7 @@
                     <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
+                    <field name="invoice_state"/>
                     <field name="state"/>
                     <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the picking.   Do you want to continue?"/>
@@ -652,7 +653,7 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
-                                             <field name="date_expected" string="Date Expected"/>                                            
+                                             <field name="date_expected" string="Date Expected"/>
                                             <field name="address_id" context="{'contact_display':'partner'}"/>
                                             <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
                                             <field name="prodlot_id" groups="base.group_extended"
@@ -711,10 +712,10 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Picking">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
-                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
+                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
+                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order"  />
+                        <filter icon="terp-accessories-archiver-minus" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order"  />
                         <separator orientation="vertical"/>
                         <field name="location_id"/>
                         <field name="location_dest_id"/>
@@ -722,10 +723,10 @@
                         <field name="address_id"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
+                        <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'}"/>
                     </group>
                 </search>
             </field>
@@ -777,7 +778,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                     <field name="date_expected" string="Date Expected"/>                                    
+                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                     <button
                                            name="%(stock.track_line)d"
@@ -804,7 +805,7 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
-                                             <field name="date_expected"  string="Date Expected"/>                                            
+                                             <field name="date_expected"  string="Date Expected"/>
                                             <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]"/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
@@ -858,20 +859,20 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Delivery">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders" />
-                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Orders"/>
+                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders" />
+                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Orders"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock" string="Back Order" domain="[('backorder_id','!=',False)]" help="Back Order"/>
+                        <filter icon="terp-accessories-archiver-minus" string="Back Order" domain="[('backorder_id','!=',False)]" help="Back Order"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="address_id"/>
                         <field name="origin"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="10">
-                        <filter string="Partner" icon="terp-stock" domain="[]"  context="{'group_by':'address_id'}"/>
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="10">
+                        <filter string="Partner" icon="terp-personal" domain="[]"  context="{'group_by':'address_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
             </field>
@@ -957,7 +958,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                     <field name="date_expected" string="Date Expected"/>                                    
+                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                     <button
                                            name="%(stock.track_line)d"
@@ -984,7 +985,7 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
-                                             <field name="date_expected"  string="Date Expected"/>                                            
+                                             <field name="date_expected"  string="Date Expected"/>
                                             <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
@@ -1040,8 +1041,8 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
-                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
+                        <filter icon="terp-check" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
+                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
                         <separator orientation="vertical"/>
 
                         <field name="name"/>
@@ -1050,11 +1051,11 @@
 
                    </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <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'}"/>
                     </group>
                 </search>
             </field>
@@ -1159,7 +1160,7 @@
                                             <field groups="product.group_uos" name="product_uos_qty"/>
                                             <field colspan="4" invisible="1" name="name" />
                                             <field groups="base.group_extended" name="date_planned"/>
-                                             <field name="date_expected" groups="base.group_extended" string="Date Expected"/>                                            
+                                             <field name="date_expected" groups="base.group_extended" string="Date Expected"/>
                                             <newline/>
                                             <newline/>
                                             <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
@@ -1215,24 +1216,23 @@
             <field name="arch" type="xml">
                 <search string="Input Picking List">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
+                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
                         <separator orientation="vertical" />
-                        <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" groups="base.group_extended"/>
+                        <filter icon="terp-accessories-archiver-minus" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="address_id"/>
+                        <field name="origin"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter icon="terp-stock" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
-                        <separator orientation="vertical" />
-                        <filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
+                        <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'}"/>
                     </group>
                 </search>
             </field>
@@ -1275,20 +1275,20 @@
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
-                        <filter icon="terp-stock" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
+                        <filter icon="terp-check" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
+                        <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="origin"/>
                         <field name="company_id" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-                        <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
-                        <filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
+                    <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'}"/>
                     </group>
                 </search>
             </field>
@@ -1360,7 +1360,7 @@
                                 <separator string="Dates &amp; Priority" colspan="2" />
                                 <field name="date"/>
                                 <field name="date_planned"/>
-                                <field name="date_expected"/>                                
+                                <field name="date_expected"/>
                                 <field name="priority"/>
                             </group>
 
@@ -1397,9 +1397,9 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves"/>
+                        <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves"/>
                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Future stock moves"/>
-                        <filter icon="terp-stock" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Future stock moves that are ready"/>
+                        <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Future stock moves that are ready"/>
                         <separator orientation="vertical"/>
                         <field name="product_id"/>
                         <field name="location_id" string="Location" domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
@@ -1407,18 +1407,18 @@
                         <field name="date_planned"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="Product" name="by_product" icon="terp-stock" domain="[]"  context="{'group_by':'product_id'}"/>
-                        <filter string="Lot" name="prodlot_id" icon="terp-stock" domain="[]"  context="{'group_by':'prodlot_id'}"/>
-                        <filter string="Packing" name="picking_id" icon="terp-stock" domain="[]"  context="{'group_by':'picking_id'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
+                        <filter string="Lot" name="prodlot_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'prodlot_id'}"/>
+                        <filter string="Packing" name="picking_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'picking_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Source" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
-                        <filter string="Destination" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/>
+                        <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'location_id'}"/>
+                        <filter string="Destination" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'location_dest_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock" string="State" domain="[]" context="{'group_by':'state'}" />
+                        <filter icon="terp-stock_effects-object-colorize" string="State" domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Creation" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
-                        <filter string="Expected" icon="terp-stock" domain="[]" context="{'group_by':'date_planned'}"/>
+                        <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Expected" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
                     </group>
                 </search>
             </field>
@@ -1451,7 +1451,7 @@
                     <field name="partner_id" string="Supplier"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
-                    <field name="product_uom" string="Uint Of Measure"/>
+                    <field name="product_uom" string="Unit Of Measure"/>
                     <field name="prodlot_id" string="Lot" groups="base.group_extended"/>
                     <field name="date_planned"/>
                     <field name="date_expected"/>
@@ -1474,12 +1474,12 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <separator colspan="4" string="Move Information"/>
-                            <field name="location_id"/>
-                            <field name="location_dest_id"/>
+                            <field name="location_id" widget="selection"/>
+                            <field name="location_dest_id" widget="selection"/>
                             <field colspan="4" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)"/>
                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                            <field name="product_uom"/>
-                            <field name="product_uos"/>
+                            <field name="product_uom" widget="selection"/>
+                            <field name="product_uos" widget="selection" groups="base.group_extended"/>
                             <field colspan="4" name="name"/>
                             <field name="date"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -1496,8 +1496,10 @@
                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                             <field name="tracking_id"/>
                             <newline/>
-                            <label/>
-                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                            <group col="2" colspan="2">
+                                <label/>
+                                <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                            </group>
                             <separator colspan="4" string="Move State"/>
                             <field name="state"/>
                             <group col="5" colspan="2">
@@ -1524,9 +1526,9 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" name="receive" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
-                        <filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
-                        <filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
+                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
+                        <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
+                        <filter icon="terp-go-today" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
                         <field name="origin" string="Latest Procurement"/>
                         <field name="partner_id" string="Supplier"/>
@@ -1537,10 +1539,12 @@
                        <field name="tracking_id" context="{'tracking_lot': self}" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <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="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_expected'}" />
                     </group>
                 </search>
             </field>
@@ -1730,5 +1734,32 @@
             <field name="view_id" ref="view_move_delivery_products_planned_graph"/>
         </record>
 
+        <record id="action_picking_tree_out" model="ir.actions.act_window">
+            <field name="name">Outcoming Shipments</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar</field>
+            <field name="domain">[('type','=','out')]</field>
+            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
+            <field name="search_view_id" ref="view_picking_in_search"/>
+        </record>
+        <record id="action_invoice_tree5_out" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_picking_in_tree"/>
+            <field name="act_window_id" ref="action_picking_tree_out"/>
+        </record>
+        <record id="action_invoice_tree5_view2_out" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_picking_in_form"/>
+            <field name="act_window_id" ref="action_picking_tree_out"/>
+        </record>
+        <record id="action_invoice_tree5_viewout_cal" model="ir.actions.act_window.view">
+            <field eval="3" name="sequence"/>
+            <field name="view_mode">calendar</field>
+            <field name="act_window_id" ref="action_picking_tree_out"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 00b7b616aa5..aa7bb42cf8b 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -258,7 +258,7 @@ class split_in_production_lot(osv.osv_memory):
                     quantity_rest -= quantity
                     uos_qty = quantity / move_qty * move.product_uos_qty
                     uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
-                    if quantity_rest <= 0:
+                    if quantity_rest < 0:
                         quantity_rest = quantity
                         break
                     default_val = {
@@ -266,8 +266,11 @@ class split_in_production_lot(osv.osv_memory):
                         'product_uos_qty': uos_qty, 
                         'state': move.state
                     }
-                    current_move = move_obj.copy(cr, uid, move.id, default_val)
-                    new_move.append(current_move)
+                    if quantity_rest > 0:
+                        current_move = move_obj.copy(cr, uid, move.id, default_val)
+                        new_move.append(current_move)
+                    if quantity_rest == 0:
+                        current_move = move.id
                     prodlot_id = False
                     if line.use_exist and line.name:
                         prodlot_id = prodlot_obj.search(cr, uid, [('prefix','=',line.name),('product_id','=',data.product_id.id)])
diff --git a/addons/stock_invoice_directly/wizard/stock_invoice.py b/addons/stock_invoice_directly/wizard/stock_invoice.py
index ce468422b7f..2eaf0adb4a6 100644
--- a/addons/stock_invoice_directly/wizard/stock_invoice.py
+++ b/addons/stock_invoice_directly/wizard/stock_invoice.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,62 +15,32 @@
 #    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 wizard
-import pooler
-import netsvc
+from osv import fields, osv
+from tools.translate import _
 
-class invoice_directly(wizard.interface):
-    def _test_action(obj, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        pick = pool.get('stock.picking').browse(cr, uid, data['id'], context=context)
-        if not pick.invoice_state == '2binvoiced':
-            return 'end_final'
-        return 'invoice'
+class invoice_directly(osv.osv_memory):
+    _inherit = 'stock.partial.picking'
 
-    def _open_action(obj, cr, uid, data, context):
-        res = {
-            'name': 'stock.invoice_onshipping',
-            'type': 'ir.actions.wizard',
-            'wiz_name': 'stock.invoice_onshipping'
-        }
-        if data['form'].get('new_picking', False):
-            res['context'] = "{'new_picking':%d}" % (data['form']['new_picking'],)
-        return res
+    def do_partial(self, cr, uid, ids, context):
+        result = super(invoice_directly, self).do_partial(cr, uid, ids, context)
+        pick_obj = self.pool.get('stock.picking')
+        picking_ids = context.get('active_ids', False)
+        pick = pick_obj.browse(cr, uid, picking_ids, context)[0]
+        if pick.invoice_state=='2binvoiced':
+            return {
+                'name': 'Create Invoice',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'stock.invoice.onshipping',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                }
+        return {}
 
-    end_final = {
-        'actions':[],
-        'result': {
-            'type': 'state',
-            'state': 'end',
-        }
-    }
-
-    choice = {
-        'actions':[],
-        'result': {
-            'type': 'choice',
-            'next_state': _test_action,
-        }
-    }
-
-    call_invoice = {
-        'actions':[],
-        'result': {
-            'type': 'action',
-            'action': _open_action,
-            'state': 'end'
-        }
-    }
-    def __init__(self, *args):
-        service = netsvc.LocalService("wizard.stock.partial_picking")
-        service._service.states['split']['result']['state'] = 'test_choice'
-        service._service.states['invoice'] = self.call_invoice
-        service._service.states['test_choice'] = self.choice
-        service._service.states['end_final'] = self.end_final
-invoice_directly('stock.picking.invoice.directly')
+invoice_directly()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index dfca96b0163..1bfb1d0f1aa 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -239,7 +239,7 @@
             <field name="arch" type="xml">
                 <search string="Search Stock and Sales Forecast">
                  <group col='10' colspan='4'>
-                    <filter icon="terp-purchase" string="Validated" domain="[('state','=','validated')]" separator="1"/>
+                    <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" separator="1"/>
                     <field name="company_id" select="1" widget="selection"/>
                     <field name="warehouse_id" select="1" widget="selection"/>
                     <field name="period_id" select="1" widget="selection"/>
diff --git a/addons/survey/i18n/hr.po b/addons/survey/i18n/hr.po
index b652ccf0225..39cb6d5b773 100644
--- a/addons/survey/i18n/hr.po
+++ b/addons/survey/i18n/hr.po
@@ -8,20 +8,20 @@ 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-03-22 00:56+0000\n"
+"PO-Revision-Date: 2010-06-06 23:46+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_survey_form
 msgid "Surveys"
-msgstr ""
+msgstr "Upitnici"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey
@@ -310,18 +310,18 @@ msgstr "Manualno"
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_form1
 msgid "All Surveys"
-msgstr ""
+msgstr "Svi Upitnici"
 
 #. module: survey
 #: view:survey:0
 #: field:survey,users:0
 msgid "Users"
-msgstr ""
+msgstr "Korisnici"
 
 #. module: survey
 #: wizard_view:wizard.send.invitation,init:0
 msgid "Message"
-msgstr ""
+msgstr "Poruka"
 
 #. module: survey
 #: field:survey.name.wiz,page_no:0
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 8063e6183a9..a8bfa906c90 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -207,7 +207,7 @@ class survey_browse_response(report_rml):
                             <td><para style="terp_tblheader_General_Centre_simple">""" + to_xml(time.strftime('%d-%m-%Y %I:%M:%S %p', time.strptime(response.date_create.split('.')[0], '%Y-%m-%d %H:%M:%S'))) + """</para></td>
                             <td><para style="terp_tblheader_General_Centre"></para></td>
                             <td><para style="terp_tblheader_General_right">Answer By:- </para></td>
-                            <td><para style="terp_tblheader_General_right_simple">""" + to_xml(response.user_id.login) + """</para></td>
+                            <td><para style="terp_tblheader_General_right_simple">""" + to_xml(response.user_id.login or '') + """</para></td>
                           </tr>
                         </blockTable><para style="P2"></para>"""
 
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index 2c1de9cc71d..5a7d5e283e3 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -149,11 +149,10 @@ class survey_form(report_rml):
         <story>"""
         surv_obj = pooler.get_pool(cr.dbname).get('survey')
         for survey in surv_obj.browse(cr,uid,ids):
-            if datas.has_key('form') and datas['form']['survey_title']:
-                rml += """
-                <blockTable colWidths='"""+_tbl_widths+"""' style="title_tbl">
-                    <tr><td><para style="title">""" + to_xml(tools.ustr(survey.title)) + """</para><para style="P2"><font></font></para></td></tr>
-                </blockTable>"""
+            rml += """
+            <blockTable colWidths='"""+_tbl_widths+"""' style="title_tbl">
+                <tr><td><para style="title">""" + to_xml(tools.ustr(survey.title)) + """</para><para style="P2"><font></font></para></td></tr>
+            </blockTable>"""
             if survey.note:
                 rml += """
                 <para style="P2"></para>
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index c7ceb796bae..c86f13b262f 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -225,7 +225,7 @@ class survey_question(osv.osv):
         'page_id': fields.many2one('survey.page', 'Survey Page', ondelete='cascade', required=1),
         'question':  fields.char('Question', size=128, required=1),
         'answer_choice_ids': fields.one2many('survey.answer', 'question_id', 'Answer'),
-        'is_require_answer': fields.boolean('Require Answer to Question (optional)'),
+        'is_require_answer': fields.boolean('Require Answer to Question'),
         'required_type': fields.selection([('all','All'), ('at least','At Least'), ('at most','At Most'), ('exactly','Exactly'), ('a range','A Range')], 'Respondent must answer'),
         'req_ans': fields.integer('#Required Answer'),
         'maximum_req_ans': fields.integer('Maximum Required Answer'),
@@ -250,7 +250,7 @@ class survey_question(osv.osv):
              ('date_and_time','Date and Time'),('descriptive_text','Descriptive Text'),
              ('table','Table'),
             ], 'Question Type',  required=1,),
-        'is_comment_require': fields.boolean('Add Comment Field (optional)'),
+        'is_comment_require': fields.boolean('Add Comment Field'),
         'comment_label': fields.char('Field Label', size = 255),
         'comment_field_type': fields.selection([('char', 'Single Line Of Text'), ('text', 'Paragraph of Text')], 'Comment Field Type'),
         'comment_valid_type': fields.selection([('do_not_validate', '''Don't Validate Comment Text.'''),
@@ -269,7 +269,7 @@ class survey_question(osv.osv):
         'comment_valid_err_msg': fields.text('Error message'),
         'make_comment_field': fields.boolean('Make Comment Field an Answer Choice'),
         'make_comment_field_err_msg': fields.text('Error message'),
-        'is_validation_require': fields.boolean('Validate Text (optional)'),
+        'is_validation_require': fields.boolean('Validate Text'),
         'validation_type': fields.selection([('do_not_validate', '''Don't Validate Comment Text.'''),\
              ('must_be_specific_length', 'Must Be Specific Length'),\
              ('must_be_whole_number', 'Must Be A Whole Number'),\
@@ -609,7 +609,7 @@ class survey_response(osv.osv):
         reads = self.read(cr, uid, ids, ['user_id','date_create'], context)
         res = []
         for record in reads:
-            name = record['user_id'][1] + ' (' + record['date_create'].split('.')[0] + ')'
+            name = (record['user_id'] and record['user_id'][1] or '' )+ ' (' + record['date_create'].split('.')[0] + ')'
             res.append((record['id'], name))
         return res
 
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 3eca378f150..68e6c1e9883 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -24,6 +24,7 @@
             <field name="state">open</field>
             <field name="tot_comp_survey">1</field>
             <field name="tot_start_survey">1</field>
+            <field name="response_user">5</field>
            </record>
 
         <record id="survey_page_who_are_you" model="survey.page">
@@ -498,6 +499,7 @@
             <field name="state">open</field>
             <field name="tot_comp_survey">1</field>
             <field name="tot_start_survey">1</field>
+            <field name="response_user">5</field>
            </record>
 
         <record id="survey_page_odoo_who_are_you" model="survey.page">
@@ -1286,6 +1288,7 @@
             <field name="responsible_id" ref="base.user_demo"/>
             <field name="max_response_limit">20</field>
             <field name="type" ref="survey_type2"/>
+            <field name="response_user">5</field>
         </record>
     </data>
     <data>
@@ -2163,6 +2166,8 @@
             <field eval="1" name="send_response"/>
             <field eval="[(6,0,[])]" name="users"/>
             <field name="type" ref="survey_type3"/>
+            <field name="response_user">5</field>
+            <field name="max_response_limit">20</field>
         </record>
     </data>
     <data>
diff --git a/addons/survey/survey_report.xml b/addons/survey/survey_report.xml
index c74d9d1d544..3ca05f6ba63 100644
--- a/addons/survey/survey_report.xml
+++ b/addons/survey/survey_report.xml
@@ -6,21 +6,20 @@
 				id="report_survey_form"
 				model="survey"
 				name="survey.form"
-				menu="False"
-				string="Survey Form"/>
+				string="Surveys"/>
 
-		<report auto="True" 
-				id="survey_analysis" 
+		<report auto="True"
+				id="survey_analysis"
 				model="survey"
 				name="survey.analysis"
-				rml="" 
-				string="Print Survey Statistics"/>
+				rml=""
+				string="Surveys Statistics"/>
 
-		<report auto="True" 
-				id="survey_browse_response" 
+		<report auto="True"
+				id="survey_browse_response"
 				model="survey"
 				name="survey.browse.response"
 				rml=""
-				string="Print Answers"/>
+				string="Surveys Answers"/>
 	</data>
 </openerp>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 8a574edc169..a604b7c7c37 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -255,8 +255,8 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-crm" string="Draft" domain="[('state','=','draft')]"/>
-                        <filter string="Open" icon="terp-stock" domain="[('state','=','open')]"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                        <filter string="Open" icon="terp-check" domain="[('state','=','open')]"/>
                         <separator orientation="vertical"/>
                         <field name="title" select="1"/>
                         <field name="type" select="1" widget="selection"/>
@@ -478,7 +478,7 @@
                     <field name="note" colspan="4" nolabel="1"/>
                       <group colspan="4">
                           <label string="" colspan="3"/>
-                        <button name="survey_save"  string="Ok" type="object" icon="gtk-go-back"/>
+                        <button name="survey_save"  string="Ok" type="object" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>
@@ -805,7 +805,7 @@
                     </notebook>
                       <group colspan="4">
                           <label string="" colspan="3"/>
-                        <button name="survey_save"  string="Ok" type="object" icon="gtk-ok"/>
+                        <button name="survey_save"  string="Ok" type="object" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>
@@ -1065,13 +1065,13 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-crm" string="Unanswered" domain="[('state','=','waiting_answer')]"/>
-                        <filter icon="terp-stock" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                        <filter icon="terp-emblem-important" string="Unanswered" domain="[('state','=','waiting_answer')]"/>
+                        <filter icon="terp-gtk-media-pause" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
                         <field name="survey_id" widget="selection" select="1"/>
                         <field name="email" select="1"/>
                         <field name="user_id" select="1" widget="selection" default="1">
-                        <filter string="MY" icon="terp-partner" domain="[('user_id','=',uid)]"/>
+                        <filter string="MY" icon="terp-personal" domain="[('user_id','=',uid)]"/>
                         </field>
                    </group>
                </search>
@@ -1156,11 +1156,11 @@
             res_model="survey.answer"
             src_model="survey.question"/>
 
-        <act_window domain="[('survey_id', '=', active_id)]"
+        <!--act_window domain="[('survey_id', '=', active_id)]"
             id="act_survey_response"
             name="Survey Answer"
             res_model="survey.response"
-            src_model="survey"/>
+            src_model="survey"/-->
 
         <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
             action="action_view_survey_name" parent="menu_answer_surveys"
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index 3f4fb753fa3..4b74021b8a1 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -46,7 +46,7 @@ class survey_browse_answer(osv.osv_memory):
 
     _columns = {
         'survey_id': fields.selection(_get_survey, "Survey", required="1"),
-        'response_id': fields.many2one("survey.response", "Survey Answer"),
+        'response_id': fields.many2one("survey.response", "Survey Answer", help="If you want to print all answer of selected survey then don't select survey answer and if you select survey answer then print only selected survey answer."),
     }
 
     def action_next(self, cr, uid, ids, context=None):
diff --git a/addons/survey/wizard/survey_print.py b/addons/survey/wizard/survey_print.py
index d13d006312e..601b3c4e786 100644
--- a/addons/survey/wizard/survey_print.py
+++ b/addons/survey/wizard/survey_print.py
@@ -28,11 +28,12 @@ from tools.translate import _
 class survey_print(osv.osv_memory):
     _name = 'survey.print'
     _columns = {
+        'survey_ids': fields.many2many('survey','survey_print',\
+                            'survey_id','print_id', "Survey", required="1"),
         'orientation' : fields.selection([('vertical','Portrait(Vertical)'),\
                             ('horizontal','Landscape(Horizontal)')], 'Orientation'),
         'paper_size' : fields.selection([('letter','Letter (8.5" x 11")'),\
                             ('legal','Legal (8.5" x 14")'),('a4','A4 (210mm x 297mm)')], 'Paper Size'),
-        'survey_title' : fields.boolean('Include Survey Title'),
         'page_number' : fields.boolean('Include Page Numvers'),
         'without_pagebreak' : fields.boolean('Print Without Page Breaks'),
     }
@@ -40,7 +41,6 @@ class survey_print(osv.osv_memory):
     _defaults = {
         'orientation': lambda *a:'vertical',
         'paper_size': lambda *a:'letter',
-        'survey_title':lambda *a: 0,
         'page_number':lambda *a: 0,
         'without_pagebreak':lambda *a: 0
     }
@@ -57,7 +57,7 @@ class survey_print(osv.osv_memory):
         @return : Dictionary value for print survey form.
         """
 
-        datas = {'ids' : context.get('active_ids', [])}
+        datas = {'ids' : self.read(cr, uid, ids, [], context)[0]['survey_ids']}
         res = self.read(cr, uid, ids, ['survey_title', 'orientation', 'paper_size',\
                              'page_number', 'without_pagebreak'], context)
         res = res and res[0] or {}
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index e5a42e17103..8f8793e6b1e 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!-- Survey Print Form View -->
-				 
+
 		<record id="view_survey_print" model="ir.ui.view">
 			<field name="name">Survey Print</field>
 			<field name="model">survey.print</field>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Survey Print">
+				    <separator string="Survey" colspan="4"/>
+				    <field name="survey_ids" nolabel="1" colspan="4" />
 				    <separator string="Print Option" colspan="4"/>
 				    <field name="orientation" colspan="4"/>
 				    <field name="paper_size" colspan="4"/>
-				    <field name="survey_title" colspan="4"/>
 				    <field name="page_number" colspan="4"/>
 				    <field name="without_pagebreak" colspan="4"/>
 					<separator colspan="4" />
@@ -34,10 +35,9 @@
 			<field name="target">new</field>
 		</record>
 
-    	<act_window id="action_act_view_survey_print"
-    		key2="client_action_multi" name="Print Survey"
-    		res_model="survey.print" src_model="survey"
-    		view_mode="form" target="new" view_type="form" />
+        <menuitem name="Surveys" id="menu_print_survey_form" sequence="1"
+            action="action_view_survey_print" parent="menu_reporting"
+            groups="group_survey_manager" icon="STOCK_PRINT"/>
 
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index fc754fa2e6c..1e34fc1029f 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!-- Survey Print answer Form View -->
-				 
+
 		<record id="view_survey_print_answer" model="ir.ui.view">
 			<field name="name">Survey Print Answer</field>
 			<field name="model">survey.print.answer</field>
@@ -36,7 +36,7 @@
 			<field name="target">new</field>
 		</record>
 
-		<menuitem name="Print Answer" action="action_view_survey_print_answer" id="menu_print_survey_answer"
+		<menuitem name="Surveys Answers" action="action_view_survey_print_answer" id="menu_print_survey_answer"
 			parent="menu_reporting" icon="STOCK_PRINT" groups="group_survey_manager"/>
 
 	</data>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index 8838a18098c..5659b82e896 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!-- Survey Print Statistics Form View -->
-				 
+
 		<record id="view_survey_print_statistics" model="ir.ui.view">
 			<field name="name">Survey Print Statistics</field>
 			<field name="model">survey.print.statistics</field>
@@ -30,7 +30,7 @@
 			<field name="target">new</field>
 		</record>
 
-		<menuitem name="Print Survey Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
+		<menuitem name="Surveys Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
 			parent="menu_reporting" icon="STOCK_PRINT" groups="group_survey_manager"/>
 
 	</data>
diff --git a/addons/thunderbird/i18n/hr.po b/addons/thunderbird/i18n/hr.po
index e7accb0d6e0..4ac0603558f 100644
--- a/addons/thunderbird/i18n/hr.po
+++ b/addons/thunderbird/i18n/hr.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-26 06:05+0000\n"
-"PO-Revision-Date: 2010-03-21 23:36+0000\n"
+"PO-Revision-Date: 2010-06-06 23:47+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
 #. module: thunderbird
 #: field:tinythunderbird.partner,copy_to:0
 msgid "Copy To"
-msgstr ""
+msgstr "Kopiraj na"
 
 #. module: thunderbird
 #: constraint:ir.model:0
diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py
index 4e0f4435d31..c93e10080ed 100644
--- a/addons/thunderbird/installer.py
+++ b/addons/thunderbird/installer.py
@@ -29,38 +29,28 @@ class thunderbird_installer(osv.osv_memory):
     _name = 'thunderbird.installer'
     _inherit = 'res.config.installer'
 
-    def process_plugin(self, cr, uid, ids, context):
-        """
-        Default Attach Thunderbird Plug-in File.
-        """
-        data = {}
-        file = open(config['addons_path'] + "/thunderbird/plugin/tiny_plugin-2.0.xpi", 'r')
-        data['plugin_file'] = base64.encodestring(file.read())
-        self.write(cr, uid, ids, data)
-        return False
-
-    def process_pdf_file(self, cr, uid, ids, context):
-        """
-        Default Attach Thunderbird Plug-in Installation File.
-        """
-        data = {}
+    def default_get(self, cr, uid, fields, context={}):
+        data = super(thunderbird_installer, self).default_get(cr, uid, fields, context)
         pdf_file = open(config['addons_path'] + "/thunderbird/doc/Installation Guide to OpenERP Thunderbid Plug-in.pdf", 'r')
         data['pdf_file'] = base64.encodestring(pdf_file.read())
-        self.write(cr, uid, ids, data)
-        return False
+        file = open(config['addons_path'] + "/thunderbird/plugin/tiny_plugin-2.0.xpi", 'r')
+        data['plugin_file'] = base64.encodestring(file.read())
+        return data
 
     _columns = {
         'name':fields.char('File name', size=34),
         'pdf_name':fields.char('File name', size=64),
         'thunderbird':fields.boolean('Thunderbird Module ', help="Allows you to select an object that you’d like to add to your email and its attachments."),
-        'plugin_file':fields.binary('Thunderbird Plug-in', readonly=True, help="Thunderbird plug-in file. Save as this file and install this plug-in in thunderbir."),
-        'pdf_file':fields.binary('Thunderbird Plug-in Installation File', help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),        
+        'plugin_file':fields.binary('Thunderbird Plug-in', readonly=True, help="Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."),
+        'pdf_file':fields.binary('Installation Manual', help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
+        'description':fields.text('Description', readonly=True)        
         }
 
     _defaults = {
         'thunderbird' : True,
         'name' : 'tiny_plugin-2.0.xpi',
         'pdf_name' : 'Installation Guide to OpenERP Thunderbid Plug-in.pdf',
+        'description' : """ * Save The thunderbird plug­in Follow the following step to install thunderbird plug­in. \n    -> 1. From Menu Bar, Open Tools ­> Add ons. \n    -> 2. Now click on install button and a browser window will appear. \n    -> 3. Just select the (.xpi) file from thunderbird/plugin directory and click ok, a new software installation window will appear and within a short time Install Now  button will be enabled. \n    -> 4. Click on Install Now and restart Thunderbird. \n    -> 5. Now Thunderbird plug­in is installed."""
         }
 
 thunderbird_installer()
diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index f7c3f41a776..f91a4e29737 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -90,9 +90,9 @@ class tinythunderbird_partner(osv.osv):
         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:
+        if partner and partner[0] and partner[0]['partner_id']:
             dictcreate.update({'partner_id':partner[0]['partner_id'][0]})
-        create_id = self.pool.get(dictcreate.get('object','crm.case')).create(cr, user, dictcreate)
+        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
@@ -104,10 +104,11 @@ class tinythunderbird_partner(osv.osv):
 
     def thunderbird_createpartner(self,cr,user,vals):
         dictcreate = dict(vals)
-        search_id = self.pool.get('res.partner').search(cr, user,[('name','=',dictcreate['name'])])
+        address_obj = self.pool.get('res.partner')
+        search_id = address_obj.search(cr, user,[('name','=',dictcreate['name'])])
         if search_id:
             return 0
-        create_id = self.pool.get('res.partner').create(cr, user, dictcreate)
+        create_id = address_obj.create(cr, user, dictcreate)
         return create_id
 
     def thunderbird_searchobject(self,cr,user,vals):
@@ -116,12 +117,13 @@ class tinythunderbird_partner(osv.osv):
         return (search_id and search_id[0]) or 0
 
     def thunderbird_searchcontact(self,cr,user,vals):
-        search_id1 = self.pool.get('res.partner.address').search(cr,user,[('name','ilike',vals)])
-        search_id2 = self.pool.get('res.partner.address').search(cr,user,[('email','=',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 self.pool.get('res.partner.address').name_get(cr, user, search_id1)
+            return address_obj.name_get(cr, user, search_id1)
         elif search_id2:
-            return self.pool.get('res.partner.address').name_get(cr, user, search_id2)
+            return address_obj.name_get(cr, user, search_id2)
         return []
 
     def thunderbird_tempsearch(self,cr,user,vals):
@@ -132,21 +134,22 @@ class tinythunderbird_partner(osv.osv):
         name_get=[]
         er_val=[]
         for object in obj:
+            dyn_object = self.pool.get(object)
             if object == 'res.partner.address':
-                search_id1 = self.pool.get(object).search(cr,user,[('name','ilike',value)])
-                search_id2 = self.pool.get(object).search(cr,user,[('email','=',value)])
+                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(self.pool.get(object).name_get(cr, user, search_id1))
+                    name_get.append(dyn_object.name_get(cr, user, search_id1))
                 elif search_id2:
                     name_get.append(object)
-                    name_get.append(self.pool.get(object).name_get(cr, user, search_id2))
+                    name_get.append(dyn_object.name_get(cr, user, search_id2))
             else:
                 try:
-                    search_id1 = self.pool.get(object).search(cr,user,[('name','ilike',value)])
+                    search_id1 = dyn_object.search(cr,user,[('name','ilike',value)])
                     if search_id1:
                         name_get.append(object)
-                        name_get.append(self.pool.get(object).name_get(cr, user, search_id1))
+                        name_get.append(dyn_object.name_get(cr, user, search_id1))
                 except:
                     er_val.append(object)
                     continue
@@ -179,17 +182,38 @@ class tinythunderbird_partner(osv.osv):
 
     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 = self.pool.get('ir.attachment').search(cr,user,[('res_model','=',self._name),('res_id','=',read_data['id'])])
-             attechments_data = self.pool.get('ir.attachment').read(cr,user,attachments,['name'])
+             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={}):
-        attachments = self.pool.get('ir.attachment').search(cr,uid,[('res_model','=',self._name),('res_id','in',ids)])
-        self.pool.get('ir.attachment').unlink(cr,uid,attachments)
+        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)
 
-tinythunderbird_partner()
+    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/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi
new file mode 100644
index 00000000000..ef42a9a0c14
Binary files /dev/null and b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi differ
diff --git a/addons/thunderbird/security/ir.model.access.csv b/addons/thunderbird/security/ir.model.access.csv
index fdd310a0679..b7cc3262e2d 100644
--- a/addons/thunderbird/security/ir.model.access.csv
+++ b/addons/thunderbird/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_tinythunderbird_partner","tinythunderbird.partner","model_tinythunderbird_partner",,1,1,1,1
-
+"access_thunderbird_installer","thunderbird.installer","model_thunderbird_installer","base.group_user",1,1,1,1
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 356282d2de5..34812a38cee 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -29,13 +29,11 @@
                   <newline/>
 
                   <field name="plugin_file" filename="name"/>
-                  <button name="process_plugin"  icon="gtk-execute" string="Get Plugin File" type="object"/>
                   <newline/>
                   <field name="pdf_file" filename="pdf_name"/>
-                  <button name="process_pdf_file"  icon="gtk-execute" string="Get Plugin Installation File" type="object"/>
                   <newline/>
                   <separator string="Thunderbird plugin installation note." colspan="4"/>
-                  <label colspan="8" string="Save The thunderbird plug­in Follow the following step to install thunderbird plug­in ? 1. From Menu Bar, Open Tools ­> Add ons. 2. Now click on install button and a browser window will appear. 3. Just select the (.xpi) file from thunderbird/plugin directory and click ok, a new software installation window will appear and within a short time Install Now  button will be enabled. 4. Click on Install Now and restart Thunderbird. 5. Now Thunderbird plug­in is installed."/>
+                  <field name="description" nolabel="1" colspan="8"/>
               </group>
               </group>
           </data>
@@ -74,16 +72,18 @@
                           <label align="0.0" string="This module is required for the thuderbird plug-in to work properly.This allows you to select an object that you had like to add to your email and its attachments. You can select a partner, a task, a project, an analytical account, or any other object and attach selected mail as .eml file in attachment of selected record." width="200"/>
                        </group>
                        <group colspan="8">
-                           <separator string="Thunderbird" colspan="4"/>
-                           <field name="thunderbird"/>
-                           <field name="name" invisible="1"/>
-                           <newline/>
-                           <field name="plugin_file"/>
-                           <button name="process_plugin"  icon="gtk-execute" string="Get Plugin File" type="object"/>
-                           <newline/>
-                           <separator string="Thunderbird plugin installation note." colspan="4"/>
-                           <label colspan="8" string="Save The thunderbird plug­in Follow the following step to install thunderbird plug­in ? 1. From Menu Bar, Open Tools ­> Add ons. 2. Now click on install button and a browser window will appear. 3. Just select the (.xpi) file from thunderbird/plugin directory and click ok, a new software installation window will appear and within a short time Install Now  button will be enabled. 4. Click on Install Now and restart Thunderbird. 5. Now Thunderbird plug­in is installed."/>
-                       </group>
+		                  <field name="thunderbird"/>
+		                  <field name="name" invisible="1"/>
+		                  <field name="pdf_name" invisible="1"/>
+		                  <newline/>
+		
+		                  <field name="plugin_file" filename="name"/>
+		                  <newline/>
+		                  <field name="pdf_file" filename="pdf_name"/>
+		                  <newline/>
+		                  <separator string="Thunderbird plugin installation note." colspan="4"/>
+		                  <field name="description" nolabel="1" colspan="8"/>                       
+		               </group>
                    </group>
              </group>
              <separator string="" colspan="4"/>
diff --git a/addons/warning/i18n/hr.po b/addons/warning/i18n/hr.po
index 53602bfba7d..e126c187a9c 100644
--- a/addons/warning/i18n/hr.po
+++ b/addons/warning/i18n/hr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-22 00:56+0000\n"
+"PO-Revision-Date: 2010-06-06 23:49+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
 #. module: warning
 #: field:product.product,purchase_line_warn:0
 msgid "Purchase Order Line"
-msgstr ""
+msgstr "Niz Prodajne Narudžbe"
 
 #. module: warning
 #: field:product.product,sale_line_warn_msg:0
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 93f0df72361..272dad32683 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -21,7 +21,7 @@
             <field name="model">wiki.groups</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Wikis">
+                <tree string="Wiki Groups">
                     <field name="name"/>
                 </tree>
             </field>
@@ -34,7 +34,7 @@
             <field name="model">wiki.groups</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Wikis">
+                <form string="Wiki Groups">
                     <group colspan="4" col="4">
                         <field name="name" select="1"/>
                         <field name="create_date" readonly="2"/>
@@ -62,7 +62,7 @@
 <!--  Wiki Groups Action  -->
 
         <record model="ir.actions.act_window" id="action_wiki_groups">
-            <field name="name">Wikis</field>
+            <field name="name">Wiki Groups</field>
             <field name="res_model">wiki.groups</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -74,7 +74,7 @@
             action="action_wiki_groups"/>
 
         <record model="ir.actions.act_window" id="action_wiki_groups_browse">
-            <field name="name">Wikis</field>
+            <field name="name">Wiki Groups</field>
             <field name="res_model">wiki.groups</field>
             <field name="view_type">tree</field>
         </record>
@@ -126,13 +126,15 @@
                 <form string="Wiki">
                     <group col="8" colspan="4">
                         <field name="name" select="1" colspan="6"/>
-                        <field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/>
-                        <field name="section" invisible="not context.get('section',False)"/>
-                        <field name="parent_id"/>
                         <button name="open_wiki_page" type="object"
                         string="Basic Wiki Editing" icon="gtk-ok" />
                     </group>
-
+                    <group col="8" colspan="4">
+                        <field name="group_id" 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>
+					<separator colspan="4" string="Informations"/>
                     <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
                     <separator colspan="4" string="Modifications"/>
                     <group col="6" colspan="4">
@@ -169,7 +171,7 @@
 <!-- search page for wiki -->
 
         <record model="ir.actions.act_window" id="action_wiki">
-            <field name="name">Search Pages</field>
+            <field name="name">Wiki Pages</field>
             <field name="res_model">wiki.wiki</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/wiki_sale_faq/__init__.py b/addons/wiki_sale_faq/__init__.py
new file mode 100644
index 00000000000..938f045b9fd
--- /dev/null
+++ b/addons/wiki_sale_faq/__init__.py
@@ -0,0 +1,22 @@
+# -*- 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/>.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py
new file mode 100644
index 00000000000..9619ec98f15
--- /dev/null
+++ b/addons/wiki_sale_faq/__openerp__.py
@@ -0,0 +1,42 @@
+# -*- 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/>.
+#
+##############################################################################
+
+{
+    'name': 'Wiki -Sale - FAQ',
+    'version': '1.0',
+    'category': 'Generic Modules/Others',
+    'description': """This module provides a wiki FAQ Template
+    """,
+    'author': 'Tiny',
+    'website': 'http://openerp.com',
+    'depends': ['wiki_faq','document','crm'],
+    'init_xml': [
+            'wiki_sale_faq_data.xml'
+    ],
+    'update_xml': [
+            'wiki_sale_faq_view.xml'
+    ],
+    'demo_xml': [            
+    ],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_data.xml b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
new file mode 100644
index 00000000000..4a8eea1cb38
--- /dev/null
+++ b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+        <record model="document.directory" id="dir_sale">
+            <field name="name">Sales Document</field>
+            <field name="user_id" ref="base.user_admin"/>
+            <field name="parent_id" ref="document.dir_root"/>
+            <field name="ressource_id">0</field>
+        </record>
+
+        <record id="wiki_groups_sale_faq" model="wiki.groups">
+            <field name="name">Sale FAQ</field>
+            <field name="method">list</field>
+            <field eval="2" name="section"/>
+            <field name="template">== Question ==
+
+== Answer ==
+
+== External Links ==
+
+            </field>
+        </record>
+
+    
+   </data>
+</openerp>
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_view.xml b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
new file mode 100644
index 00000000000..c3643bdf049
--- /dev/null
+++ b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
+
+        <menuitem name="Documents"
+           id="menu_sales" sequence="6"
+           parent="base.menu_base_partner"/>
+
+       <record model="ir.actions.act_window" id="action_document_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">ir.attachment</field>
+        <field name="view_type">form</field>
+        <field name="domain" eval="[('parent_id','=',ref('dir_sale'))]"></field>
+    </record>
+
+         <record model="ir.actions.act_window" id="action_wiki_test">
+            <field name="name">Wiki Pages</field>
+            <field name="res_model">wiki.wiki</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain" eval="[('group_id','=',ref('wiki_groups_sale_faq'))]"/>
+            <field name="search_view_id" ref="wiki.view_wiki_filter"/>
+        </record>
+
+        <menuitem
+        name="Documents"
+        action="action_document_form"
+        id="menu_document_files"
+        parent="menu_sales"/>
+
+        <menuitem parent="menu_sales"
+            id="menu_action_wiki_wiki" name="FAQ"
+            action="action_wiki_test" />
+
+
+      </data>
+</openerp>