diff --git a/addons/account/__init__.py b/addons/account/__init__.py
index ed12abbefeb..9cbc57bbdc9 100644
--- a/addons/account/__init__.py
+++ b/addons/account/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -15,11 +15,12 @@
 #    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 account
+import installer
 import project
 import partner
 import invoice
diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index bb73c2527c0..c7f1dc9e149 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -21,7 +21,7 @@
 
 
 {
-    "name" : "Accounting and financial management",
+    "name" : "Accounting and Financial Management",
     "version" : "1.1",
     "depends" : ["product", "base", "process"],
     "author" : "Tiny",
@@ -58,6 +58,7 @@
         'process/supplier_invoice_process.xml',
         'sequence_view.xml',
         'company_view.xml',
+        'account_installer.xml',
     ],
     'demo_xml': [
         'account_demo.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index dae61439df3..3772a660de9 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -416,15 +416,27 @@ class account_account(osv.osv):
             default['child_parent_ids'] = False
         return super(account_account, self).copy(cr, uid, id, default, context=context)
 
+    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.'))
+            elif method == 'unlink':
+                raise osv.except_osv(_('Error !'), _('You cannot remove an account which has account entries!. '))
+        return True
+    
     def write(self, cr, uid, ids, vals, context=None):
         if not context:
             context = {}
         if 'active' in vals and not vals['active']:
-            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)]):
-                raise osv.except_osv(_('Error !'), _('You can not deactivate an account that contains Ledger Postings.'))
+            self._check_moves(cr, uid, ids, "write", context)
         return super(account_account, self).write(cr, uid, ids, vals, context=context)
+    
+    def unlink(self, cr, uid, ids, context={}):
+        self._check_moves(cr, uid, ids, "unlink", context)
+        return super(account_account, self).unlink(cr, uid, ids, context)
+    
 account_account()
 
 class account_journal_view(osv.osv):
@@ -767,6 +779,23 @@ class account_move(osv.osv):
         for id in ids:
             result.setdefault(id, 0.0)
         return result
+    
+    def _search_amount(self, cr, uid, obj, name, args, context):
+        ids = []
+        cr.execute('select move_id,sum(debit) from account_move_line group by move_id')
+        result = dict(cr.fetchall())
+
+        for item in args:
+            if item[1] == '>=':
+                res = [('id', 'in', [k for k,v in result.iteritems() if v >= item[2]])]
+            else:
+                res = [('id', 'in', [k for k,v in result.iteritems() if v <= item[2]])]    
+            ids += res
+
+        if not ids:    
+            return [('id', '>', '0')]
+
+        return ids
 
     _columns = {
         'name': fields.char('Number', size=64, required=True),
@@ -778,7 +807,7 @@ class account_move(osv.osv):
         'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
         'to_check': fields.boolean('To Be Verified'),
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner"),
-        'amount': fields.function(_amount_compute, method=True, string='Amount', digits=(16,int(config['price_accuracy']))),
+        'amount': fields.function(_amount_compute, method=True, string='Amount', digits=(16,int(config['price_accuracy'])), type='float', fnct_search=_search_amount),
         'date': fields.date('Date', required=True),
         'type': fields.selection([
             ('pay_voucher','Cash Payment'),
@@ -956,7 +985,7 @@ class account_move(osv.osv):
         else:
             context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
             line_id = self.pool.get('account.move.line').create(cr, uid, {
-                'name': _t(cr, None, 'selection', context.get('lang'), source=(mode.capitalize()+' Centralisation')) or (mode.capitalize()+' Centralisation'),
+                'name': _(mode.capitalize()+' Centralisation'),
                 'centralisation': mode,
                 'account_id': account_id,
                 'move_id': move.id,
@@ -1084,8 +1113,8 @@ class account_move_reconcile(osv.osv):
         'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/',
     }
     def reconcile_partial_check(self, cr, uid, ids, type='auto', context={}):
+        total = 0.0 
         for rec in self.browse(cr, uid, ids, context):
-            total = 0.0
             for line in rec.line_partial_ids:
                 total += (line.debit or 0.0) - (line.credit or 0.0)
         if not total:
@@ -1546,7 +1575,8 @@ class account_model(osv.osv):
     def generate(self, cr, uid, ids, datas={}, context={}):
         move_ids = []
         for model in self.browse(cr, uid, ids, context):
-            period_id = self.pool.get('account.period').find(cr,uid, context=context)
+            context.update({'date':datas['date']})
+            period_id = self.pool.get('account.period').find(cr, uid, dt=context.get('date',False))
             if not period_id:
                 raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
             period_id = period_id[0]
@@ -1554,6 +1584,7 @@ class account_model(osv.osv):
                 'ref': model.ref,
                 'period_id': period_id,
                 'journal_id': model.journal_id.id,
+                'date': context.get('date',time.strftime('%Y-%m-%d'))
             })
             move_ids.append(move_id)
             for line in model.lines_id:
@@ -1571,7 +1602,7 @@ class account_model(osv.osv):
                     'move_id': move_id,
                     'ref': line.ref,
                     'partner_id': line.partner_id.id,
-                    'date': time.strftime('%Y-%m-%d'),
+                    'date': context.get('date',time.strftime('%Y-%m-%d')),
                     'date_maturity': time.strftime('%Y-%m-%d')
                 })
                 c = context.copy()
@@ -1608,8 +1639,8 @@ class account_model_line(osv.osv):
     }
     _order = 'sequence'
     _sql_constraints = [
-        ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in model !'),
-        ('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in model !'),
+        ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in model (Credit Or Debit Must Be "0")!'),
+        ('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in model (Credit + Debit Must Be greater "0")!'),
     ]
 account_model_line()
 
@@ -1716,21 +1747,28 @@ account_subscription_line()
 
 class account_config_wizard(osv.osv_memory):
     _name = 'account.config.wizard'
+    _inherit = 'res.config'
 
     def _get_charts(self, cr, uid, context):
         module_obj=self.pool.get('ir.module.module')
-        ids=module_obj.search(cr, uid, [('category_id', '=', 'Account Charts'), ('state', '<>', 'installed')])
+        ids=module_obj.search(cr, uid, [('category_id', '=', 'Account Charts'),
+                                        ('state', '<>', 'installed')])
         res=[(m.id, m.shortdesc) for m in module_obj.browse(cr, uid, ids)]
         res.append((-1, 'None'))
         res.sort(key=lambda x: x[1])
         return res
 
     _columns = {
-        'name':fields.char('Name', required=True, size=64, help="Name of the fiscal year as displayed on screens."),
-        'code':fields.char('Code', required=True, size=64, help="Name of the fiscal year as displayed in reports."),
+        'name':fields.char(
+            'Name', required=True, size=64,
+            help="Name of the fiscal year as displayed on screens."),
+        'code':fields.char(
+            'Code', required=True, size=64,
+            help="Name of the fiscal year as displayed in reports."),
         'date1': fields.date('Start Date', required=True),
         'date2': fields.date('End Date', required=True),
-        'period':fields.selection([('month','Month'),('3months','3 Months')], 'Periods', required=True),
+        'period':fields.selection([('month','Month'), ('3months','3 Months')],
+                                  'Periods', required=True),
         'charts' : fields.selection(_get_charts, 'Charts of Account',required=True)
     }
     _defaults = {
@@ -1740,15 +1778,6 @@ class account_config_wizard(osv.osv_memory):
         'date2': lambda *a: time.strftime('%Y-12-31'),
         'period':lambda *a:'month',
     }
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
-
     def install_account_chart(self, cr, uid, ids, context=None):
         for res in self.read(cr,uid,ids):
             chart_id = res['charts']
@@ -1758,7 +1787,7 @@ class account_config_wizard(osv.osv_memory):
         cr.commit()
         db, pool = pooler.restart_pool(cr.dbname, update_module=True)
 
-    def action_create(self, cr, uid,ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         for res in self.read(cr,uid,ids):
             if 'date1' in res and 'date2' in res:
                 res_obj = self.pool.get('account.fiscalyear')
@@ -1777,16 +1806,6 @@ class account_config_wizard(osv.osv_memory):
                 elif res['period']=='3months':
                     res_obj.create_period3(cr,uid,[new_id])
         self.install_account_chart(cr,uid,ids)
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
-
-
-
 account_config_wizard()
 
 
@@ -2125,6 +2144,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         * generates all accounting properties and assigns them correctly
     """
     _name='wizard.multi.charts.accounts'
+    _inherit = 'res.config'
 
     _columns = {
         'company_id':fields.many2one('res.company','Company',required=True),
@@ -2145,7 +2165,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'code_digits': lambda *a:6,
     }
 
-    def action_create(self, cr, uid, ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         obj_multi = self.browse(cr,uid,ids[0])
         obj_acc = self.pool.get('account.account')
         obj_acc_tax = self.pool.get('account.tax')
@@ -2408,24 +2428,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                                 'position_id' : new_fp,
                                 }
                     obj_ac_fp.create(cr, uid, vals_acc)
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
-
-
 wizard_multi_charts_accounts()
 
 class account_bank_accounts_wizard(osv.osv_memory):
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 06871fa9342..40af2ba7ed2 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 096f33b2496..88c8e53fa6a 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -143,8 +143,7 @@ class account_bank_statement(osv.osv):
         'period_id': _get_period,
     }
 
-    def button_confirm(self, cr, uid, ids, context=None):
-        context = context or {}
+    def button_confirm(self, cr, uid, ids, context={}):
         done = []
         res_currency_obj = self.pool.get('res.currency')
         res_users_obj = self.pool.get('res.users')
@@ -166,7 +165,7 @@ class account_bank_statement(osv.osv):
                         _('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
             if (not st.journal_id.default_credit_account_id) \
                     or (not st.journal_id.default_debit_account_id):
-                raise osv.except_osv(_('Configration Error !'),
+                raise osv.except_osv(_('Configuration Error !'),
                         _('Please verify that an account is defined in the journal.'))
 
             for line in st.move_line_ids:
@@ -178,10 +177,10 @@ class account_bank_statement(osv.osv):
             # in bank stat.rec we get line_new_ids on bank.stat.rec.line
             for move in st.line_ids:
                 context.update({'date':move.date})
-                
                 move_id = account_move_obj.create(cr, uid, {
                     'journal_id': st.journal_id.id,
                     'period_id': st.period_id.id,
+                    'date': move.date,
                 }, context=context)
                 account_bank_statement_line_obj.write(cr, uid, [move.id], {
                     'move_ids': [(4,move_id, False)]
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
new file mode 100644
index 00000000000..4a1a1274e9f
--- /dev/null
+++ b/addons/account/account_installer.xml
@@ -0,0 +1,63 @@
+<openerp>
+  <data>
+    <record id="view_account_installer" model="ir.ui.view">
+      <field name="name">account.installer.view</field>
+      <field name="model">account.installer</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="arch" type="xml">
+        <data>
+          <form position="attributes"><attribute name="string">
+              Accounting Modules Installation
+          </attribute></form>
+
+          <group string="res_config_contents" position="replace">
+            <separator string="Configure Your Accounting System" colspan="4"/>
+            <image name="gtk-dialog-info"/>
+            <newline/>
+            <label align="0.0" string=" Lorem ipsum dolor
+                sit amet, consectetur adipiscing elit. Cras metus
+                augue, ultricies et vehicula id, fringilla quis
+                mauris. Vestibulum fringilla ipsum sit amet est
+                adipiscing eget euismod velit semper. Proin non mauris
+                velit. Donec malesuada nisi sed augue viverra commodo
+                sagittis nisi rutrum. Cras vitae libero nunc, a
+                molestie sapien. Proin et augue sit amet est egestas
+                fermentum ut eu lacus. Etiam nisi orci, volutpat
+                aliquam viverra interdum, vehicula iaculis
+                lectus. Mauris ligula sapien, auctor in pharetra non,
+                ultrices quis odio."/>
+            <group>
+              <separator string="Accounting" colspan="4"/>
+              <field name="account_analytic_default"/>
+              <field name="account_analytic_plans"/>
+              <!-- insert suppliers payment management here -->
+              <field name="account_followup"/>
+              <field name="account_asset"/>
+            </group>
+          </group>
+
+          <xpath expr='//button[@name="action_skip"]' position='replace'/>
+          <xpath expr='//button[@name="action_next"]' position='attributes'>
+            <attribute name='string'>Install Modules</attribute>
+          </xpath>
+        </data>
+      </field>
+    </record>
+
+    <record id="action_account_installer" model="ir.actions.act_window">
+      <field name="name">Accounting Modules Installation</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">account.installer</field>
+      <field name="view_id" ref="view_account_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="account_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_account_installer"/>
+      <field name="sequence">1</field>
+    </record>
+  </data>
+</openerp>
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index be02eb02c0b..8c3742d7f8d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -349,6 +349,18 @@
             <field name="context">{'type':'out_invoice'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
+
+        <record id="action_invoice_tree_panding_invoice" model="ir.actions.act_window">
+            <field name="name">Panding Invoice</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="view_id" ref="invoice_tree"/>
+            <field name="context">{'type':'out_invoice'}</field>
+            <field name="domain">[('state','=','draft')]</field>
+           <!-- <field name="search_view_id" ref="view_account_invoice_filter"/>-->
+        </record>
+
         <record id="action_invoice_tree_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
@@ -360,7 +372,7 @@
             <field name="view_id" ref="invoice_form"/>
             <field name="act_window_id" ref="action_invoice_tree"/>
         </record>
-        <menuitem action="action_invoice_tree" id="menu_finance_invoice" parent="account.menu_finance"/>
+        <menuitem action="action_invoice_tree" 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>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 97cf55e4ff4..f1dda334830 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -3,16 +3,17 @@
     <data>
 
         <menuitem icon="terp-account" id="menu_finance" name="Financial Management"/>
-        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="1"/>
+        <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_reporting" name="Reporting" parent="account.menu_finance" sequence="8"/>
-        <menuitem id="menu_finance_legal_statement" name="Legal Statements" parent="account.menu_finance" sequence="8"/>
+        <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_entries" name="Making Entries" parent="account.menu_finance" sequence="2"
+        <menuitem id="menu_finance_entries" name="Accounting" parent="account.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"/>
 
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index bb40d78a1d0..9b126658157 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -294,7 +294,7 @@ class account_move_line(osv.osv):
             return [('id', '=', '0')]
         return [('id', 'in', [x[0] for x in res])]
 
-    def _invoice_search(self, cursor, user, obj, name, args):
+    def _invoice_search(self, cursor, user, obj, name, args, context):
         if not len(args):
             return []
         invoice_obj = self.pool.get('account.invoice')
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 83b186bddd1..9485185d500 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -28,8 +28,8 @@
 
         <menuitem
             id="menu_tax_report"
-            name="Taxes Reports"
-            parent="account.menu_finance_reporting"/>
+            name="Taxes"
+            parent="account.menu_finance_generic_reporting" sequence="3"/>
 
         <wizard
             id="wizard_vat_declaration"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c3df794dc1b..82f49d83cae 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -955,7 +955,7 @@
             <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_reporting"/>
+        <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">
@@ -991,7 +991,7 @@
         </record>
         <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="7"/>
+        <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"/>
         <menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
 
@@ -1111,7 +1111,7 @@
             <field name="res_model">account.journal.period</field>
             <field name="view_type">tree</field>
         </record>
-        <menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_reporting"/>
+        <menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_generic_reporting" sequence="2"/>
 
 
         <!--
@@ -1447,8 +1447,13 @@
             <field name="name">Account Configure wizard</field>
             <field name="model">account.config.wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Account Configure">
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Account Configure
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
                     <separator col="4" colspan="4" string="Create a Fiscal Year"/>
                     <field name="name"/>
                     <field name="code"/>
@@ -1457,13 +1462,9 @@
                     <field name="period" colspan="4"/>
                     <separator col="4" colspan="4" string="Select Chart of Accounts"/>
                     <field name="charts"/>
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="2"/>
-                    <group col="2" colspan="2">
-                        <button icon="gtk-cancel" special="cancel" string="Skip" name="action_cancel" type="object"/>
-                        <button icon="gtk-ok" name="action_create" string="Continue" type="object"/>
-                    </group>
-                </form>
+                </group>
+                <xpath expr='//button[@name="action_skip"]' position="replace"/>
+              </data>
             </field>
         </record>
 
@@ -1471,11 +1472,16 @@
             <field name="name">Account Configure Wizard </field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.config.wizard</field>
+            <field name="view_id" ref="view_account_config_wizard_form"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
 
+        <!-- register configuration wizard -->
+        <record id="config_fiscalyear" model="ir.actions.todo">
+            <field name="action_id" ref="action_account_config_wizard_form"/>
+        </record>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Account Add wizard</field>
@@ -1500,16 +1506,6 @@
             src_model="account.account.template"
 	    view_type="form" view_mode="form"/>
 
-        <!-- register configuration wizard -->
-
-        <record id="config_fiscalyear" model="ir.actions.todo">
-            <field name="name">Account Configure Wizard</field>
-            <field name="note">Define Fiscal Years and Select Charts of Account</field>
-            <field name="action_id" ref="action_account_config_wizard_form"/>
-        </record>
-
-
-
         <!-- Account Templates -->
         <menuitem
             id="account_template_folder"
@@ -1586,6 +1582,8 @@
                     <field name="property_account_payable"/>
                     <field name="property_account_expense_categ" />
                     <field name="property_account_income_categ"/>
+                    <field name="property_account_expense"/>
+                    <field name="property_account_income"/>
                 </form>
             </field>
         </record>
@@ -1732,31 +1730,38 @@
             <field name="name">Generate Chart of Accounts from a Chart Template</field>
             <field name="model">wizard.multi.charts.accounts</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Generate Chart of Accounts from a Chart Template">
-                    <separator col="4" colspan="4" string="Generate Chart of Accounts from a Chart Template"/>
-                    <label align="0.0" string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" colspan="4"/>
-                    <field name="company_id"  widget="selection" groups="base.group_multi_company"/>
-                    <field name ="code_digits" />
-                    <field name="chart_template_id"/>
-                    <field name ="seq_journal" />
-                    <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
-                        <form string="Bank Information">
-                            <field name="acc_no"/>
-                            <field name="currency_id"/>
-                        </form>
-                        <tree editable="bottom" string="Bank Information">
-                            <field name="acc_no"/>
-                            <field name="currency_id"/>
-                        </tree>
-                    </field>
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="2"/>
-                    <group col="2" colspan="2">
-                        <button icon="gtk-cancel" special="cancel" type="object" name="action_cancel" string="Cancel"/>
-                        <button icon="gtk-ok" name="action_create" string="Create" type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Generate Chart of Accounts from a Chart Template
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <separator col="4" colspan="4" string="
+                    Generate Chart of Accounts from a Chart Template"/>
+                  <label align="0.0" colspan="4" string="
+                    This will automatically configure your chart of accounts,
+                    bank accounts, taxes and journals according to the selected
+                    template"/>
+                  <field name="company_id"  widget="selection"
+                         groups="base.group_multi_company"/>
+                  <field name ="code_digits" />
+                  <field name="chart_template_id"/>
+                  <field name ="seq_journal" />
+                  <field colspan="4" mode="tree" name="bank_accounts_id"
+                         nolabel="1" widget="one2many_list">
+                    <form string="Bank Information">
+                      <field name="acc_no"/>
+                      <field name="currency_id"/>
+                    </form>
+                    <tree editable="bottom" string="Bank Information">
+                      <field name="acc_no"/>
+                      <field name="currency_id"/>
+                    </tree>
+                  </field>
+                </group>
+                <xpath expr='//button[@name="action_skip"]' position='replace'/>
+              </data>
             </field>
         </record>
 
@@ -1764,6 +1769,7 @@
             <field name="name">Generate Chart of Accounts from a Chart Template</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">wizard.multi.charts.accounts</field>
+            <field name="view_id" ref="view_wizard_multi_chart"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index d8270553cef..bd03390ce3f 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -67,7 +67,7 @@
 
         <!-- Aged partner balance -->
         <wizard id="wizard_aged_trial_balance" menu="False" model="res.partner" name="account.aged.trial.balance" string="Aged Partner Balance"/>
-        <menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_reporting"/>
+        <menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
         <menuitem icon="STOCK_PRINT" action="wizard_aged_trial_balance" id="menu_aged_trial_balance" parent="next_id_22" type="wizard"/>
 
         <!-- report-related wizards -->
@@ -114,7 +114,7 @@
 
         <wizard id="wizard_general_journal" menu="False" model="account.journal.period" name="account.general.journal.report" string="Print General Journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" />
-        
+
         <wizard id="wizard_invoice_currency_change" model="account.invoice" name="account.invoice.currency_change" string="Change Currency" groups="base.group_user"/>
     </data>
 </openerp>
diff --git a/addons/account/company.py b/addons/account/company.py
index 7858339727e..e3a1979daf2 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -42,10 +42,10 @@ class company_setup(osv.osv_memory):
         * Insert a suitable message for Overdue Payment Report.
     """
     _name='wizard.company.setup'
+    _inherit = 'res.config'
 
     _columns = {
         'company_id':fields.many2one('res.company','Company',required=True),
-        'partner_id':fields.many2one('res.partner','Partner'),
         'overdue_msg': fields.text('Overdue Payment Message'),
     }
     def get_message(self,cr,uid,context={}):
@@ -57,42 +57,28 @@ class company_setup(osv.osv_memory):
 
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr,uid,[uid],c)[0].company_id.id,
-        'partner_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr,uid,[uid],c)[0].company_id.partner_id.id,
         'overdue_msg': get_message,
     }
 
     def onchange_company_id(self, cr, uid, ids, company, context=None):
-        res = {}
         if not company:
             return {}
         comp_obj = self.pool.get('res.company').browse(cr,uid,company)
-        res['partner_id'] = comp_obj.partner_id.id
-        phone = comp_obj.partner_id.address and (comp_obj.partner_id.address[0].phone and ' at ' + str(comp_obj.partner_id.address[0].phone) + '.' or '.') or '.'
-        res['overdue_msg'] = comp_obj.overdue_msg + str(phone)
-        
-        return {'value': res }
+        partner_address = comp_obj.partner_id.address
+        if partner_address and partner_address[0].phone:
+            msg_tail = ' at %s.'%(partner_address[0].phone)
+        else:
+            msg_tail = '.'
 
-    def action_create(self, cr, uid, ids, context=None):
-        content_wiz = self.pool.get('wizard.company.setup').read(cr,uid,ids,['company_id','overdue_msg'])
+        return {'value': {'overdue_msg': comp_obj.overdue_msg + msg_tail } }
+
+    def execute(self, cr, uid, ids, context=None):
+        content_wiz = self.pool.get('wizard.company.setup')\
+            .read(cr,uid,ids,['company_id','overdue_msg'])
         if content_wiz:
             wiz_data = content_wiz[0]
-            self.pool.get('res.company').write(cr, uid, [wiz_data['company_id']], {'overdue_msg':wiz_data['overdue_msg']})
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
-
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
-
+            self.pool.get('res.company').write(
+                cr, uid,
+                [wiz_data['company_id']],
+                {'overdue_msg':wiz_data['overdue_msg']})
 company_setup()
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 1d4571e0d4f..31f8e03a6b3 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -22,17 +22,21 @@
             <field name="name">wizard.company.setup.form</field>
             <field name="model">wizard.company.setup</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Overdue Payment Report Message">
-                    <field name="company_id" select="1" on_change="onchange_company_id(company_id)"  groups="base.group_multi_company"/>
-                    <field name="partner_id" select="1" readonly="1"/>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Overdue Payment Report Message
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                    <field name="company_id" select="1" 
+                           on_change="onchange_company_id(company_id)"
+                           groups="base.group_multi_company"/>
                     <separator string="Message" colspan="4"/>
                     <field name="overdue_msg" nolabel="1" colspan="4"/>
-                    <group col="2" colspan="4">
-                        <button icon="gtk-cancel" special="cancel" type="object" name="action_cancel" string="Cancel"/>
-                        <button icon="gtk-ok" name="action_create" string="Create" type="object"/>
-                    </group>
-                </form>
+                </group>
+                <xpath expr='//button[@name="action_skip"]' position='replace'/>
+              </data>
             </field>
         </record>
 
@@ -40,6 +44,7 @@
             <field name="name">Overdue Payment Report Message</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">wizard.company.setup</field>
+            <field name="view_id" ref="wizard_company_setup_form"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -48,8 +53,6 @@
         <!-- register configuration wizard -->
 
         <record id="config_wizard_account_base_setup_form" model="ir.actions.todo">
-            <field name="name">Overdue Payment Report Message</field>
-            <field name="note">Specify The Message for the Overdue Payment Report.</field>
             <field name="action_id" ref="action_wizard_company_setup_form"/>
         </record>
     </data>
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index f3cf25564b4..8d11ca24fbb 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.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 06:32+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-15 14:07+0000\n"
+"Last-Translator: DenisD <denis_delismajlovic@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -50,7 +50,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr ""
+msgstr "Sredstvo"
 
 #. module: account
 #: constraint:ir.actions.act_window:0
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index ac9f4c05963..3fa1deb3e67 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.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-18 16:45+0000\n"
-"Last-Translator: Kuvaly <kuvaly@seznam.cz>\n"
+"PO-Revision-Date: 2010-01-13 11:48+0000\n"
+"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-01-14 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -50,7 +50,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr ""
+msgstr "Aktiva"
 
 #. module: account
 #: constraint:ir.actions.act_window:0
@@ -5850,7 +5850,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,code:0
 msgid "Account Code"
-msgstr ""
+msgstr "Kód účtu"
 
 #. module: account
 #: help:account.config.wizard,name:0
@@ -5901,7 +5901,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.column,name:0
 msgid "Column Name"
-msgstr ""
+msgstr "Název sloupce"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -5909,12 +5909,12 @@ msgstr ""
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtry"
 
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,yes:0
 msgid "Yes"
-msgstr ""
+msgstr "Ano"
 
 #. module: account
 #: help:account.account,reconcile:0
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 85e5cb06fc6..b3fc6fc6a58 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-08 14:44+0000\n"
+"PO-Revision-Date: 2010-01-14 09:09+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <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: 2009-12-16 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-01-15 04:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -25,7 +25,7 @@ msgstr "Écritures non réconciliées"
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
 #: model:ir.ui.menu,name:account.menu_unreconcile_select
 msgid "Unreconcile entries"
-msgstr "Annuler lettrage d'un compte"
+msgstr "Dé-lettrer les écritures"
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
@@ -126,12 +126,6 @@ msgstr "Écriture standard"
 msgid "No. of Digits to use for account code"
 msgstr "Nombre de chiffres dans les numéros des comptes"
 
-#. module: account
-#: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
-#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
-msgid "Close a Fiscal Year"
-msgstr "Clôturer un exercice fiscal"
-
 #. module: account
 #: field:account.invoice,move_id:0
 msgid "Invoice Movement"
@@ -1687,6 +1681,12 @@ msgstr "Compte de pertes et profits"
 msgid "Model"
 msgstr "Modèle"
 
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
+msgid "Close a Fiscal Year"
+msgstr "Clôturer un exercice fiscal"
+
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 34328240c56..629d46d10c3 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.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 09:59+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-22 23:52+0000\n"
+"Last-Translator: Balint (eSolve) <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: 2009-12-16 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-01-24 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -30,7 +30,7 @@ msgstr ""
 #: 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 "Kifizetetlen szállítói számlák"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
@@ -50,7 +50,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr ""
+msgstr "Eszköz"
 
 #. module: account
 #: constraint:ir.actions.act_window:0
@@ -72,7 +72,7 @@ msgstr ""
 msgid ""
 "This account will be used to value incoming stock for the current product "
 "category"
-msgstr ""
+msgstr "Termék értékesítésekor az árbevétel könyvelésére használt számla"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -82,40 +82,40 @@ msgstr ""
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
 msgid "Reconciliation result"
-msgstr ""
+msgstr "Egyeztetés eredménye"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr ""
+msgstr "Nem egyeztetett tételek"
 
 #. 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 "Adóalap kód"
 
 #. module: account
 #: view:account.account:0
 msgid "Account Statistics"
-msgstr ""
+msgstr "Számla statisztika"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
 #: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
 msgid "Print Taxes Report"
-msgstr ""
+msgstr "Adó kimutatás nyomtatás"
 
 #. module: account
 #: field:account.account,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Szülő"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr ""
+msgstr "Bizonylat napló"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -128,18 +128,18 @@ msgstr ""
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr ""
+msgstr "Adóalap előjel"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
 #: model:ir.ui.menu,name:account.menu_unreconcile_select
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "Egyeztetés visszavonás"
 
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr ""
+msgstr "Hiba! Az időszak tartomány érvénytelen. "
 
 #. module: account
 #: view:account.bank.statement.reconcile:0
@@ -149,7 +149,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_move_line_form
 #: model:ir.ui.menu,name:account.menu_action_move_line_form
 msgid "Entries"
-msgstr ""
+msgstr "Tételek"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -159,7 +159,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
 msgid "Confirm draft invoices"
-msgstr ""
+msgstr "Számla tervezetek igazolása"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -172,12 +172,12 @@ msgstr ""
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr ""
+msgstr "Követel összesen"
 
 #. module: account
 #: field:account.config.wizard,charts:0
 msgid "Charts of Account"
-msgstr ""
+msgstr "Számlatükör"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
@@ -200,24 +200,24 @@ msgstr ""
 #. module: account
 #: field:account.tax.code,sum_period:0
 msgid "Period Sum"
-msgstr ""
+msgstr "Időszak összesen"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
-msgstr ""
+msgstr "Számítási kód (ha a típus = Python kód)"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "Könyvelési tranzakció sor"
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
 msgid "Aged Trial Balance"
-msgstr ""
+msgstr "Többidőszakos egyenleg"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -235,7 +235,7 @@ msgstr ""
 #: field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
-msgstr ""
+msgstr "Összeg"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
@@ -247,17 +247,17 @@ msgstr ""
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr ""
+msgstr "Szállítói adók"
 
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr ""
+msgstr "Tartozik összesen"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Accounting Entries-"
-msgstr ""
+msgstr "Könyvelési tranzakciók-"
 
 #. module: account
 #: help:account.journal,view_id:0
@@ -299,7 +299,7 @@ msgstr ""
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 #: wizard_view:account.vat.declaration,init:0
 msgid "Select period"
-msgstr ""
+msgstr "Válasszon időszakot"
 
 #. module: account
 #: field:account.invoice,origin:0
@@ -315,7 +315,7 @@ msgstr ""
 #. module: account
 #: xsl:account.transfer:0
 msgid "Reference"
-msgstr ""
+msgstr "Hivatkozás"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
@@ -325,24 +325,24 @@ msgstr ""
 #. module: account
 #: rml:account.central.journal:0
 msgid "Account Num."
-msgstr ""
+msgstr "Számlaszám"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Debit"
-msgstr ""
+msgstr "Tartozik forgalom"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Adó"
 
 #. module: account
 #: rml:account.general.journal:0
 msgid "Debit Trans."
-msgstr ""
+msgstr "Tartozik tranz."
 
 #. module: account
 #: field:account.analytic.line,account_id:0
@@ -350,7 +350,7 @@ msgstr ""
 #: field:account.move.line,analytic_account_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitikus számla"
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -363,12 +363,12 @@ msgstr ""
 #: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr ""
+msgstr "Napló neve"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on invoices"
-msgstr ""
+msgstr "Megjelenés a számlákon"
 
 #. module: account
 #: constraint:account.analytic.account:0
@@ -384,7 +384,7 @@ msgstr ""
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr ""
+msgstr "Számla forrás"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -395,7 +395,7 @@ msgstr ""
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentorderreconcilation0
 msgid "Payment Reconcilation"
-msgstr ""
+msgstr "Kifizetés egyeztetés"
 
 #. module: account
 #: model:account.journal,name:account.expenses_journal
@@ -410,12 +410,12 @@ msgstr ""
 #. module: account
 #: rml:account.overdue:0
 msgid "Date:"
-msgstr ""
+msgstr "Dátum:"
 
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Negative"
-msgstr ""
+msgstr "Negatív"
 
 #. module: account
 #: rml:account.partner.balance:0
@@ -459,7 +459,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
 msgid "Bank reconciliation"
-msgstr ""
+msgstr "Bank egyeztetés"
 
 #. module: account
 #: rml:account.invoice:0
@@ -490,7 +490,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodical Processing"
-msgstr ""
+msgstr "Időszaki feldolgozás"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
@@ -506,7 +506,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Supplier invoice"
-msgstr ""
+msgstr "Szállítói számla"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -528,7 +528,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr ""
+msgstr "Kifizetett/Egyeztetett"
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -549,7 +549,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.line:0
 msgid "Line"
-msgstr ""
+msgstr "Sor"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -572,12 +572,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr ""
+msgstr "account.tax"
 
 #. module: account
 #: rml:account.central.journal:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Nyomtatás dátuma"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -588,7 +588,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_aged_trial_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr ""
+msgstr "Korosbított partner egyenleg"
 
 #. module: account
 #: view:account.journal:0
@@ -616,13 +616,13 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Kapcsolat"
 
 #. module: account
 #: selection:account.model.line,date:0
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr ""
+msgstr "Partner fizetési feltétel"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -637,7 +637,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Kedvezmény (%)"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,writeoff:0
@@ -658,7 +658,7 @@ msgstr ""
 #. module: account
 #: rml:account.overdue:0
 msgid "Sub-Total :"
-msgstr ""
+msgstr "Részösszeg :"
 
 #. module: account
 #: field:account.analytic.account,line_ids:0
@@ -671,7 +671,7 @@ msgstr ""
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr ""
+msgstr "hónap"
 
 #. module: account
 #: field:account.analytic.account,partner_id:0
@@ -686,7 +686,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Vevői jóváírás"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -699,7 +699,7 @@ msgstr ""
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr ""
+msgstr "Adókód előjel"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -741,7 +741,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Beszerzés tulajdonságok"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -751,7 +751,7 @@ msgstr ""
 #. module: account
 #: wizard_button:account.invoice.pay,init,reconcile:0
 msgid "Partial Payment"
-msgstr ""
+msgstr "Részkifizetés"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
@@ -766,13 +766,13 @@ msgstr ""
 #: field:account.period,state:0
 #: field:account.subscription,state:0
 msgid "Status"
-msgstr ""
+msgstr "Státusz"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr ""
+msgstr "Záró időszak"
 
 #. module: account
 #: field:account.account.type,partner_account:0
@@ -826,12 +826,12 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "6"
-msgstr ""
+msgstr "6"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_30
 msgid "Bank Reconciliation"
-msgstr ""
+msgstr "Bank egyeztetés"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -850,7 +850,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_print_journal
 #: model:ir.ui.menu,name:account.menu_print_journal
 msgid "Print Journal"
-msgstr ""
+msgstr "Napló nyomtatás"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -861,7 +861,7 @@ msgstr ""
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "Létrehozás dátuma"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,cancel_invoice:0
@@ -871,13 +871,13 @@ msgstr "Számla sztornó"
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr ""
+msgstr "Kötelezõ"
 
 #. module: account
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "Költség számla"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
@@ -898,7 +898,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy2_id:0
 msgid "New Fiscal Year"
-msgstr ""
+msgstr "Új pénzügyi év"
 
 #. module: account
 #: help:account.tax,tax_group:0
@@ -928,7 +928,7 @@ msgstr ""
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Mennyiség"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_to:0
@@ -951,7 +951,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr ""
+msgstr "Alapértelmezett tartozik számla"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
@@ -981,12 +981,12 @@ msgstr ""
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
-msgstr ""
+msgstr "Időszak"
 
 #. module: account
 #: rml:account.partner.balance:0
 msgid "Grand total"
-msgstr ""
+msgstr "Mindösszesen"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -996,7 +996,7 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Nettó összesen:"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1016,12 +1016,12 @@ msgstr ""
 #: field:account.analytic.line,product_uom_id:0
 #: field:account.move.line,product_uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "ME"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,page_split:0
 msgid "One Partner Per Page"
-msgstr ""
+msgstr "Egy partner / Oldal"
 
 #. module: account
 #: field:account.account,child_parent_ids:0
@@ -1038,19 +1038,19 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new
 msgid "New Supplier Invoice"
-msgstr ""
+msgstr "Új szállítói számla"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,amount:0
 msgid "Amount paid"
-msgstr ""
+msgstr "Kifizetés összege"
 
 #. module: account
 #: selection:account.invoice,type:0
 #: model:process.transition,name:account.process_transition_customerinvoice0
 #: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Vevői számla"
 
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
@@ -1066,12 +1066,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Print Analytic Journals"
-msgstr ""
+msgstr "Analitikus napló nyomtatás"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Voucher Nb"
-msgstr ""
+msgstr "Bizonylatszám"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -1095,7 +1095,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr ""
+msgstr "Adókód"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
@@ -1125,7 +1125,7 @@ msgstr ""
 #: rml:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Egységár"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -1156,12 +1156,12 @@ msgstr ""
 #. module: account
 #: field:account.payment.term,line_ids:0
 msgid "Terms"
-msgstr ""
+msgstr "Fizetési feltétel"
 
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Report"
-msgstr ""
+msgstr "Adó kimutatás"
 
 #. module: account
 #: wizard_button:account.analytic.account.chart,init,open:0
@@ -1177,12 +1177,12 @@ msgstr ""
 #. module: account
 #: selection:account.move,type:0
 msgid "Bank Receipt"
-msgstr ""
+msgstr "Befolyás"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr ""
+msgstr "Bankszámlaszám"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
@@ -1192,7 +1192,7 @@ msgstr ""
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Invoice import"
-msgstr ""
+msgstr "Számla import"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
@@ -1242,7 +1242,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,balance_end_real:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Záró egyenleg"
 
 #. module: account
 #: view:product.product:0
@@ -1257,7 +1257,7 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Fix összeg"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -1273,7 +1273,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr ""
+msgstr "Nem egyeztetett tranzakciók"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1308,7 +1308,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr ""
+msgstr "Pénzügyi év zárás"
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -1340,7 +1340,7 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
-msgstr ""
+msgstr "Mind"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
@@ -1370,7 +1370,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr ""
+msgstr "Elektronikus file"
 
 #. module: account
 #: view:res.partner:0
@@ -1385,7 +1385,7 @@ msgstr "Adóbontás"
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr ""
+msgstr "Szekvenciák"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
@@ -1413,13 +1413,13 @@ msgstr ""
 #: wizard_field:populate_statement_from_inv,init,journal_id:0
 #: field:report.hr.timesheet.invoice.journal,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Napló"
 
 #. module: account
 #: field:account.account,child_id:0
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "Gyerek számlák"
 
 #. module: account
 #: field:account.account,check_history:0
@@ -1466,7 +1466,7 @@ msgstr ""
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr ""
+msgstr "Kötelezettség összesen"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close.state,init,close:0
@@ -1496,12 +1496,12 @@ msgstr ""
 #. module: account
 #: selection:account.bank.statement.line,type:0
 msgid "Supplier"
-msgstr ""
+msgstr "Szállító"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -1511,14 +1511,14 @@ msgstr ""
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Positive"
-msgstr ""
+msgstr "Pozitív"
 
 #. module: account
 #: wizard_view:account.general.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_general_journal
 #: model:ir.ui.menu,name:account.menu_general_journal
 msgid "Print General Journal"
-msgstr ""
+msgstr "General napló nyomtatás"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -1529,7 +1529,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,move_id:0
 msgid "Invoice Movement"
-msgstr "Számla mozgás"
+msgstr "Számla kontírozás"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
@@ -1547,7 +1547,7 @@ msgstr ""
 #: field:account.tax.code,parent_id:0
 #: field:account.tax.code.template,parent_id:0
 msgid "Parent Code"
-msgstr ""
+msgstr "Szülő kód"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile.select,init,open:0
@@ -1563,7 +1563,7 @@ msgstr ""
 #: selection:account.tax,tax_group:0
 #: selection:account.tax.template,tax_group:0
 msgid "VAT"
-msgstr ""
+msgstr "ÁFA"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -1586,7 +1586,7 @@ msgstr ""
 #: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Partner hiv."
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
@@ -1606,12 +1606,12 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
-msgstr ""
+msgstr "Beszerzés"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total quantity"
-msgstr ""
+msgstr "Mennyiség összesen"
 
 #. module: account
 #: field:account.invoice,date_due:0
@@ -1622,7 +1622,7 @@ msgstr "Fizetési határidő"
 #: wizard_view:account.period.close,init:0
 #: wizard_button:account.period.close,init,close:0
 msgid "Close Period"
-msgstr ""
+msgstr "Időszak zárás"
 
 #. module: account
 #: rml:account.overdue:0
@@ -1642,7 +1642,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,balance_start:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Nyitó egyenleg"
 
 #. module: account
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0
@@ -1650,34 +1650,34 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
 msgid "Journals"
-msgstr ""
+msgstr "Naplók"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Max Qty:"
-msgstr ""
+msgstr "Max menny:"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,refund:0
 msgid "Refund Invoice"
-msgstr ""
+msgstr "Jóváíró számla"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_tree
 #: model:ir.actions.wizard,name:account.wizard_period_close
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr ""
+msgstr "Lezár egy időszakot"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
 msgid "Costs & Revenues"
-msgstr ""
+msgstr "Költségek és Árbevételek"
 
 #. module: account
 #: constraint:account.account:0
 msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "Hiba! Nem lehet létrehozni rekurzív számlákat."
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -1702,7 +1702,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr ""
+msgstr "Visszanyitás"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
@@ -1717,7 +1717,7 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Credit"
-msgstr ""
+msgstr "Követel forgalom"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
@@ -1739,13 +1739,13 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree2
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2
 msgid "New Statement"
-msgstr ""
+msgstr "Új kivonat"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,from_date:0
 #: wizard_field:account.analytic.line,init,from_date:0
 msgid "From"
-msgstr ""
+msgstr "Kezdő"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
@@ -1758,24 +1758,24 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_central_journal
 #: model:ir.ui.menu,name:account.menu_central_journal
 msgid "Print Central Journal"
-msgstr ""
+msgstr "Central napló nyomtatás"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,period_length:0
 msgid "Period length (days)"
-msgstr ""
+msgstr "Időszak hossza (napok)"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
-msgstr ""
+msgstr "Százalék"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr ""
+msgstr "Grafikonok"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1783,7 +1783,7 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
-msgstr ""
+msgstr "Értékesítés"
 
 #. module: account
 #: wizard_button:account.account.balance.report,account_selection,checktype:0
@@ -1801,7 +1801,7 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 msgid "Date or Code"
-msgstr ""
+msgstr "Dátum vagy Kód"
 
 #. module: account
 #: field:account.analytic.account,user_id:0
@@ -1817,12 +1817,12 @@ msgstr ""
 #: wizard_field:account.move.line.reconcile,init_full,debit:0
 #: wizard_field:account.move.line.reconcile,init_partial,debit:0
 msgid "Debit amount"
-msgstr ""
+msgstr "Tartozik összeg"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "year"
-msgstr ""
+msgstr "év"
 
 #. module: account
 #: wizard_button:account.account.balance.report,checktype,report:0
@@ -1839,12 +1839,12 @@ msgstr ""
 #: wizard_button:account.print.journal.report,init,print:0
 #: wizard_button:account.third_party_ledger.report,init,checkreport:0
 msgid "Print"
-msgstr ""
+msgstr "Nyomtatás"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
 msgid "Start date"
-msgstr ""
+msgstr "Kezdő dátum"
 
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
@@ -1860,7 +1860,7 @@ msgstr ""
 #: field:account.move.reconcile,type:0
 #: xsl:account.transfer:0
 msgid "Type"
-msgstr ""
+msgstr "Típus"
 
 #. module: account
 #: view:account.journal:0
@@ -1887,7 +1887,7 @@ msgstr ""
 #: wizard_view:account.invoice.pay,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_pay
 msgid "Pay invoice"
-msgstr ""
+msgstr "Számla kifizetés"
 
 #. module: account
 #: constraint:account.invoice:0
@@ -1898,7 +1898,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
 #: model:ir.ui.menu,name:account.menu_invoice_draft
 msgid "Draft Customer Invoices"
-msgstr ""
+msgstr "Vevői számla tervezetek"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -1911,22 +1911,22 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "No Filter"
-msgstr ""
+msgstr "Nincs szűrés"
 
 #. module: account
 #: field:account.payment.term.line,days:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Napok száma"
 
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr ""
+msgstr "A számla partner hivatkozása."
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,sortbydate:0
 msgid "Sort by:"
-msgstr ""
+msgstr "Rendezés:"
 
 #. module: account
 #: field:account.move,to_check:0
@@ -1941,7 +1941,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "7"
-msgstr ""
+msgstr "7"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -1961,13 +1961,13 @@ msgstr ""
 #. module: account
 #: help:account.tax,name:0
 msgid "This name will be displayed on reports"
-msgstr ""
+msgstr "Ez a név fog megjelenni a kimutatáson."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
-msgstr ""
+msgstr "Nyomtatás dátuma"
 
 #. module: account
 #: constraint:ir.ui.view:0
@@ -1982,18 +1982,18 @@ msgstr ""
 #. module: account
 #: wizard_view:account.analytic.account.journal.report,init:0
 msgid "Analytic Journal Report"
-msgstr ""
+msgstr "Analitikus napló kimutatás"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr ""
+msgstr "Vevői jóváírások"
 
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "Adó összege"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
@@ -2003,7 +2003,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr ""
+msgstr "Napló időszak neve"
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -2029,7 +2029,7 @@ msgstr ""
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
 #: field:wizard.company.setup,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: account
 #: help:account.invoice,number:0
@@ -2046,22 +2046,22 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.account_type_expense
 msgid "Expense"
-msgstr ""
+msgstr "Költség"
 
 #. module: account
 #: field:account.journal,invoice_sequence_id:0
 msgid "Invoice Sequence"
-msgstr ""
+msgstr "Számla iktatószám"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
 msgid "Options"
-msgstr ""
+msgstr "Beállítások"
 
 #. module: account
 #: model:process.process,name:account.process_process_invoiceprocess0
 msgid "Customer Invoice Process"
-msgstr ""
+msgstr "Vevői számla folyamat"
 
 #. module: account
 #: rml:account.invoice:0
@@ -2102,17 +2102,17 @@ msgstr ""
 #: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Pénznem"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid invoices"
-msgstr ""
+msgstr "Kifizetetlen számlák"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment Reconcile"
-msgstr ""
+msgstr "Kifizetés egyeztetés"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
@@ -2177,7 +2177,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree8
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree8
 msgid "Draft Supplier Invoices"
-msgstr ""
+msgstr "Szállítói számla tervezetek"
 
 #. module: account
 #: wizard_field:account.invoice.refund,init,period:0
@@ -2187,13 +2187,13 @@ msgstr ""
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr ""
+msgstr "Tételes"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Consolidation"
-msgstr ""
+msgstr "Konszolidáció"
 
 #. module: account
 #: field:account.chart.template,account_root_id:0
@@ -2211,7 +2211,7 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "ÁFA:"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,account_selection,Account_list:0
@@ -2220,7 +2220,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr ""
+msgstr "Számlatükör"
 
 #. module: account
 #: model:account.journal,name:account.check_journal
@@ -2241,7 +2241,7 @@ msgstr ""
 #. module: account
 #: view:account.config.wizard:0
 msgid "Create a Fiscal Year"
-msgstr ""
+msgstr "Pénzügyi év létrehozás"
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -2265,12 +2265,12 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
 msgid "Liability"
-msgstr ""
+msgstr "Kötelezettség"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #. module: account
 #: wizard_view:account.chart,init:0
@@ -2300,7 +2300,7 @@ msgstr ""
 #: rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
-msgstr ""
+msgstr "Dátum"
 
 #. module: account
 #: field:account.invoice,reference_type:0
@@ -2317,7 +2317,7 @@ msgstr ""
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
 msgid "Tax Type"
-msgstr ""
+msgstr "Adó típus"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_statemententries0
@@ -2328,7 +2328,7 @@ msgstr ""
 #: field:account.analytic.line,user_id:0
 #: field:account.journal,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Felhasználó"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_template_form
@@ -2349,18 +2349,18 @@ msgstr ""
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Voucher No"
-msgstr ""
+msgstr "Bizonylatszám"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic reconciliation"
-msgstr ""
+msgstr "Automatikus egyeztetés"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Import Invoice"
-msgstr ""
+msgstr "Számlaimport"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -2392,7 +2392,7 @@ msgstr ""
 #. module: account
 #: rml:account.central.journal:0
 msgid "Journal Code"
-msgstr ""
+msgstr "Naplókód"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -2409,7 +2409,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Záró dátum"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2429,7 +2429,7 @@ msgstr ""
 #. module: account
 #: wizard_button:account.move.journal,init,open:0
 msgid "Open Journal"
-msgstr ""
+msgstr "Napló megnyitás"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2453,14 +2453,14 @@ msgstr ""
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Period from"
-msgstr ""
+msgstr "Kezdő időszak"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr ""
+msgstr "Bankkivonat"
 
 #. module: account
 #: wizard_view:account.invoice.pay,addendum:0
@@ -2482,7 +2482,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
 msgid "Landscape Mode"
-msgstr ""
+msgstr "Fekvő mód"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -2537,7 +2537,7 @@ msgstr ""
 #: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Cancel"
-msgstr ""
+msgstr "Mégsem"
 
 #. module: account
 #: field:account.account.type,name:0
@@ -2566,12 +2566,12 @@ msgstr ""
 #: wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
-msgstr ""
+msgstr "Információ"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_tax_report
 msgid "Taxes Reports"
-msgstr ""
+msgstr "Adó kimutatás"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
@@ -2591,7 +2591,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,default_credit_account_id:0
 msgid "Default Credit Account"
-msgstr ""
+msgstr "Alapértelmezett követel számla"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -2615,7 +2615,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_invoiceinvoice0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Számla készítése"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_equity
@@ -2630,7 +2630,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr ""
+msgstr "Adókód sablon"
 
 #. module: account
 #: rml:account.partner.balance:0
@@ -2655,7 +2655,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_generic_report
 msgid "Generic Reports"
-msgstr ""
+msgstr "Általános kimutatások"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,power:0
@@ -2670,14 +2670,14 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "Price"
-msgstr ""
+msgstr "Ár"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2711,7 +2711,7 @@ msgstr "Számla azonosító"
 #. module: account
 #: field:account.period,date_stop:0
 msgid "End of Period"
-msgstr ""
+msgstr "Időszak vége"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,go,finish:0
@@ -2796,7 +2796,7 @@ msgstr ""
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
-msgstr ""
+msgstr "Napló nézet"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2806,12 +2806,12 @@ msgstr ""
 #. module: account
 #: rml:account.overdue:0
 msgid "Customer Ref:"
-msgstr ""
+msgstr "Vevő hiv.:"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
-msgstr ""
+msgstr "Partner ID"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
@@ -2823,13 +2823,13 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 msgid "Total credit"
-msgstr ""
+msgstr "Követel összesen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1_new
 msgid "New Customer Invoice"
-msgstr ""
+msgstr "Új vevői számla"
 
 #. module: account
 #: field:account.account,reconcile:0
@@ -2841,7 +2841,7 @@ msgstr ""
 #: wizard_button:account.move.line.reconcile,addendum,reconcile:0
 #: wizard_button:account.move.line.reconcile,init_full,reconcile:0
 msgid "Reconcile"
-msgstr ""
+msgstr "Egyeztetés"
 
 #. module: account
 #: rml:account.overdue:0
@@ -2882,7 +2882,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,complete_name:0
 msgid "Full Account Name"
-msgstr ""
+msgstr "Számla megnevezés"
 
 #. module: account
 #: rml:account.account.balance:0
@@ -2896,7 +2896,7 @@ msgstr ""
 #: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
-msgstr ""
+msgstr "1cm 27.7cm 20cm 27.7cm"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree12
@@ -2954,7 +2954,7 @@ msgstr ""
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
 msgid "Reconciliation"
-msgstr ""
+msgstr "Egyeztetés"
 
 #. module: account
 #: field:account.move.line,centralisation:0
@@ -2968,7 +2968,7 @@ msgstr ""
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr ""
+msgstr "Adókód"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2994,7 +2994,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.column,readonly:0
 msgid "Readonly"
-msgstr ""
+msgstr "Csak olvasható"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -3014,7 +3014,7 @@ msgstr ""
 #: rml:account.invoice:0
 #: xsl:account.transfer:0
 msgid "Document"
-msgstr ""
+msgstr "Dokumentum"
 
 #. module: account
 #: help:account.move.line,move_id:0
@@ -3024,12 +3024,12 @@ msgstr ""
 #. module: account
 #: field:account.invoice.line,uos_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Mértékegység"
 
 #. module: account
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr ""
+msgstr "Kinnlevőség számla"
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
@@ -3037,6 +3037,8 @@ msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
 msgstr ""
+"Ha bejelölt, akkor a rendszer megpróbálja összevonni a kontírozási sorokat a "
+"számla könyvelések generálásakor."
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
@@ -3047,7 +3049,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_cancel
 msgid "Cancel selected invoices"
-msgstr ""
+msgstr "Kijelölt számlák érvénytelenítése"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -3056,7 +3058,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Analitikus napló"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -3071,7 +3073,7 @@ msgstr ""
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "("
-msgstr ""
+msgstr "("
 
 #. module: account
 #: view:account.invoice:0
@@ -3167,7 +3169,7 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "By Date and Period"
-msgstr ""
+msgstr "Dátum és időszak"
 
 #. module: account
 #: view:account.account:0
@@ -3195,7 +3197,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_tax_form
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr ""
+msgstr "Adók"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
@@ -3205,7 +3207,7 @@ msgstr ""
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "Average Rate"
-msgstr ""
+msgstr "Ártlagárfolyam"
 
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
@@ -3230,12 +3232,12 @@ msgstr ""
 #: rml:account.partner.balance:0
 #: field:account.period,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kód"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance
 msgid "Financial Management"
-msgstr ""
+msgstr "Pénzügy"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3318,12 +3320,12 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "Tartozik összesen"
 
 #. module: account
 #: selection:account.analytic.account,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Függőben"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -3333,7 +3335,7 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: account
 #: rml:account.partner.balance:0
@@ -3341,7 +3343,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_partner_balance_report
 #: model:ir.ui.menu,name:account.menu_partner_balance
 msgid "Partner Balance"
-msgstr ""
+msgstr "Partner egyenleg"
 
 #. module: account
 #: rml:account.third_party_ledger:0
@@ -3366,12 +3368,12 @@ msgstr ""
 #: field:account.tax.template,python_compute:0
 #: selection:account.tax.template,type:0
 msgid "Python Code"
-msgstr ""
+msgstr "Python kód"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr ""
+msgstr "Bankkivonatok"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
@@ -3393,14 +3395,14 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import invoice"
-msgstr ""
+msgstr "Számlaimport"
 
 #. module: account
 #: view:account.invoice:0
 #: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
-msgstr ""
+msgstr "Létrehoz"
 
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
@@ -3410,7 +3412,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_line
 msgid "Invoice line"
-msgstr ""
+msgstr "Számla sor"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -3451,12 +3453,12 @@ msgstr "Szülő adó egyenleg"
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
-msgstr ""
+msgstr "Számlatípus"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank account owner"
-msgstr ""
+msgstr "Bankszámla tulajdonos"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -3474,7 +3476,7 @@ msgstr ""
 #. module: account
 #: wizard_button:account.invoice.pay,addendum,reconcile:0
 msgid "Pay and reconcile"
-msgstr ""
+msgstr "Fizetés és egyeztetés"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -3500,12 +3502,12 @@ msgstr ""
 #: wizard_field:account.partner.balance.report,init,fiscalyear:0
 #: wizard_field:account.third_party_ledger.report,init,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "Pénzügyi év"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Balance :"
-msgstr ""
+msgstr "Egyenleg :"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -3516,23 +3518,23 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "3"
-msgstr ""
+msgstr "3"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
 msgid "Taxes Report"
-msgstr ""
+msgstr "Adó kimutatás"
 
 #. module: account
 #: selection:account.journal.period,state:0
 msgid "Printed"
-msgstr ""
+msgstr "Nyomtatva"
 
 #. module: account
 #: 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 ""
+msgstr "Új szállítói jóváírás"
 
 #. module: account
 #: view:account.model:0
@@ -3547,7 +3549,7 @@ msgstr ""
 #. module: account
 #: view:account.account:0
 msgid "Chart of accounts"
-msgstr ""
+msgstr "Számlatükör"
 
 #. module: account
 #: field:account.subscription.line,subscription_id:0
@@ -3557,7 +3559,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal code"
-msgstr ""
+msgstr "Naplókód"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close,init,close:0
@@ -3627,7 +3629,7 @@ msgstr ""
 #: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sorszám"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@@ -3658,7 +3660,7 @@ msgstr ""
 #. module: account
 #: selection:account.config.wizard,period:0
 msgid "3 Months"
-msgstr ""
+msgstr "3 hónap"
 
 #. module: account
 #: wizard_view:account.move.journal,init:0
@@ -3681,7 +3683,7 @@ msgstr ""
 #: selection:account.config.wizard,period:0
 #: field:report.hr.timesheet.invoice.journal,name:0
 msgid "Month"
-msgstr ""
+msgstr "Hónap"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
@@ -3703,7 +3705,7 @@ msgstr ""
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
 msgid "By date"
-msgstr ""
+msgstr "Dátum"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_config_wizard_form
@@ -3715,7 +3717,7 @@ msgstr ""
 #: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Kezdő dátum"
 
 #. module: account
 #: wizard_view:account.general.ledger.report,account_selection:0
@@ -3732,7 +3734,7 @@ msgstr ""
 #: model:process.node,name:account.process_node_draftinvoices0
 #: model:process.node,name:account.process_node_supplierdraftinvoices0
 msgid "Draft Invoices"
-msgstr ""
+msgstr "Számla tervezetek"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
@@ -3742,7 +3744,7 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Számla kelte"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3815,12 +3817,12 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_general_ledger_report
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
-msgstr ""
+msgstr "Főkönyv"
 
 #. module: account
 #: field:account.journal.view,columns_id:0
 msgid "Columns"
-msgstr ""
+msgstr "Oszlopok"
 
 #. module: account
 #: selection:account.general.ledger.report,checktype,sortbydate:0
@@ -3848,7 +3850,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_journal_form
 #: model:ir.ui.menu,name:account.menu_action_account_journal_form
 msgid "Financial Journals"
-msgstr ""
+msgstr "Pénzügyi naplók"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3856,7 +3858,7 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "By Period"
-msgstr ""
+msgstr "Időszak"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -3866,17 +3868,17 @@ msgstr ""
 #. module: account
 #: rml:account.overdue:0
 msgid "."
-msgstr ""
+msgstr "."
 
 #. module: account
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Quantity"
-msgstr ""
+msgstr "Maximális mennyiség"
 
 #. module: account
 #: field:account.period,name:0
 msgid "Period Name"
-msgstr ""
+msgstr "Időszak"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -3894,7 +3896,7 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Code/Date"
-msgstr ""
+msgstr "Kód/Dátum"
 
 #. module: account
 #: field:account.account,active:0
@@ -3905,17 +3907,17 @@ msgstr ""
 #: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktív"
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Import from your bank statements"
-msgstr ""
+msgstr "Importálás a bankkivonatból"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Properties"
-msgstr ""
+msgstr "Tulajdonságok"
 
 #. module: account
 #: view:res.partner:0
@@ -3971,7 +3973,7 @@ msgstr "Pénznem"
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
-msgstr ""
+msgstr "Követel"
 
 #. module: account
 #: help:account.tax.template,child_depend:0
@@ -3990,18 +3992,18 @@ msgstr "Fizetett adó egyenleg"
 #: field:account.tax.code,child_ids:0
 #: field:account.tax.code.template,child_ids:0
 msgid "Child Codes"
-msgstr ""
+msgstr "Gyerek kód"
 
 #. module: account
 #: field:account.invoice,move_name:0
 msgid "Account Move"
-msgstr ""
+msgstr "Kontírozás"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Bankkivonat sorok"
 
 #. module: account
 #: field:account.move.line,amount_taxed:0
@@ -4046,12 +4048,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Vevői számlák"
 
 #. module: account
 #: field:res.partner,debit_limit:0
 msgid "Payable Limit"
-msgstr ""
+msgstr "Kötelezettség limit"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,state:0
@@ -4059,7 +4061,7 @@ msgstr ""
 #: wizard_field:account.partner.balance.report,init,state:0
 #: wizard_field:account.third_party_ledger.report,init,state:0
 msgid "Date/Period Filter"
-msgstr ""
+msgstr "Dátum/Időszak szűrés"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -4067,12 +4069,12 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: selection:account.journal,type:0
 msgid "General"
-msgstr ""
+msgstr "Általános"
 
 #. module: account
 #: rml:account.general.journal:0
 msgid "Credit Trans."
-msgstr ""
+msgstr "Követel tranz."
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
@@ -4112,7 +4114,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
 msgid "Periods"
-msgstr ""
+msgstr "Időszakok"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4121,7 +4123,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Számla"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -4146,7 +4148,7 @@ msgstr ""
 #: field:account.account,tax_ids:0
 #: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
-msgstr ""
+msgstr "Alapértelmezett adó"
 
 #. module: account
 #: constraint:ir.model:0
@@ -4205,7 +4207,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.invoice.pay,init,date:0
 msgid "Payment date"
-msgstr ""
+msgstr "Fizetés dátuma"
 
 #. module: account
 #: wizard_button:account_use_models,create,end:0
@@ -4215,31 +4217,31 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Adók:"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree7
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree7
 msgid "Unpaid Customer Invoices"
-msgstr ""
+msgstr "Kifizetetlen vevői számlák"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2
 msgid "Supplier Invoices"
-msgstr ""
+msgstr "Szállítói számlák"
 
 #. module: account
 #: field:account.analytic.line,product_id:0
 #: field:account.invoice.line,product_id:0
 #: field:account.move.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Termék"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: account
 #: field:res.partner,credit:0
@@ -4254,12 +4256,12 @@ msgstr ""
 #. module: account
 #: wizard_field:account.invoice.pay,init,journal_id:0
 msgid "Journal/Payment Mode"
-msgstr ""
+msgstr "Napló/kifizetés mód"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Canceled Invoice"
-msgstr ""
+msgstr "Törölt számla"
 
 #. module: account
 #: view:account.subscription:0
@@ -4281,7 +4283,7 @@ msgstr ""
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
-msgstr ""
+msgstr "Év összesen"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
@@ -4297,7 +4299,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "9"
-msgstr ""
+msgstr "9"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -4325,7 +4327,7 @@ msgstr ""
 #: field:account.config.wizard,date2:0
 #: field:account.fiscalyear,date_stop:0
 msgid "End Date"
-msgstr ""
+msgstr "Záró dátum"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
@@ -4396,7 +4398,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "Nyitott számla"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
@@ -4450,7 +4452,7 @@ msgstr ""
 #. module: account
 #: rml:account.general.ledger:0
 msgid "General Ledger -"
-msgstr ""
+msgstr "Főkönyv -"
 
 #. module: account
 #: field:report.hr.timesheet.invoice.journal,quantity:0
@@ -4470,7 +4472,7 @@ msgstr ""
 #: field:account.invoice,amount_total:0
 #: field:account.invoice,check_total:0
 msgid "Total"
-msgstr ""
+msgstr "Összesen"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
@@ -4502,13 +4504,13 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "By Date"
-msgstr ""
+msgstr "Dátum szerint"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr ""
+msgstr "Szállítói jóváírások"
 
 #. module: account
 #: help:account.model.line,date:0
@@ -4518,7 +4520,7 @@ msgstr ""
 #. module: account
 #: wizard_button:account.invoice.refund,init,modify_invoice:0
 msgid "Modify Invoice"
-msgstr ""
+msgstr "Számlamódosítás"
 
 #. module: account
 #: view:res.partner:0
@@ -4542,7 +4544,7 @@ msgstr ""
 #: field:account.bank.statement.line,statement_id:0
 #: field:account.move.line,statement_id:0
 msgid "Statement"
-msgstr ""
+msgstr "Bankkivonat"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
@@ -4595,7 +4597,7 @@ msgstr ""
 #: field:wizard.company.setup,company_id:0
 #: field:wizard.multi.charts.accounts,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Cég"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -4622,7 +4624,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.journal,name:0
 msgid "Journal name"
-msgstr ""
+msgstr "Napló név"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
@@ -4632,19 +4634,19 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
 #: view:ir.sequence:0
 #: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
 msgid "Fiscal Years"
-msgstr ""
+msgstr "Pénzügyi év"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Import from invoices or payments"
-msgstr ""
+msgstr "Importálás számlákból vagy kifizetésekből"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_select
@@ -4660,7 +4662,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.period,icon:0
 msgid "Icon"
-msgstr ""
+msgstr "Ikon"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
@@ -4681,7 +4683,7 @@ msgstr ""
 #. module: account
 #: wizard_button:account.aged.trial.balance,init,print:0
 msgid "Print Aged Trial Balance"
-msgstr ""
+msgstr "Korosbított kivonat nyomtatás"
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -4691,7 +4693,7 @@ msgstr ""
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Ref."
-msgstr ""
+msgstr "Hiv."
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
@@ -4789,7 +4791,7 @@ msgstr ""
 #. module: account
 #: rml:account.overdue:0
 msgid "VAT:"
-msgstr ""
+msgstr "ÁFA:"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -4798,7 +4800,7 @@ msgstr ""
 #: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
-msgstr ""
+msgstr "Összesen:"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal
@@ -4861,7 +4863,7 @@ msgstr ""
 #: rml:account.invoice:0
 #: selection:account.invoice,type:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Szállítói számla"
 
 #. module: account
 #: selection:account.move.line,state:0
@@ -4887,7 +4889,7 @@ msgstr ""
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
-msgstr ""
+msgstr "Tartozik"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_42
@@ -5026,7 +5028,7 @@ msgstr ""
 #: model:process.node,name:account.process_node_paidinvoice0
 #: model:process.node,name:account.process_node_supplierpaidinvoice0
 msgid "Paid invoice"
-msgstr ""
+msgstr "Kifizetett számla"
 
 #. module: account
 #: view:account.tax:0
@@ -5056,7 +5058,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
 msgid "Import invoices"
-msgstr ""
+msgstr "Számlák importálása"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -5113,7 +5115,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_finance_invoice
 #: wizard_field:populate_statement_from_inv,go,lines:0
 msgid "Invoices"
-msgstr ""
+msgstr "Számlák"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
@@ -5234,7 +5236,7 @@ msgstr ""
 #. module: account
 #: rml:account.overdue:0
 msgid "Paid"
-msgstr ""
+msgstr "Fizetve"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree11
@@ -5287,7 +5289,7 @@ msgstr ""
 #. module: account
 #: model:process.process,name:account.process_process_supplierinvoiceprocess0
 msgid "Supplier Invoice Process"
-msgstr ""
+msgstr "Szállítói számla folyamat"
 
 #. module: account
 #: rml:account.account.balance:0
@@ -5371,7 +5373,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree6
 msgid "PRO-FORMA Customer Invoices"
-msgstr ""
+msgstr "PRO-FORMA Vevői számlák"
 
 #. module: account
 #: field:account.subscription,period_total:0
@@ -5511,7 +5513,7 @@ msgstr ""
 #. module: account
 #: rml:account.general.journal:0
 msgid "Printing Date :"
-msgstr ""
+msgstr "Nyomtatás dátuma :"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
@@ -5663,7 +5665,7 @@ msgstr ""
 #: field:product.category,property_account_income_categ:0
 #: field:product.template,property_account_income:0
 msgid "Income Account"
-msgstr ""
+msgstr "Árbevétel számla"
 
 #. module: account
 #: field:account.period,special:0
@@ -5685,7 +5687,7 @@ msgstr ""
 #: view:account.invoice:0
 #: model:ir.actions.act_window,name:account.act_account_analytic_account_2_account_invoice_line
 msgid "Invoice lines"
-msgstr ""
+msgstr "Számla sorok"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -5722,7 +5724,7 @@ msgstr ""
 #: field:account.chart.template,bank_account_view_id:0
 #: field:account.invoice,partner_bank:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Bankszámlaszám"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
@@ -5756,7 +5758,7 @@ msgstr ""
 #: field:fiscalyear.seq,fiscalyear_id:0
 #: model:ir.model,name:account.model_account_fiscalyear
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Pénzügyi év"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
@@ -5776,7 +5778,7 @@ msgstr ""
 #: rml:account.invoice:0
 #: selection:account.invoice,type:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Szállítói jóváírás"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
@@ -5801,7 +5803,7 @@ msgstr ""
 #: field:account.tax,python_compute_inv:0
 #: field:account.tax.template,python_compute_inv:0
 msgid "Python Code (reverse)"
-msgstr ""
+msgstr "Python kód (reverse)"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
@@ -5819,6 +5821,8 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category"
 msgstr ""
+"Termék/szolgáltatás beszerzésekor a költség könyvelésére használt számla. "
+"Költségszámla vagy készlet esetén elhatárolás számla."
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -5866,7 +5870,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr ""
+msgstr "Fizetési feltétel"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
@@ -5909,12 +5913,12 @@ msgstr ""
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Filters"
-msgstr ""
+msgstr "Szűrők"
 
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,yes:0
 msgid "Yes"
-msgstr ""
+msgstr "Igen"
 
 #. module: account
 #: help:account.account,reconcile:0
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 8827e09eea8..a677f708ff2 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-01-06 18:48+0000\n"
-"Last-Translator: eLBati <elbaddy@gmail.com>\n"
+"PO-Revision-Date: 2010-01-17 16:07+0000\n"
+"Last-Translator: Davide Corio <davide.corio@domsense.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-01-07 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-01-18 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -40,7 +40,7 @@ msgstr "Codifica delle registrazioni"
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr ""
+msgstr "Specificare il messaggio per il Report Pagamenti Scaduti."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -73,11 +73,14 @@ msgid ""
 "This account will be used to value incoming stock for the current product "
 "category"
 msgstr ""
+"Questo conto verrà utilizzato per valorizzare le merci in entrata per la "
+"categoria di prodotti corrente"
 
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
 msgstr ""
+"Lasciare vuoto per usare il periodo della data di validazione (fattura)."
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
@@ -115,7 +118,7 @@ msgstr "Mastro"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr ""
+msgstr "Giornale Ricevute"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -128,7 +131,7 @@ msgstr "Rimanenze"
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr ""
+msgstr "Segno imponibile"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
@@ -215,7 +218,7 @@ msgstr "Codice calcolo (se tipo=codice)"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "Registrazione contabile"
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
@@ -270,6 +273,11 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
+"Imposta la vista da utilizzare quando si inseriscono o si consultano le "
+"registrazioni in questo Giornale. La vista dice a Open ERP quali campi "
+"dovranno essere visibili, richiesti o di sola lettura e in quale ordine. "
+"Puoi creare la tua vista personale per velocizzare l'inserimento dei dati in "
+"ogni giornale."
 
 #. module: account
 #: help:account.invoice,date_due:0
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 1f9b63a546b..94f21ef277a 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: 2009-12-15 16:09+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus) <Unknown>\n"
+"PO-Revision-Date: 2010-01-16 18:36+0000\n"
+"Last-Translator: Andrzej MoST (Marcin Ostajewski) <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: 2009-12-16 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-01-17 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1607,7 +1607,7 @@ msgstr "Nr konta"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr "Zostaw puste żeby używać konto wydatków"
+msgstr "Zostaw puste żeby używać konta kosztowego"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,account_ids:0
@@ -2600,7 +2600,7 @@ msgstr "Nazwa typu konta"
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the VAT declaration."
-msgstr "Urzyj ten kod do deklaracji VAT-a."
+msgstr "Użyj tego kodu do deklaracji VAT."
 
 #. module: account
 #: field:account.move.line,blocked:0
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 533f85c3dcd..f37e09831bb 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-07 18:34+0000\n"
-"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
+"PO-Revision-Date: 2010-01-14 10:44+0000\n"
+"Last-Translator: Carlos Paiva <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: 2009-12-16 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-01-15 04:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -793,7 +793,7 @@ msgstr "Posição"
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr "Período para"
+msgstr "Período até"
 
 #. module: account
 #: field:account.account.type,partner_account:0
@@ -1969,7 +1969,7 @@ msgstr "Ordenar por"
 #. module: account
 #: field:account.move,to_check:0
 msgid "To Be Verified"
-msgstr "Para ser verificado"
+msgstr "Pendente de Verificação"
 
 #. module: account
 #: help:res.partner,debit:0
@@ -3774,7 +3774,7 @@ msgstr "Inscriçãoda conta"
 #: field:account.move.line,date_maturity:0
 #: rml:account.overdue:0
 msgid "Maturity date"
-msgstr "Dada de vencimento"
+msgstr "Data de vencimento"
 
 #. module: account
 #: view:account.subscription:0
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 5ca5cb6b06a..020c123a932 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/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-12-23 08:28+0000\n"
-"Last-Translator: Andrei Andreyanau <Unknown>\n"
+"PO-Revision-Date: 2010-01-15 22:28+0000\n"
+"Last-Translator: Alex Mr.Brightside Demurine <extrimall90@mail.ru>\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: 2009-12-24 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1696,7 +1696,7 @@ msgstr "Расходы и доходы"
 #. module: account
 #: constraint:account.account:0
 msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "Ошибка! Вы не можете создать рекурсивные счета."
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -1831,7 +1831,7 @@ msgstr "Персональный менеджер"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "to :"
-msgstr ""
+msgstr "к :"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,debit:0
@@ -1931,7 +1931,7 @@ msgstr "Позиция счета подписки"
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "No Filter"
-msgstr ""
+msgstr "Без Фильтра"
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -1997,7 +1997,7 @@ msgstr "Неправильный XML для просмотра архитект
 #. module: account
 #: wizard_field:account.partner.balance.report,init,date1:0
 msgid "          Start date"
-msgstr ""
+msgstr "          Начать дату"
 
 #. module: account
 #: wizard_view:account.analytic.account.journal.report,init:0
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index 73290bbaaa4..71f502c857f 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-17 03:24+0000\n"
-"Last-Translator: pdqt <Unknown>\n"
+"PO-Revision-Date: 2010-01-11 07:51+0000\n"
+"Last-Translator: Nguyễn Thịnh <thinhnverp@gmail.com>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-18 04:32+0000\n"
+"X-Launchpad-Export-Date: 2010-01-12 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -73,34 +73,35 @@ msgstr ""
 msgid ""
 "This account will be used to value incoming stock for the current product "
 "category"
-msgstr ""
+msgstr "tài khoản này sẽ được dùng cho giá của sản phẩm đưa vào danh mục"
 
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
 msgstr ""
+"Giữ sản phẩm nào để sử dụng khoảng thời gian xác nhận của (hoá đơn) ngày"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
 msgid "Reconciliation result"
-msgstr ""
+msgstr "kết quả hòa giả"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr ""
+msgstr "không thể hòa giải"
 
 #. 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 "mã số cơ bản"
 
 #. module: account
 #: view:account.account:0
 msgid "Account Statistics"
-msgstr ""
+msgstr "thống kê tài chính"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
@@ -121,7 +122,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,residual:0
 msgid "Residual"
-msgstr ""
+msgstr "số dư"
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -610,6 +611,8 @@ msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
 msgstr ""
+"Các lĩnh vực chuỗi được dùng để sắp các nguồn lực từ các chuỗi thấp hơn cho "
+"những người cao"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -657,12 +660,12 @@ msgstr ""
 #. module: account
 #: help:account.fiscalyear,company_id:0
 msgid "Keep empty if the fiscal year belongs to several companies."
-msgstr ""
+msgstr "Hãy bỏ trống nếu năm tài chính thuộc về một số công ty"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "phân tích tài chính kế toán"
 
 #. module: account
 #: rml:account.overdue:0
diff --git a/addons/account/installer.py b/addons/account/installer.py
new file mode 100644
index 00000000000..2e7ebb5ed44
--- /dev/null
+++ b/addons/account/installer.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+
+class account_installer(osv.osv_memory):
+    _name = 'account.installer'
+    _inherit = 'res.config.installer'
+
+    _columns = {
+        # Accounting
+        'account_analytic_default':fields.boolean('Analytic Accounting'),
+        'account_analytic_plans':fields.boolean('Multiple Analytic Plans'),
+        'account_payment':fields.boolean('Suppliers Payment Management'),
+        'account_followup':fields.boolean('Followups Management'),
+        'account_asset':fields.boolean('Assets Management')
+        }
+    _defaults = {
+        'account_analytic_default':True,
+        }
+account_installer()
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index a3146d9456d..7bfc4b702a7 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -29,17 +29,17 @@ from mx.DateTime import RelativeDateTime
 from tools import config
 from tools.translate import _
 
-class fiscalyear_seq(osv.osv):
-    _name = "fiscalyear.seq"
-    _description = "Maintains Invoice sequences with Fiscal Year"
-    _rec_name = 'fiscalyear_id'
-    _columns = {
-        'journal_id': fields.many2one('account.journal', 'Journal'),
-        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year',required=True),
-        'sequence_id':fields.many2one('ir.sequence', 'Sequence',required=True),
-    }
-
-fiscalyear_seq()
+#class fiscalyear_seq(osv.osv):
+#    _name = "fiscalyear.seq"
+#    _description = "Maintains Invoice sequences with Fiscal Year"
+#    _rec_name = 'fiscalyear_id'
+#    _columns = {
+#        'journal_id': fields.many2one('account.journal', 'Journal'),
+#        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year',required=True),
+#        'sequence_id':fields.many2one('ir.sequence', 'Sequence',required=True),
+#    }
+#
+#fiscalyear_seq()
 
 class account_invoice(osv.osv):
     def _amount_all(self, cr, uid, ids, name, args, context=None):
@@ -153,7 +153,9 @@ class account_invoice(osv.osv):
             if not move_lines:
                 res[id] = []
                 continue
+            res[id] = []
             data_lines = self.pool.get('account.move.line').browse(cr,uid,move_lines)
+            partial_ids = []# Keeps the track of ids where partial payments are done with payment terms
             for line in data_lines:
                 ids_line = []
                 if line.reconcile_id:
@@ -161,7 +163,8 @@ class account_invoice(osv.osv):
                 elif line.reconcile_partial_id:
                     ids_line = line.reconcile_partial_id.line_partial_ids
                 l = map(lambda x: x.id, ids_line)
-                res[id]=[x for x in l if x <> line.id]
+                partial_ids.append(line.id)
+                res[id] =[x for x in l if x <> line.id and x not in partial_ids]
         return res
 
     def _get_invoice_line(self, cr, uid, ids, context=None):
@@ -183,11 +186,14 @@ class account_invoice(osv.osv):
             src = []
             lines = []
             for m in self.pool.get('account.move.line').browse(cr, uid, moves, context):
+                temp_lines = []#Added temp list to avoid duplicate records
                 if m.reconcile_id:
-                    lines += map(lambda x: x.id, m.reconcile_id.line_id)
+                    temp_lines = map(lambda x: x.id, m.reconcile_id.line_id)
                 elif m.reconcile_partial_id:
-                    lines += map(lambda x: x.id, m.reconcile_partial_id.line_partial_ids)
+                    temp_lines = map(lambda x: x.id, m.reconcile_partial_id.line_partial_ids)
+                lines += [x for x in temp_lines if x not in lines]
                 src.append(m.id)
+                
             lines = filter(lambda x: x not in src, lines)
             result[invoice.id] = lines
         return result
@@ -415,7 +421,7 @@ class account_invoice(osv.osv):
     def onchange_currency_id(self, cr, uid, ids, curr_id, company_id):
         if curr_id:
             currency = self.pool.get('res.currency').browse(cr, uid, curr_id)
-            if currency.company_id != company_id:
+            if currency.company_id.id != company_id:
                 raise osv.except_osv(_('Configration Error !'),
                         _('Can not select currency that is not related to current company.\nPlease select accordingly !.'))
         return {}
@@ -991,14 +997,17 @@ class account_invoice(osv.osv):
         else:
             amount_currency = False
             currency_id = False
-
+        if invoice.type in ('in_invoice', 'in_refund'):
+            ref = invoice.reference
+        else:
+            ref = self._convert_ref(cr, uid, invoice.number)        
         # Pay attention to the sign for both debit/credit AND amount_currency
         l1 = {
             'debit': direction * pay_amount>0 and direction * pay_amount,
             'credit': direction * pay_amount<0 and - direction * pay_amount,
             'account_id': src_account_id,
             'partner_id': invoice.partner_id.id,
-            'ref':invoice.number,
+            'ref':ref,
             'date': date,
             'currency_id':currency_id,
             'amount_currency':amount_currency and direction * amount_currency or 0.0,
@@ -1009,7 +1018,7 @@ class account_invoice(osv.osv):
             'credit': direction * pay_amount>0 and direction * pay_amount,
             'account_id': pay_account_id,
             'partner_id': invoice.partner_id.id,
-            'ref':invoice.number,
+            'ref':ref,
             'date': date,
             'currency_id':currency_id,
             'amount_currency':amount_currency and - direction * amount_currency or 0.0,
@@ -1022,7 +1031,7 @@ class account_invoice(osv.osv):
         l2['name'] = name
 
         lines = [(0, 0, l1), (0, 0, l2)]
-        move = {'ref': invoice.number, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
+        move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
         move_id = self.pool.get('account.move').create(cr, uid, move, context=context)
 
         line_ids = []
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 00707a13163..a3985ee68e9 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -117,7 +117,7 @@ class res_partner(osv.osv):
             res[pid][maps[type]] = (type=='receivable') and val or -val
         return res
 
-    def _credit_search(self, cr, uid, obj, name, args):
+    def _credit_search(self, cr, uid, obj, name, args, context):
         if not len(args):
             return []
         where = ' and '.join(map(lambda x: '(sum(debit-credit)'+x[1]+str(x[2])+')',args))
@@ -128,7 +128,7 @@ class res_partner(osv.osv):
             return [('id','=','0')]
         return [('id','in',map(lambda x:x[0], res))]
 
-    def _debit_search(self, cr, uid, obj, name, args):
+    def _debit_search(self, cr, uid, obj, name, args, context):
         if not len(args):
             return []
         query = self.pool.get('account.move.line')._query_get(cr, uid, context={})
diff --git a/addons/account/product.py b/addons/account/product.py
index 0833fed06da..b2963a34fec 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/__init__.py b/addons/account/project/__init__.py
index b8cd64400d9..b0d01bbcfb7 100644
--- a/addons/account/project/__init__.py
+++ b/addons/account/project/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index 9e81b2a866d..e39e5b00d77 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 757b134136d..1123b122eaf 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -129,7 +129,7 @@
 		<wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
         <menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
 
-        <menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_reporting"/>
+        <menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
         <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>
 
         <record id="view_account_analytic_line_form" model="ir.ui.view">
diff --git a/addons/account/project/report/__init__.py b/addons/account/project/report/__init__.py
index 1b923736c67..933401799f0 100644
--- a/addons/account/project/report/__init__.py
+++ b/addons/account/project/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/report/account_journal.py b/addons/account/project/report/account_journal.py
index 1f7f38e6b94..4f7768a7b19 100644
--- a/addons/account/project/report/account_journal.py
+++ b/addons/account/project/report/account_journal.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/report/analytic_balance.py b/addons/account/project/report/analytic_balance.py
index c8204505f84..ab4c5f87ac0 100644
--- a/addons/account/project/report/analytic_balance.py
+++ b/addons/account/project/report/analytic_balance.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/report/analytic_check.py b/addons/account/project/report/analytic_check.py
index feadef9aa6e..a97f94757af 100644
--- a/addons/account/project/report/analytic_check.py
+++ b/addons/account/project/report/analytic_check.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/report/analytic_journal.py b/addons/account/project/report/analytic_journal.py
index e22e4ed2a85..e3da7636c0a 100644
--- a/addons/account/project/report/analytic_journal.py
+++ b/addons/account/project/report/analytic_journal.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py
index ef0097ab24b..1109549ace4 100644
--- a/addons/account/project/report/cost_ledger.py
+++ b/addons/account/project/report/cost_ledger.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/report/inverted_analytic_balance.py b/addons/account/project/report/inverted_analytic_balance.py
index bbc8bfbf003..7071062e08a 100644
--- a/addons/account/project/report/inverted_analytic_balance.py
+++ b/addons/account/project/report/inverted_analytic_balance.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/report/quantity_cost_ledger.py b/addons/account/project/report/quantity_cost_ledger.py
index 83c4ff15824..6d4b0579794 100644
--- a/addons/account/project/report/quantity_cost_ledger.py
+++ b/addons/account/project/report/quantity_cost_ledger.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/wizard/__init__.py b/addons/account/project/wizard/__init__.py
index 50c5da70478..21a811ebe5f 100644
--- a/addons/account/project/wizard/__init__.py
+++ b/addons/account/project/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/wizard/wizard_account_analytic_analytic_check.py b/addons/account/project/wizard/wizard_account_analytic_analytic_check.py
index fdc3e0aaba2..a1bbbc50b8c 100644
--- a/addons/account/project/wizard/wizard_account_analytic_analytic_check.py
+++ b/addons/account/project/wizard/wizard_account_analytic_analytic_check.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/wizard/wizard_account_analytic_balance_report.py b/addons/account/project/wizard/wizard_account_analytic_balance_report.py
index 425e28dccfb..916a123d745 100644
--- a/addons/account/project/wizard/wizard_account_analytic_balance_report.py
+++ b/addons/account/project/wizard/wizard_account_analytic_balance_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/wizard/wizard_account_analytic_cost_ledger_for_journal_report.py b/addons/account/project/wizard/wizard_account_analytic_cost_ledger_for_journal_report.py
index 49730a1c0dc..feafab05a47 100644
--- a/addons/account/project/wizard/wizard_account_analytic_cost_ledger_for_journal_report.py
+++ b/addons/account/project/wizard/wizard_account_analytic_cost_ledger_for_journal_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/wizard/wizard_account_analytic_cost_ledger_report.py b/addons/account/project/wizard/wizard_account_analytic_cost_ledger_report.py
index e8ec327f47d..2469f7f5c0c 100644
--- a/addons/account/project/wizard/wizard_account_analytic_cost_ledger_report.py
+++ b/addons/account/project/wizard/wizard_account_analytic_cost_ledger_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/wizard/wizard_account_analytic_inverted_balance_report.py b/addons/account/project/wizard/wizard_account_analytic_inverted_balance_report.py
index d80c825f89e..9219a8ea9ae 100644
--- a/addons/account/project/wizard/wizard_account_analytic_inverted_balance_report.py
+++ b/addons/account/project/wizard/wizard_account_analytic_inverted_balance_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/wizard/wizard_account_analytic_journal_report.py b/addons/account/project/wizard/wizard_account_analytic_journal_report.py
index 69596aa3744..03be104469d 100644
--- a/addons/account/project/wizard/wizard_account_analytic_journal_report.py
+++ b/addons/account/project/wizard/wizard_account_analytic_journal_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/wizard/wizard_account_analytic_line.py b/addons/account/project/wizard/wizard_account_analytic_line.py
index 09a90955220..e6ebd336c35 100644
--- a/addons/account/project/wizard/wizard_account_analytic_line.py
+++ b/addons/account/project/wizard/wizard_account_analytic_line.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/project/wizard/wizard_analytic_account_chart.py b/addons/account/project/wizard/wizard_analytic_account_chart.py
index fc3e15db747..354fe6e6046 100644
--- a/addons/account/project/wizard/wizard_analytic_account_chart.py
+++ b/addons/account/project/wizard/wizard_analytic_account_chart.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index 71d1a2564ff..f76b850aa7f 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 7402648897e..5c846dae7e1 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 6f35634f89f..830f8152120 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index 07ce5285802..f406d884ec8 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -16,7 +16,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/>.
 #
 ##############################################################################
 
@@ -47,15 +47,15 @@ def _record_to_report_line(record):
             }
 
 class account_tax_code_report(rml_parse.rml_parse):
-    #_name = 'report.account.tax.code.entries'
-    
+    _name = 'report.account.tax.code.entries'
+
     def __init__(self, cr, uid, name, context):
         super(account_tax_code_report, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'get_line':self.get_line,
         })
-        
+
     def get_line(self, obj):
         line_ids = self.pool.get('account.move.line').search(self.cr, self.uid, [('tax_code_id','=',obj.id)])
         if not line_ids: return []
diff --git a/addons/account/report/aged_trial_balance.py b/addons/account/report/aged_trial_balance.py
index be53679f70a..5d3f1ae777d 100644
--- a/addons/account/report/aged_trial_balance.py
+++ b/addons/account/report/aged_trial_balance.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/report/central_journal.py b/addons/account/report/central_journal.py
index 1312529e1e0..9bc2cfdd1b9 100644
--- a/addons/account/report/central_journal.py
+++ b/addons/account/report/central_journal.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py
index bc29eb4966a..6d21ff2f513 100644
--- a/addons/account/report/general_journal.py
+++ b/addons/account/report/general_journal.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/report/invoice.py b/addons/account/report/invoice.py
index 3779ae70dfc..b232a33b9d9 100644
--- a/addons/account/report/invoice.py
+++ b/addons/account/report/invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/report/overdue.py b/addons/account/report/overdue.py
index 65408ba0b3f..d25432bde24 100644
--- a/addons/account/report/overdue.py
+++ b/addons/account/report/overdue.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py
index 421696f6d25..2b52a0616f0 100755
--- a/addons/account/report/partner_balance.py
+++ b/addons/account/report/partner_balance.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py
index 3fc08288212..507599ec999 100644
--- a/addons/account/report/rml_parse.py
+++ b/addons/account/report/rml_parse.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/report/tax_report.py b/addons/account/report/tax_report.py
index 4e9e252be2c..ccc62a53de0 100644
--- a/addons/account/report/tax_report.py
+++ b/addons/account/report/tax_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py
index 5c38819ba83..affd7881218 100644
--- a/addons/account/report/third_party_ledger.py
+++ b/addons/account/report/third_party_ledger.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 3d135317b71..bb7ffbae946 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -82,7 +82,6 @@
 "access_account_fiscal_position","account.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0
 "access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0
 "access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0
-"access_fiscalyear_seq","fiscalyear.seq","model_fiscalyear_seq","account.group_account_invoice",1,1,1,1
 "access_account_fiscal_position_template","account.fiscal.position.template","model_account_fiscal_position_template","account.group_account_manager",1,1,1,1
 "access_account_fiscal_position_tax_template","account.fiscal.position.tax.template","model_account_fiscal_position_tax_template","account.group_account_manager",1,1,1,1
 "access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,1,1,1
diff --git a/addons/account/sequence.py b/addons/account/sequence.py
index bdc85e1b3e8..08e38dd14a4 100644
--- a/addons/account/sequence.py
+++ b/addons/account/sequence.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/test/test_parent_structure.py b/addons/account/test/test_parent_structure.py
index 2270eb73d24..fb18e1484b6 100644
--- a/addons/account/test/test_parent_structure.py
+++ b/addons/account/test/test_parent_structure.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index d207c3d5c27..16266efbfeb 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_account_balance_report.py b/addons/account/wizard/wizard_account_balance_report.py
index e3fa44b7a97..62485a9f21a 100644
--- a/addons/account/wizard/wizard_account_balance_report.py
+++ b/addons/account/wizard/wizard_account_balance_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_account_chart.py b/addons/account/wizard/wizard_account_chart.py
index b4fc40ab01a..ca8153f3ce7 100644
--- a/addons/account/wizard/wizard_account_chart.py
+++ b/addons/account/wizard/wizard_account_chart.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_account_duplicate.py b/addons/account/wizard/wizard_account_duplicate.py
index 62c4dccb520..17fbad45b6f 100644
--- a/addons/account/wizard/wizard_account_duplicate.py
+++ b/addons/account/wizard/wizard_account_duplicate.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_aged_trial_balance.py b/addons/account/wizard/wizard_aged_trial_balance.py
index f5c5cd9a9ac..9935811031b 100755
--- a/addons/account/wizard/wizard_aged_trial_balance.py
+++ b/addons/account/wizard/wizard_aged_trial_balance.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_automatic_reconcile.py b/addons/account/wizard/wizard_automatic_reconcile.py
index 8ede8fe7793..7a0f5a8c465 100644
--- a/addons/account/wizard/wizard_automatic_reconcile.py
+++ b/addons/account/wizard/wizard_automatic_reconcile.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_bank_reconcile.py b/addons/account/wizard/wizard_bank_reconcile.py
index cf00e03a6a7..c081657304a 100644
--- a/addons/account/wizard/wizard_bank_reconcile.py
+++ b/addons/account/wizard/wizard_bank_reconcile.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_central_journal.py b/addons/account/wizard/wizard_central_journal.py
index 04f02e5051c..8a6e1645a6f 100644
--- a/addons/account/wizard/wizard_central_journal.py
+++ b/addons/account/wizard/wizard_central_journal.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_change_currency.py b/addons/account/wizard/wizard_change_currency.py
index c2c0ffd1478..69fbd8c85ed 100644
--- a/addons/account/wizard/wizard_change_currency.py
+++ b/addons/account/wizard/wizard_change_currency.py
@@ -3,7 +3,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_fiscalyear_close.py b/addons/account/wizard/wizard_fiscalyear_close.py
index 27b69bb9d76..7e48f7c496c 100644
--- a/addons/account/wizard/wizard_fiscalyear_close.py
+++ b/addons/account/wizard/wizard_fiscalyear_close.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -79,10 +79,12 @@ def _data_save(self, cr, uid, data, context):
     if move_ids:
         raise wizard.except_wizard(_('UserError'),
                 _('The opening journal must not have any entry in the new fiscal year !'))
-
-
+    query = "SELECT id FROM account_fiscalyear WHERE date_stop < '" + str(new_fyear.date_start) + "'"
+    cr.execute(query)
+    result = cr.dictfetchall()
+    fy_ids = ','.join([str(x['id']) for x in result])
     query_line = pool.get('account.move.line')._query_get(cr, uid,
-            obj='account_move_line', context={'fiscalyear': fy_id})
+            obj='account_move_line', context={'fiscalyear': fy_ids})
     cr.execute('select id from account_account WHERE active')
     ids = map(lambda x: x[0], cr.fetchall())
     for account in pool.get('account.account').browse(cr, uid, ids,
diff --git a/addons/account/wizard/wizard_fiscalyear_close_state.py b/addons/account/wizard/wizard_fiscalyear_close_state.py
index b9aab9d8702..2f8331f2d3e 100644
--- a/addons/account/wizard/wizard_fiscalyear_close_state.py
+++ b/addons/account/wizard/wizard_fiscalyear_close_state.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_general_journal.py b/addons/account/wizard/wizard_general_journal.py
index 8f90474e0be..4d23624edab 100644
--- a/addons/account/wizard/wizard_general_journal.py
+++ b/addons/account/wizard/wizard_general_journal.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py
index a1655037b0d..ac8df1e1142 100644
--- a/addons/account/wizard/wizard_general_ledger_report.py
+++ b/addons/account/wizard/wizard_general_ledger_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_invoice_state.py b/addons/account/wizard/wizard_invoice_state.py
index 532d47789dd..342ce5a97be 100644
--- a/addons/account/wizard/wizard_invoice_state.py
+++ b/addons/account/wizard/wizard_invoice_state.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_journal.py b/addons/account/wizard/wizard_journal.py
index 50dba5ab18a..fd2b012863e 100644
--- a/addons/account/wizard/wizard_journal.py
+++ b/addons/account/wizard/wizard_journal.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_journal_select.py b/addons/account/wizard/wizard_journal_select.py
index 8393a72df4d..123a07fb627 100644
--- a/addons/account/wizard/wizard_journal_select.py
+++ b/addons/account/wizard/wizard_journal_select.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_move_line_select.py b/addons/account/wizard/wizard_move_line_select.py
index 54b0d86bb23..76ff699e4e9 100644
--- a/addons/account/wizard/wizard_move_line_select.py
+++ b/addons/account/wizard/wizard_move_line_select.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_open_closed_fiscalyear.py b/addons/account/wizard/wizard_open_closed_fiscalyear.py
index 91201d9f85e..f3c434b5f2d 100644
--- a/addons/account/wizard/wizard_open_closed_fiscalyear.py
+++ b/addons/account/wizard/wizard_open_closed_fiscalyear.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_partner_balance_report.py b/addons/account/wizard/wizard_partner_balance_report.py
index 54300e582d4..142aeeb682c 100644
--- a/addons/account/wizard/wizard_partner_balance_report.py
+++ b/addons/account/wizard/wizard_partner_balance_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_pay_invoice.py b/addons/account/wizard/wizard_pay_invoice.py
index c21632d9a44..b924d56e389 100644
--- a/addons/account/wizard/wizard_pay_invoice.py
+++ b/addons/account/wizard/wizard_pay_invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_period_close.py b/addons/account/wizard/wizard_period_close.py
index beeac425874..d6ba73683f2 100644
--- a/addons/account/wizard/wizard_period_close.py
+++ b/addons/account/wizard/wizard_period_close.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_print_journal.py b/addons/account/wizard/wizard_print_journal.py
index 6c376f56ce1..2f61b76f14a 100644
--- a/addons/account/wizard/wizard_print_journal.py
+++ b/addons/account/wizard/wizard_print_journal.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_reconcile.py b/addons/account/wizard/wizard_reconcile.py
index 9af4d9ca71f..9debe7afbef 100644
--- a/addons/account/wizard/wizard_reconcile.py
+++ b/addons/account/wizard/wizard_reconcile.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_reconcile_select.py b/addons/account/wizard/wizard_reconcile_select.py
index 73e1224d087..594020debd4 100644
--- a/addons/account/wizard/wizard_reconcile_select.py
+++ b/addons/account/wizard/wizard_reconcile_select.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_refund.py b/addons/account/wizard/wizard_refund.py
index a92b38c67f3..2d603abe4a4 100644
--- a/addons/account/wizard/wizard_refund.py
+++ b/addons/account/wizard/wizard_refund.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_state_open.py b/addons/account/wizard/wizard_state_open.py
index 51043afe940..9720f48e25e 100644
--- a/addons/account/wizard/wizard_state_open.py
+++ b/addons/account/wizard/wizard_state_open.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_statement_from_invoice.py b/addons/account/wizard/wizard_statement_from_invoice.py
index be4a01c94c4..5bb9a0d9772 100644
--- a/addons/account/wizard/wizard_statement_from_invoice.py
+++ b/addons/account/wizard/wizard_statement_from_invoice.py
@@ -58,15 +58,35 @@ def _search_invoices(obj, cr, uid, data, context):
     journal_obj = pool.get('account.journal')
 
     statement = statement_obj.browse(cr, uid, data['id'], context=context)
+    args_move_line = []
+    repeated_move_line_ids = []
+    # Creating a group that is unique for importing move lines(move lines, once imported into statement lines, should not appear again)
+    for st_line in statement.line_ids:
+        args_move_line = []
+        args_move_line.append(('name','=', st_line.name))
+        args_move_line.append(('ref','=',st_line.ref))
+        if st_line.partner_id:
+            args_move_line.append(('partner_id','=',st_line.partner_id.id))
+        args_move_line.append(('account_id','=',st_line.account_id.id))
+        
+        move_line_id = line_obj.search(cr, uid, args_move_line,context=context)
+        if move_line_id:
+            repeated_move_line_ids.append(move_line_id)
+        
     journal_ids = data['form']['journal_id'][0][2]
 
     if journal_ids == []:
         journal_ids = journal_obj.search(cr, uid, [('type', 'in', ('sale','cash','purchase'))], context=context)
-
-    line_ids = line_obj.search(cr, uid, [
+    
+    args = [
         ('reconcile_id', '=', False),
         ('journal_id', 'in', journal_ids),
-        ('account_id.reconcile', '=', True)],
+        ('account_id.reconcile', '=', True)]
+    
+    if repeated_move_line_ids:
+        args.append(('id','not in',repeated_move_line_ids))
+           
+    line_ids = line_obj.search(cr, uid, args,
         #order='date DESC, id DESC', #doesn't work
         context=context)
         
diff --git a/addons/account/wizard/wizard_subscription_generate.py b/addons/account/wizard/wizard_subscription_generate.py
index e0966d2ae22..51cbad9ec3a 100644
--- a/addons/account/wizard/wizard_subscription_generate.py
+++ b/addons/account/wizard/wizard_subscription_generate.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -29,7 +29,7 @@ import pooler
 
 _subscription_form = '''<?xml version="1.0"?>
 <form string="%s">
-    <seperator string="Generate entries before:" colspan="4"/>
+    <separator string="Generate entries before:" colspan="4"/>
     <field name="date"/>
 </form>''' % ('Subscription Compute',)
 
@@ -38,7 +38,7 @@ _subscription_fields = {
 }
 
 class wiz_subscription(wizard.interface):
-    def _action_generate(self, cr, uid, data, context):
+    def _action_generate(self, cr, uid, data, context={}):
         cr.execute('select id from account_subscription_line where date<%s and move_id is null', (data['form']['date'],))
         ids = map(lambda x: x[0], cr.fetchall())
         pooler.get_pool(cr.dbname).get('account.subscription.line').move_create(cr, uid, ids)
diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py
index a5581b8dd77..43186f309c8 100755
--- a/addons/account/wizard/wizard_third_party_ledger.py
+++ b/addons/account/wizard/wizard_third_party_ledger.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_unreconcile.py b/addons/account/wizard/wizard_unreconcile.py
index 72ddb5a93ce..42d2d2d967f 100644
--- a/addons/account/wizard/wizard_unreconcile.py
+++ b/addons/account/wizard/wizard_unreconcile.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_unreconcile_select.py b/addons/account/wizard/wizard_unreconcile_select.py
index 5149666d350..2f347d495a9 100644
--- a/addons/account/wizard/wizard_unreconcile_select.py
+++ b/addons/account/wizard/wizard_unreconcile_select.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_use_model.py b/addons/account/wizard/wizard_use_model.py
index 7d8b9cad12e..7ce32c6d330 100644
--- a/addons/account/wizard/wizard_use_model.py
+++ b/addons/account/wizard/wizard_use_model.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_validate_account_move.py b/addons/account/wizard/wizard_validate_account_move.py
index 3bce72005dc..11dcac86d53 100644
--- a/addons/account/wizard/wizard_validate_account_move.py
+++ b/addons/account/wizard/wizard_validate_account_move.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account/wizard/wizard_vat.py b/addons/account/wizard/wizard_vat.py
index da81b151c85..f9d015df336 100755
--- a/addons/account/wizard/wizard_vat.py
+++ b/addons/account/wizard/wizard_vat.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_analytic_analysis/__init__.py b/addons/account_analytic_analysis/__init__.py
index de86cfaa726..a7bdb11ad67 100644
--- a/addons/account_analytic_analysis/__init__.py
+++ b/addons/account_analytic_analysis/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_analytic_analysis/__terp__.py b/addons/account_analytic_analysis/__terp__.py
index 1967af9dab9..2f44e0cd62a 100644
--- a/addons/account_analytic_analysis/__terp__.py
+++ b/addons/account_analytic_analysis/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index bbd976f8c29..241ad071af1 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_analytic_analysis/i18n/pt_BR.po b/addons/account_analytic_analysis/i18n/pt_BR.po
index 867c74f0f7b..f9940e189b9 100644
--- a/addons/account_analytic_analysis/i18n/pt_BR.po
+++ b/addons/account_analytic_analysis/i18n/pt_BR.po
@@ -7,13 +7,13 @@ 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-30 02:49+0000\n"
+"PO-Revision-Date: 2010-01-16 12:06+0000\n"
 "Last-Translator: Carlos Paiva <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: 2009-12-31 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-01-17 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -46,7 +46,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
 msgid "All Analytic Accounts"
-msgstr ""
+msgstr "Todas as contas analíticas"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
@@ -62,7 +62,7 @@ msgstr "Invalido XML para Arquitetura da View"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
-msgstr ""
+msgstr "Data da última fatura criada para esta conta analítica."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -107,7 +107,7 @@ msgstr "Taxa de margem real (%)"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
 msgid "Current Analytic Accounts"
-msgstr ""
+msgstr "Contas analíticas atuais"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
@@ -276,7 +276,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Analytic accounts"
-msgstr ""
+msgstr "Contas analíticas"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
diff --git a/addons/account_analytic_default/__init__.py b/addons/account_analytic_default/__init__.py
index 269e08204ef..5206ec18324 100644
--- a/addons/account_analytic_default/__init__.py
+++ b/addons/account_analytic_default/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_analytic_default/__terp__.py b/addons/account_analytic_default/__terp__.py
index 6eeda12e5f1..9c3982990b3 100644
--- a/addons/account_analytic_default/__terp__.py
+++ b/addons/account_analytic_default/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -34,7 +34,7 @@ Allows to automatically select analytic accounts based on criterions:
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['account'],
+    'depends': ['account', 'sale'],
     'init_xml': [],
     'update_xml': ['security/ir.model.access.csv', 'account_analytic_default_view.xml'],
     'demo_xml': [],
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index cec8acaaaa0..f22e37e5e71 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -2,7 +2,7 @@
 ###############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -70,12 +70,51 @@ account_analytic_default()
 class account_invoice_line(osv.osv):
     _inherit = 'account.invoice.line'
     _description = 'account invoice line'
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition=False, price_unit=False, address_invoice_id=False, context=None):
+    
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition=False, price_unit=False, address_invoice_id=False, context={}):
         res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition, price_unit, address_invoice_id, context)
         rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context)
         if rec:
             res_prod['value'].update({'account_analytic_id':rec.analytic_id.id})
+        else:
+            res_prod['value'].update({'account_analytic_id':False})       
         return res_prod
 account_invoice_line()
 
+
+class stock_picking(osv.osv):
+    _inherit = "stock.picking"
+    
+    def _get_account_analytic_invoice(self, cursor, user, picking, move_line):
+        partner_id = picking.address_id and picking.address_id.partner_id or False
+        rec = self.pool.get('account.analytic.default').account_get(cursor, user, move_line.product_id.id, partner_id and partner_id.id, user, time.strftime('%Y-%m-%d'), context={})
+        
+        if rec:
+            return rec.analytic_id.id
+        
+        return super(stock_picking, self)._get_account_analytic_invoice(cursor,
+                user, picking, move_line)
+        
+stock_picking()
+
+class sale_order_line(osv.osv):
+    _inherit = 'sale.order.line'
+    
+    # Method overridden to set the analytic account by default on criterion match
+    def invoice_line_create(self, cr, uid, ids, context={}):
+        create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context)
+        sale_line_obj = self.browse(cr, uid, ids[0], context)
+        pool_inv_line = self.pool.get('account.invoice.line')
+        
+        for line in pool_inv_line.browse(cr, uid, create_ids, context):
+            rec = self.pool.get('account.analytic.default').account_get(cr, uid, line.product_id.id, sale_line_obj.order_id.partner_id.id, uid, time.strftime('%Y-%m-%d'), context)
+            
+            if rec:
+                pool_inv_line.write(cr, uid, [line.id], {'account_analytic_id':rec.analytic_id.id}, context=context)
+        return create_ids
+    
+sale_order_line()    
+     
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_default/i18n/pt_BR.po b/addons/account_analytic_default/i18n/pt_BR.po
index 2603c126454..d6ff082dac8 100644
--- a/addons/account_analytic_default/i18n/pt_BR.po
+++ b/addons/account_analytic_default/i18n/pt_BR.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:31+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-16 12:09+0000\n"
+"Last-Translator: Carlos Paiva <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: 2009-12-16 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-01-17 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -54,7 +54,7 @@ msgstr ""
 #. module: account_analytic_default
 #: field:account.analytic.default,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Empresa"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
@@ -69,7 +69,7 @@ msgstr ""
 #. module: account_analytic_default
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conta Analítica"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
diff --git a/addons/account_analytic_plans/__init__.py b/addons/account_analytic_plans/__init__.py
index 3eb68a6d6c6..213f9fe6da4 100644
--- a/addons/account_analytic_plans/__init__.py
+++ b/addons/account_analytic_plans/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_analytic_plans/__terp__.py b/addons/account_analytic_plans/__terp__.py
index 511b6571ec9..63b09bf1dc0 100644
--- a/addons/account_analytic_plans/__terp__.py
+++ b/addons/account_analytic_plans/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 8367adb20b3..51b37fdebb2 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -374,4 +374,25 @@ class analytic_default(osv.osv):
     }
 analytic_default()
 
+class sale_order_line(osv.osv):
+    _inherit = 'sale.order.line'
+
+    # Method overridden to set the analytic account by default on criterion match
+    def invoice_line_create(self, cr, uid, ids, context={}):
+        create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context)
+        if ids:
+            sale_line_obj = self.browse(cr, uid, ids[0], context)
+            pool_inv_line = self.pool.get('account.invoice.line')
+
+            for line in pool_inv_line.browse(cr, uid, create_ids, context):
+                rec = self.pool.get('account.analytic.default').account_get(cr, uid, line.product_id.id, sale_line_obj.order_id.partner_id.id, uid, time.strftime('%Y-%m-%d'), context)
+
+                if rec:
+                    pool_inv_line.write(cr, uid, [line.id], {'analytics_id':rec.analytics_id.id}, context=context)
+                    cr.commit()
+        return create_ids
+
+sale_order_line()
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_plans/i18n/cs.po b/addons/account_analytic_plans/i18n/cs.po
index 72bab96da5d..f1156f9adac 100644
--- a/addons/account_analytic_plans/i18n/cs.po
+++ b/addons/account_analytic_plans/i18n/cs.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 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-01-25 11:30+0000\n"
+"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-01-26 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -26,6 +26,7 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
 
 #. module: account_analytic_plans
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
@@ -41,7 +42,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,date2:0
 msgid "End Date"
-msgstr ""
+msgstr "Koncové datum"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
@@ -70,7 +71,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: wizard_button:wizard.crossovered.analytic,init,print:0
 msgid "Print"
-msgstr ""
+msgstr "Tisk"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -90,7 +91,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
-msgstr ""
+msgstr "Název účtu"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
@@ -105,7 +106,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Špatný název modelu v definici akce"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,name:0
@@ -146,7 +147,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "100.00%"
-msgstr ""
+msgstr "100.00%"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,ref:0
@@ -156,7 +157,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "Analytický účet :"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
@@ -171,7 +172,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.actions.wizard,name:account_analytic_plans.create_model
 msgid "Create Model"
-msgstr ""
+msgstr "Vytvořit model"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
@@ -214,7 +215,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Invalidní XML pro zobrazení architektury!"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
@@ -285,7 +286,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Amount"
-msgstr ""
+msgstr "Množství"
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
@@ -300,7 +301,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Quantity"
-msgstr ""
+msgstr "Počet"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
@@ -310,12 +311,12 @@ msgstr ""
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Code"
-msgstr ""
+msgstr "Kód"
 
 #. module: account_analytic_plans
 #: wizard_button:create.model,info,end:0
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
@@ -331,12 +332,12 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvence"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analytický účet"
 
 #. module: account_analytic_plans
 #: field:account.analytic.default,analytics_id:0
@@ -345,7 +346,7 @@ msgstr ""
 #: field:account.invoice.line,analytics_id:0
 #: field:account.move.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Analytická distribuce"
 
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
@@ -355,17 +356,17 @@ msgstr ""
 #. module: account_analytic_plans
 #: wizard_button:wizard.crossovered.analytic,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušit"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,date1:0
 msgid "Start Date"
-msgstr ""
+msgstr "Počáteční datum"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "at"
-msgstr ""
+msgstr "v"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index 0f02a6c2fc9..6aa5bae92e7 100644
--- a/addons/account_analytic_plans/i18n/fr.po
+++ b/addons/account_analytic_plans/i18n/fr.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-17 09:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-25 10:04+0000\n"
+"Last-Translator: TeMPO <info@tempo-consulting.fr>\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: 2009-12-16 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-01-26 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
 msgid "Account4 Id"
-msgstr "Identifiant du Compte4"
+msgstr "Compte de tiers"
 
 #. module: account_analytic_plans
 #: constraint:ir.model:0
diff --git a/addons/account_analytic_plans/report/__init__.py b/addons/account_analytic_plans/report/__init__.py
index 96d8899cb75..512ea3239d2 100644
--- a/addons/account_analytic_plans/report/__init__.py
+++ b/addons/account_analytic_plans/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index 198f6ca7c71..8f5d4b33317 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_analytic_plans/wizard/__init__.py b/addons/account_analytic_plans/wizard/__init__.py
index 0115243fffb..4b47827094b 100644
--- a/addons/account_analytic_plans/wizard/__init__.py
+++ b/addons/account_analytic_plans/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_analytic_plans/wizard/create_model.py b/addons/account_analytic_plans/wizard/create_model.py
index 60e6bec44e1..4c6ecce38c3 100644
--- a/addons/account_analytic_plans/wizard/create_model.py
+++ b/addons/account_analytic_plans/wizard/create_model.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py b/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py
index 58effcce3db..64da1b73b1d 100644
--- a/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_balance/__init__.py b/addons/account_balance/__init__.py
index ebb5997983a..2fff2acdd46 100644
--- a/addons/account_balance/__init__.py
+++ b/addons/account_balance/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_balance/__terp__.py b/addons/account_balance/__terp__.py
index 73e9ddbe0fc..7ee5c0f1dd7 100644
--- a/addons/account_balance/__terp__.py
+++ b/addons/account_balance/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_balance/account_move_line.py b/addons/account_balance/account_move_line.py
index 73441a3d104..293f561ced9 100644
--- a/addons/account_balance/account_move_line.py
+++ b/addons/account_balance/account_move_line.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_balance/i18n/gl.po b/addons/account_balance/i18n/gl.po
index ed598509cd8..3b7d18a5114 100644
--- a/addons/account_balance/i18n/gl.po
+++ b/addons/account_balance/i18n/gl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Project-Id-Version: account-balance-es\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:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-22 19:50+0000\n"
+"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-01-23 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
@@ -60,7 +60,7 @@ msgstr "Nome da conta"
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Debit"
-msgstr ""
+msgstr "Débito"
 
 #. module: account_balance
 #: wizard_button:account.balance.account.balance.report,init,checkyear:0
@@ -118,6 +118,24 @@ msgid ""
 "    5. You have an option to print the desired report in Landscape format.\n"
 "    "
 msgstr ""
+"O módulo de balance de contas é unha funcionalidade engadida ao módulo de "
+"xestión financieira.\n"
+"\n"
+"    Este módulo ofrece diversas opcións de impresión de balances.\n"
+"\n"
+"    1. Podese comparar o balance de distintos anos.\n"
+"\n"
+"    2. Pode establecer a comparación en importe ou porcentual entre dous "
+"anos.\n"
+"\n"
+"    3. Pode establecer a conta de referencia para a comparación porcentual "
+"para anos en particular.\n"
+"\n"
+"    4. Pode seleccionar períodos como unha data real ou períodos como data "
+"de creación.\n"
+"\n"
+"    5. Pode imprimir o informe que desexe en formato apaisado.\n"
+"    "
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -143,13 +161,13 @@ msgstr "Con balance se non é igual a 0"
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Account Balance -"
-msgstr ""
+msgstr "Balance de conta -"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
@@ -196,7 +214,7 @@ msgstr "Mostrar contas"
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Credit"
-msgstr ""
+msgstr "Crédito"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -206,13 +224,13 @@ msgstr "1. Debe seleccionar máis de 3 exercicios en calquera caso."
 #. module: account_balance
 #: model:ir.module.module,shortdesc:account_balance.module_meta_information
 msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "Xestión contable e financieira - Comparación de contas"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "Ano :"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -224,7 +242,7 @@ msgstr ""
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Balance"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
diff --git a/addons/account_balance/report/__init__.py b/addons/account_balance/report/__init__.py
index 78d65220081..44bf399e9da 100644
--- a/addons/account_balance/report/__init__.py
+++ b/addons/account_balance/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_balance/report/account_balance.py b/addons/account_balance/report/account_balance.py
index 4b8bdb5f3b8..49bcffd38d9 100644
--- a/addons/account_balance/report/account_balance.py
+++ b/addons/account_balance/report/account_balance.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_balance/report/account_balance_landscape.py b/addons/account_balance/report/account_balance_landscape.py
index 2a50d8b4af2..23c7e309b51 100644
--- a/addons/account_balance/report/account_balance_landscape.py
+++ b/addons/account_balance/report/account_balance_landscape.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_balance/report/rml_parse.py b/addons/account_balance/report/rml_parse.py
index d8f727d32fe..0fa382fbea4 100644
--- a/addons/account_balance/report/rml_parse.py
+++ b/addons/account_balance/report/rml_parse.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_balance/wizard/__init__.py b/addons/account_balance/wizard/__init__.py
index 64a19ada252..a61b6f88633 100644
--- a/addons/account_balance/wizard/__init__.py
+++ b/addons/account_balance/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_balance/wizard/wizard_account_balance_report.py b/addons/account_balance/wizard/wizard_account_balance_report.py
index 17924bb0511..e15f0514423 100644
--- a/addons/account_balance/wizard/wizard_account_balance_report.py
+++ b/addons/account_balance/wizard/wizard_account_balance_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_budget/__init__.py b/addons/account_budget/__init__.py
index 6a6e3395d08..4330278d2be 100644
--- a/addons/account_budget/__init__.py
+++ b/addons/account_budget/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_budget/__terp__.py b/addons/account_budget/__terp__.py
index 1ca1a2b29fe..7a5e9b74ce4 100644
--- a/addons/account_budget/__terp__.py
+++ b/addons/account_budget/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_budget/crossovered_budget.py b/addons/account_budget/crossovered_budget.py
index 696461fc121..6ac17d59863 100644
--- a/addons/account_budget/crossovered_budget.py
+++ b/addons/account_budget/crossovered_budget.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index a8d03be8aa4..86516f35bfa 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -7,7 +7,7 @@
             <field name="res_model">account.budget.post</field>
             <field name="view_type">tree</field>
         </record>
-        <menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_reporting"/>
+        <menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>
 
         <!--
     Budgets
@@ -57,8 +57,8 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_budget_post_tree"/>
         </record>
-        <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance"/>
-        <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_31"/>
+        <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="5"/>
+        <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_31" sequence="2"/>
 
 
         <record model="ir.ui.view" id="view_budget_post_form">
@@ -70,7 +70,7 @@
                     <field name="name" select="1"/>
                     <field name="code" select="1"/>
                     <field name="company_id"  groups="base.group_multi_company"/>
-                    <field name="sequence" select="2"/>                    
+                    <field name="sequence" select="2"/>
                     <notebook colspan="4">
                         <page string="Accounts">
                             <field name="account_ids" colspan="4" nolabel="1"/>
@@ -187,7 +187,7 @@
         </record>
         <menuitem parent="next_id_31"
             id="menu_act_crossovered_budget_view"
-            action="act_crossovered_budget_view" />
+            action="act_crossovered_budget_view" sequence="1" />
 
         <record model="ir.ui.view" id="view_crossovered_budget_line_tree">
             <field name="name">crossovered.budget.line.tree</field>
diff --git a/addons/account_budget/report/__init__.py b/addons/account_budget/report/__init__.py
index 6786cf29519..085b4262b6c 100644
--- a/addons/account_budget/report/__init__.py
+++ b/addons/account_budget/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_budget/report/analytic_account_budget_report.py b/addons/account_budget/report/analytic_account_budget_report.py
index 30f193d91cd..7be79fc64b5 100644
--- a/addons/account_budget/report/analytic_account_budget_report.py
+++ b/addons/account_budget/report/analytic_account_budget_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py
index 054cbc8b185..59895ed3321 100644
--- a/addons/account_budget/report/budget_report.py
+++ b/addons/account_budget/report/budget_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py
index 7e8fbfce115..c7a95585aa2 100644
--- a/addons/account_budget/report/crossovered_budget_report.py
+++ b/addons/account_budget/report/crossovered_budget_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_budget/wizard/__init__.py b/addons/account_budget/wizard/__init__.py
index d8fd43a48c8..e174db2695c 100644
--- a/addons/account_budget/wizard/__init__.py
+++ b/addons/account_budget/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_budget/wizard/wizard_analytic_account_budget.py b/addons/account_budget/wizard/wizard_analytic_account_budget.py
index 56b1204d0dc..a8d6fb27c06 100644
--- a/addons/account_budget/wizard/wizard_analytic_account_budget.py
+++ b/addons/account_budget/wizard/wizard_analytic_account_budget.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_budget/wizard/wizard_budget_report.py b/addons/account_budget/wizard/wizard_budget_report.py
index f641b64e5b0..544a401546b 100644
--- a/addons/account_budget/wizard/wizard_budget_report.py
+++ b/addons/account_budget/wizard/wizard_budget_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_budget/wizard/wizard_budget_spread.py b/addons/account_budget/wizard/wizard_budget_spread.py
index e7acbd7e3b3..31c4e8fb76f 100644
--- a/addons/account_budget/wizard/wizard_budget_spread.py
+++ b/addons/account_budget/wizard/wizard_budget_spread.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_budget/wizard/wizard_crossovered_budget_report.py b/addons/account_budget/wizard/wizard_crossovered_budget_report.py
index a100ff418e1..2737798e7fe 100644
--- a/addons/account_budget/wizard/wizard_crossovered_budget_report.py
+++ b/addons/account_budget/wizard/wizard_crossovered_budget_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py b/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py
index 315da4504bd..cbca68165b6 100644
--- a/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py
+++ b/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_chart/__init__.py b/addons/account_chart/__init__.py
index 0d29405d526..2aefd8b3c11 100644
--- a/addons/account_chart/__init__.py
+++ b/addons/account_chart/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_chart/__terp__.py b/addons/account_chart/__terp__.py
index 9682b8be0a0..ca1c4a71351 100644
--- a/addons/account_chart/__terp__.py
+++ b/addons/account_chart/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_chart/i18n/bs.po b/addons/account_chart/i18n/bs.po
index 8fc25599a93..aec00c9495d 100644
--- a/addons/account_chart/i18n/bs.po
+++ b/addons/account_chart/i18n/bs.po
@@ -7,16 +7,16 @@ 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-12-25 05:18+0000\n"
-"Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
+"PO-Revision-Date: 2010-01-14 14:25+0000\n"
+"Last-Translator: Bojan Markovic <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: 2009-12-26 04:34+0000\n"
+"X-Launchpad-Export-Date: 2010-01-15 04:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr "Ukloni minimalnu tablicu računa"
+msgstr "Ukloni minimalni kontni plan"
diff --git a/addons/account_date_check/__init__.py b/addons/account_date_check/__init__.py
index 799f3a46fbe..cf10f590e86 100644
--- a/addons/account_date_check/__init__.py
+++ b/addons/account_date_check/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_date_check/__terp__.py b/addons/account_date_check/__terp__.py
index 52d6b1e9a8e..ccac5f6fcbd 100644
--- a/addons/account_date_check/__terp__.py
+++ b/addons/account_date_check/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_date_check/account_date_check.py b/addons/account_date_check/account_date_check.py
index 2c4d96dd040..814f4e3b3c3 100644
--- a/addons/account_date_check/account_date_check.py
+++ b/addons/account_date_check/account_date_check.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_date_check/i18n/lt.po b/addons/account_date_check/i18n/lt.po
index fc4b2f0fdf2..6cb3f7303a1 100644
--- a/addons/account_date_check/i18n/lt.po
+++ b/addons/account_date_check/i18n/lt.po
@@ -7,19 +7,19 @@ 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:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-01-20 14:02+0000\n"
+"Last-Translator: Paulius Sladkevičius <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: 2009-12-16 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-01-22 04:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Netinkamas XML peržiūros struktūrai!"
 
 #. module: account_date_check
 #: field:account.journal,allow_date:0
diff --git a/addons/account_followup/__init__.py b/addons/account_followup/__init__.py
index fb1a2484931..3065bef0130 100644
--- a/addons/account_followup/__init__.py
+++ b/addons/account_followup/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_followup/__terp__.py b/addons/account_followup/__terp__.py
index 615da0fc247..652c94a49a8 100644
--- a/addons/account_followup/__terp__.py
+++ b/addons/account_followup/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_followup/followup.py b/addons/account_followup/followup.py
index cdef39b9414..5eaa2a4e25a 100644
--- a/addons/account_followup/followup.py
+++ b/addons/account_followup/followup.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_followup/followup_report.py b/addons/account_followup/followup_report.py
index dc29e5a7d2e..79cd6006e2b 100644
--- a/addons/account_followup/followup_report.py
+++ b/addons/account_followup/followup_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_followup/report/__init__.py b/addons/account_followup/report/__init__.py
index d77b92544e6..637237095a5 100644
--- a/addons/account_followup/report/__init__.py
+++ b/addons/account_followup/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_followup/report/report_followup_print.py b/addons/account_followup/report/report_followup_print.py
index ff06afa5bb8..28ec97f51fa 100644
--- a/addons/account_followup/report/report_followup_print.py
+++ b/addons/account_followup/report/report_followup_print.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_followup/wizard/__init__.py b/addons/account_followup/wizard/__init__.py
index bd912feea0c..fd936d6faa7 100644
--- a/addons/account_followup/wizard/__init__.py
+++ b/addons/account_followup/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py
index a2330171682..2f82ec6ba60 100644
--- a/addons/account_followup/wizard/wizard_followup_print.py
+++ b/addons/account_followup/wizard/wizard_followup_print.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -125,12 +125,13 @@ class followup_all_print(wizard.interface):
     def _update_partners(self, cr, uid, data, context):
         to_update = data['form']['to_update']
         for id in to_update.keys():
-            cr.execute(
-                "UPDATE account_move_line "\
-                "SET followup_line_id=%s, followup_date=%s "\
-                "WHERE id=%s",
-                (to_update[id],
-                data['form']['date'], int(id),))
+            if to_update[id]['partner_id'] in data['form']['partner_ids'][0][2]:
+                cr.execute(
+                    "UPDATE account_move_line "\
+                    "SET followup_line_id=%s, followup_date=%s "\
+                    "WHERE id=%s",
+                    (to_update[id]['level'],
+                    data['form']['date'], int(id),))
         return {}
 
     def _sendmail(self ,cr, uid, data, context):
@@ -263,12 +264,12 @@ class followup_all_print(wizard.interface):
                 if date_maturity <= fups[followup_line_id][0].strftime('%Y-%m-%d'):
                     if partner_id not in partner_list:
                         partner_list.append(partner_id)
-                    to_update[str(id)] = fups[followup_line_id][1]
+                    to_update[str(id)]= {'level': fups[followup_line_id][1], 'partner_id': partner_id}
             elif date and date <= fups[followup_line_id][0].strftime('%Y-%m-%d'):
                 if partner_id not in partner_list:
                     partner_list.append(partner_id)
-                to_update[str(id)] = fups[followup_line_id][1]
-
+                to_update[str(id)]= {'level': fups[followup_line_id][1], 'partner_id': partner_id}
+        
         message = pool.get('res.users').browse(cr, uid, uid, context=context).company_id.follow_up_msg
 
         return {'partner_ids': partner_list, 'to_update': to_update, 'email_body':message}
diff --git a/addons/account_invoice_layout/__init__.py b/addons/account_invoice_layout/__init__.py
index dadb01dd5a1..89827ee40ad 100644
--- a/addons/account_invoice_layout/__init__.py
+++ b/addons/account_invoice_layout/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_invoice_layout/__terp__.py b/addons/account_invoice_layout/__terp__.py
index 5b44f2edde6..5ba6a9291f4 100644
--- a/addons/account_invoice_layout/__terp__.py
+++ b/addons/account_invoice_layout/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
index e6e7590a00a..58f7721d253 100644
--- a/addons/account_invoice_layout/account_invoice_layout.py
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_invoice_layout/report/__init__.py b/addons/account_invoice_layout/report/__init__.py
index 7c59947d74f..e230470b87f 100644
--- a/addons/account_invoice_layout/report/__init__.py
+++ b/addons/account_invoice_layout/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.py b/addons/account_invoice_layout/report/report_account_invoice_layout.py
index 430a06fa092..6f8070306e5 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.py
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_invoice_layout/report/special_message_invoice.py b/addons/account_invoice_layout/report/special_message_invoice.py
index cf57eb812d8..eb9a5859753 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.py
+++ b/addons/account_invoice_layout/report/special_message_invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_invoice_layout/wizard/__init__.py b/addons/account_invoice_layout/wizard/__init__.py
index 625b50f3fc8..62b012d0a5e 100644
--- a/addons/account_invoice_layout/wizard/__init__.py
+++ b/addons/account_invoice_layout/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_invoice_layout/wizard/invoice_special_message.py b/addons/account_invoice_layout/wizard/invoice_special_message.py
index a1a27527b2a..a97b3a144b0 100644
--- a/addons/account_invoice_layout/wizard/invoice_special_message.py
+++ b/addons/account_invoice_layout/wizard/invoice_special_message.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_payment/__init__.py b/addons/account_payment/__init__.py
index 5ca3e70f4ba..3724590e5f5 100644
--- a/addons/account_payment/__init__.py
+++ b/addons/account_payment/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_payment/__terp__.py b/addons/account_payment/__terp__.py
index 98676f18270..aa0829b689a 100644
--- a/addons/account_payment/__terp__.py
+++ b/addons/account_payment/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py
index e05db0a4414..4b2824103f4 100644
--- a/addons/account_payment/account_invoice.py
+++ b/addons/account_payment/account_invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index eb612148d99..0c7f61928c3 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -46,7 +46,7 @@ class account_move_line(osv.osv):
         r=dict(cr.fetchall())
         return r
 
-    def _to_pay_search(self, cr, uid, obj, name, args):
+    def _to_pay_search(self, cr, uid, obj, name, args, context):
         if not len(args):
             return []
         line_obj = self.pool.get('account.move.line')
diff --git a/addons/account_payment/payment.py b/addons/account_payment/payment.py
index f03fda163c9..b52576f5be7 100644
--- a/addons/account_payment/payment.py
+++ b/addons/account_payment/payment.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index 863cd0ed5fb..cf481f5aa39 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -36,7 +36,7 @@
             </field>
         </record>
 
-        <menuitem id="menu_main" name="Payment" parent="account.menu_finance"/>
+        <menuitem id="menu_main" name="Payment" parent="account.menu_finance" sequence="6"/>
 
         <record id="view_payment_type_form" model="ir.ui.view">
             <field name="name">payment.type.form</field>
@@ -51,7 +51,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="action_payment_type_tree" model="ir.actions.act_window">
             <field name="name">Payment Type</field>
             <field name="res_model">payment.type</field>
@@ -91,11 +91,11 @@
         </record>
 
 		<menuitem id="next_id_44" name="Payment" parent="account.menu_finance_configuration"/>
-        
+
         <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="next_id_44"/>
-        
+
         <menuitem action="action_payment_type_tree" id="menu_action_paymen_type" parent="next_id_44"/>
-        
+
         <record id="view_payment_order_form" model="ir.ui.view">
             <field name="name">payment.order.form</field>
             <field name="model">payment.order</field>
@@ -144,7 +144,7 @@
                                 </page>
                             </notebook>
                         </form>
-                        <tree string="Payment Line"> 
+                        <tree string="Payment Line">
                             <field name="ml_inv_ref" />
                             <field name="partner_id" select="1"/>
                             <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
@@ -201,7 +201,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft')]</field>
-            <field name="filter" eval="True"/>            
+            <field name="filter" eval="True"/>
         </record>
 
         <record id="action_payment_order_open" model="ir.actions.act_window">
@@ -210,7 +210,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','open')]</field>
-            <field name="filter" eval="True"/>            
+            <field name="filter" eval="True"/>
         </record>
         <record id="action_payment_order_tree_new" model="ir.actions.act_window">
             <field name="name">New Payment Order</field>
@@ -269,7 +269,7 @@
             <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Payment Line"> 
+                <tree string="Payment Line">
                     <field name="order_id"/>
                     <field name="ml_inv_ref" />
                     <field name="ml_maturity_date"/>
diff --git a/addons/account_payment/report/__init__.py b/addons/account_payment/report/__init__.py
index c7ea2c1b51e..5a5c1dab1f2 100644
--- a/addons/account_payment/report/__init__.py
+++ b/addons/account_payment/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py
index be1c5c21ee5..9bbf32afc26 100644
--- a/addons/account_payment/report/payment_order.py
+++ b/addons/account_payment/report/payment_order.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_payment/wizard/__init__.py b/addons/account_payment/wizard/__init__.py
index fa654ce0581..6254c9f5794 100644
--- a/addons/account_payment/wizard/__init__.py
+++ b/addons/account_payment/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_payment/wizard/wizard_pay.py b/addons/account_payment/wizard/wizard_pay.py
index 2ad867d92f0..7380cadb685 100644
--- a/addons/account_payment/wizard/wizard_pay.py
+++ b/addons/account_payment/wizard/wizard_pay.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_payment/wizard/wizard_payment_order.py b/addons/account_payment/wizard/wizard_payment_order.py
index 3fedbb652ef..7caa72dc666 100644
--- a/addons/account_payment/wizard/wizard_payment_order.py
+++ b/addons/account_payment/wizard/wizard_payment_order.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_payment/wizard/wizard_populate_statement.py b/addons/account_payment/wizard/wizard_populate_statement.py
index 769c7501b72..f58407ad4b2 100644
--- a/addons/account_payment/wizard/wizard_populate_statement.py
+++ b/addons/account_payment/wizard/wizard_populate_statement.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_report/__init__.py b/addons/account_report/__init__.py
index 8767a6df9f5..9cfe4eb8249 100644
--- a/addons/account_report/__init__.py
+++ b/addons/account_report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_report/__terp__.py b/addons/account_report/__terp__.py
index 2549b7b089f..2982c8439c4 100644
--- a/addons/account_report/__terp__.py
+++ b/addons/account_report/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_report/account.py b/addons/account_report/account.py
index c4be180043e..7a6d65878f0 100644
--- a/addons/account_report/account.py
+++ b/addons/account_report/account.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_report/account_view.xml b/addons/account_report/account_view.xml
index ff144d6f0c2..1ed898dd02d 100644
--- a/addons/account_report/account_view.xml
+++ b/addons/account_report/account_view.xml
@@ -91,7 +91,7 @@
             <field name="view_id" ref="view_account_report_tree_simple"/>
         </record>
 
-        <menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="account.menu_finance_configuration"/>
+        <menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="account.menu_finance_configuration" sequence="20"/>
 
         <record id="view_account_report_tree" model="ir.ui.view">
             <field name="name">account.report.report.tree</field>
@@ -116,7 +116,7 @@
             <field name="view_id" ref="view_account_report_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem action="action_account_report_tree_view" id="menu_action_account_report_tree_view" parent="account.menu_finance_reporting"/>
+        <menuitem action="action_account_report_tree_view" id="menu_action_account_report_tree_view" parent="account.menu_finance_generic_reporting" sequence="5"/>
 
 
         <record id="action_account_report_tree_view_fiscal" model="ir.actions.act_window">
diff --git a/addons/account_report/report/__init__.py b/addons/account_report/report/__init__.py
index b7a1d92c5b3..27ab1f7ac2a 100644
--- a/addons/account_report/report/__init__.py
+++ b/addons/account_report/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_report/report/accounting_report.py b/addons/account_report/report/accounting_report.py
index 159b7b5c631..1bb6e7bbab8 100644
--- a/addons/account_report/report/accounting_report.py
+++ b/addons/account_report/report/accounting_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_report/report/print_indicator.py b/addons/account_report/report/print_indicator.py
index 10ac0fe9226..3c4af0ae5c5 100644
--- a/addons/account_report/report/print_indicator.py
+++ b/addons/account_report/report/print_indicator.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_report/wizard/__init__.py b/addons/account_report/wizard/__init__.py
index e2daf9d62b2..66a127f8278 100644
--- a/addons/account_report/wizard/__init__.py
+++ b/addons/account_report/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_report/wizard/wizard_print_indicators.py b/addons/account_report/wizard/wizard_print_indicators.py
index 9b8e55eeb43..b2c20046e8d 100644
--- a/addons/account_report/wizard/wizard_print_indicators.py
+++ b/addons/account_report/wizard/wizard_print_indicators.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_report/wizard/wizard_print_indicators_with_pdf.py b/addons/account_report/wizard/wizard_print_indicators_with_pdf.py
index 45298a6f56a..762e1258233 100644
--- a/addons/account_report/wizard/wizard_print_indicators_with_pdf.py
+++ b/addons/account_report/wizard/wizard_print_indicators_with_pdf.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_reporting/__init__.py b/addons/account_reporting/__init__.py
index bb296e9d08a..65ca37b6d51 100644
--- a/addons/account_reporting/__init__.py
+++ b/addons/account_reporting/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_reporting/__terp__.py b/addons/account_reporting/__terp__.py
index ac20e74b52f..d58fd77846e 100644
--- a/addons/account_reporting/__terp__.py
+++ b/addons/account_reporting/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account.py
index df915ad1601..ad1ce59f769 100644
--- a/addons/account_reporting/account.py
+++ b/addons/account_reporting/account.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_reporting/report/__init__.py b/addons/account_reporting/report/__init__.py
index 557dd546f2e..54b87c670a9 100644
--- a/addons/account_reporting/report/__init__.py
+++ b/addons/account_reporting/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_reporting/report/account_report_bs.py b/addons/account_reporting/report/account_report_bs.py
index 8dc45af9519..ba097cea8e5 100644
--- a/addons/account_reporting/report/account_report_bs.py
+++ b/addons/account_reporting/report/account_report_bs.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_reporting/wizard/__init__.py b/addons/account_reporting/wizard/__init__.py
index 64a19ada252..a61b6f88633 100644
--- a/addons/account_reporting/wizard/__init__.py
+++ b/addons/account_reporting/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_reporting/wizard/wizard_account_balance_report.py b/addons/account_reporting/wizard/wizard_account_balance_report.py
index 28802d016f1..4496ff7a56d 100644
--- a/addons/account_reporting/wizard/wizard_account_balance_report.py
+++ b/addons/account_reporting/wizard/wizard_account_balance_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_tax_include/__init__.py b/addons/account_tax_include/__init__.py
index c34bb39b155..f239c0211d0 100644
--- a/addons/account_tax_include/__init__.py
+++ b/addons/account_tax_include/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_tax_include/__terp__.py b/addons/account_tax_include/__terp__.py
index 0d32ccc3821..c173a85592c 100644
--- a/addons/account_tax_include/__terp__.py
+++ b/addons/account_tax_include/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_tax_include/invoice_tax_incl.py b/addons/account_tax_include/invoice_tax_incl.py
index ec0309aa2f4..f47c587babc 100644
--- a/addons/account_tax_include/invoice_tax_incl.py
+++ b/addons/account_tax_include/invoice_tax_incl.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -23,6 +23,7 @@ import time
 import netsvc
 from osv import fields, osv
 import ir
+from tools import config
 
 class account_invoice(osv.osv):
     _inherit = "account.invoice"
@@ -45,7 +46,9 @@ class account_invoice_line(osv.osv):
         """
         res = {}
         tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids):
+            cur = line.invoice_id and line.invoice_id.currency_id or False
             res_init = super(account_invoice_line, self)._amount_line(cr, uid, [line.id], name, args, context)
             res[line.id] = {
                 'price_subtotal': 0.0,
@@ -63,13 +66,13 @@ class account_invoice_line(osv.osv):
                         product_taxes = filter(lambda x: x.price_include, line.product_id.supplier_taxes_id)
 
                 if ((set(product_taxes) == set(line.invoice_line_tax_id)) or not product_taxes) and (line.invoice_id.price_type == 'tax_included'):
-                    res[line.id]['price_subtotal_incl'] = res_init[line.id]
+                    res[line.id]['price_subtotal_incl'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
                 else:
-                    res[line.id]['price_subtotal'] = res_init[line.id]
+                    res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
                     for tax in tax_obj.compute_inv(cr, uid, product_taxes, res_init[line.id]/line.quantity, line.quantity):
-                        res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - round(tax['amount'], 2)
+                        res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - round(tax['amount'], int(config['price_accuracy']))
             else:
-                res[line.id]['price_subtotal'] = res_init[line.id]
+                res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
 
             if res[line.id]['price_subtotal']:
                 res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal']
@@ -82,8 +85,8 @@ class account_invoice_line(osv.osv):
                     res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - tax['amount']
                     res[line.id]['data'].append( tax)
 
-        res[line.id]['price_subtotal']= round(res[line.id]['price_subtotal'], 2)
-        res[line.id]['price_subtotal_incl']= round(res[line.id]['price_subtotal_incl'], 2)
+        res[line.id]['price_subtotal']= round(res[line.id]['price_subtotal'], int(config['price_accuracy']))
+        res[line.id]['price_subtotal_incl']= round(res[line.id]['price_subtotal_incl'], int(config['price_accuracy']))
         return res
 
     def _price_unit_default(self, cr, uid, context=None):
diff --git a/addons/account_voucher/__init__.py b/addons/account_voucher/__init__.py
index 4906726cf39..8a2c3e40699 100755
--- a/addons/account_voucher/__init__.py
+++ b/addons/account_voucher/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_voucher/__terp__.py b/addons/account_voucher/__terp__.py
index ce5705560f7..242cc5fb391 100755
--- a/addons/account_voucher/__terp__.py
+++ b/addons/account_voucher/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_voucher/account.py b/addons/account_voucher/account.py
index e5cd6a051c2..ec886bef6c6 100644
--- a/addons/account_voucher/account.py
+++ b/addons/account_voucher/account.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -28,7 +28,7 @@ import mx.DateTime
 from mx.DateTime import RelativeDateTime
 from tools import config
 
-class Account(osv.osv):
+class account_account(osv.osv):
     _inherit = "account.account"
     
     def _get_level(self, cr, uid, ids, field_name, arg, context={}):
@@ -108,7 +108,7 @@ class Account(osv.osv):
              vals['type1'] = 'none'
         journal_ids=self.pool.get('account.journal').search(cr,uid,[('name','=','Opening Journal')])
         vals['journal_id'] = journal_ids and journal_ids[0] or False
-        account_id = super(Account, self).create(cr, uid, vals, context)
+        account_id = super(account_account, self).create(cr, uid, vals, context)
         if vals.get('type1', False) != False:
             journal_id = vals.get('journal_id',False)
             if journal_id and vals.has_key('open_bal'):
@@ -157,7 +157,7 @@ class Account(osv.osv):
                  vals['type1'] = 'cr'
             else:
                  vals['type1'] = 'none'
-        super(Account, self).write(cr, uid,ids, vals, context)
+        super(account_account, self).write(cr, uid,ids, vals, context)
         if vals.has_key('open_bal'):
             self_obj= self.browse(cr,uid,ids)
             move_pool=self.pool.get('account.move')
@@ -213,16 +213,16 @@ class Account(osv.osv):
         return {
             'value' : {'type1' : type1}
     }
-Account()
+account_account()
 
-class AccountMove(osv.osv):
+class account_move(osv.osv):
     _inherit = "account.move"
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'narration':fields.text('Narration', readonly=True, select=True, states={'draft':[('readonly',False)]}),
     }
 
-AccountMove()
+account_move()
 
 class res_currency(osv.osv):
     _inherit = "res.currency"
diff --git a/addons/account_voucher/report/__init__.py b/addons/account_voucher/report/__init__.py
index fa2e8d2fb33..a59ff9c9250 100755
--- a/addons/account_voucher/report/__init__.py
+++ b/addons/account_voucher/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_voucher/report/report_voucher.py b/addons/account_voucher/report/report_voucher.py
index 6c38f6ab1c3..de30a3d11e2 100755
--- a/addons/account_voucher/report/report_voucher.py
+++ b/addons/account_voucher/report/report_voucher.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_voucher/report/report_voucher.rml b/addons/account_voucher/report/report_voucher.rml
index 9be52c064d7..93b767e5416 100755
--- a/addons/account_voucher/report/report_voucher.rml
+++ b/addons/account_voucher/report/report_voucher.rml
@@ -30,7 +30,7 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
+    <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
@@ -63,26 +63,29 @@
     <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P13" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P18" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P19" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P20" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P21" fontName="Helvetica" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P22" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P23" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P24" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P25" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P27" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P28" rightIndent="0.0" leftIndent="15.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P30" rightIndent="0.0" leftIndent="20.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P31" rightIndent="0.0" leftIndent="25.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P19" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P20" fontName="Helvetica" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P21" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P22" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P24" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P25" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P26" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P27" rightIndent="0.0" leftIndent="71.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P28" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P29" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P30" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P31" fontName="Helvetica" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P32" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P33" rightIndent="0.0" leftIndent="71.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
     <paraStyle name="Standard" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -91,27 +94,76 @@
     <paraStyle name="Index" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
     <paraStyle name="Table Contents" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Table Heading" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="CENTER" 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="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" 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="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_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="Drawing" fontName="Times-Italic" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
   </stylesheet>
   <images/>
   <story>
-    <para style="P26">[[ repeatIn(objects,'voucher') ]]</para>
+    <para style="P29">[[ repeatIn(objects,'voucher') ]]</para>
     <para style="P4">[[ company.name ]]</para>
-    <para style="P6">[[ company.partner_id.address and company.partner_id.address[0].street ]], [[ company.partner_id.address and company.partner_id.address[0].street2 ]]</para>
+    <para style="P6">[[ company.partner_id.address and company.partner_id.address[0].street ]]</para>
     <para style="P6">[[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]</para>
     <para style="P6">[[ company.partner_id.address and company.partner_id.address[0].phone ]]</para>
     <para style="P6">[[ company.partner_id.address and company.partner_id.address[0].email ]]</para>
-    <para style="P24">Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+    <para style="P23">Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]]</para>
     <para style="P2">Cash Payment Voucher [[ (voucher.type == 'pay_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P24">Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P23">Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]</para>
     <para style="P2">Bank Payment Voucher [[ (voucher.type == 'bank_pay_voucher' or removeParentNode('para')) and '' ]]</para>
-    
+    <para style="P22">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="49.0,143.0,116.0,69.0,106.0" style="Table1">
       <tr>
         <td>
           <para style="P10">No.</para>
         </td>
         <td>
-          <para style="P27">[[ voucher.number ]]</para>
+          <para style="P11">[[ voucher.number ]]</para>
         </td>
         <td>
           <para style="P3">
@@ -122,7 +174,7 @@
           <para style="P10">Dated :</para>
         </td>
         <td>
-          <para style="P27">[[ time.strftime('%d %B,%Y', time.strptime(voucher.date , '%Y-%m-%d')) or '' ]]</para>
+          <para style="P11">[[ time.strftime('%d %B,%Y', time.strptime(voucher.date , '%Y-%m-%d')) or '' ]]</para>
         </td>
       </tr>
       <tr>
@@ -130,10 +182,10 @@
           <para style="P10">State :</para>
         </td>
         <td>
-          <para style="P25">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
-          <para style="P25">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
-          <para style="P25">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
-          <para style="P25">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
+          <para style="P21">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
+          <para style="P21">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+          <para style="P21">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
+          <para style="P21">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
         </td>
         <td>
           <para style="P3">
@@ -144,51 +196,58 @@
           <para style="P10">Ref. :</para>
         </td>
         <td>
-          <para style="P27">[[ voucher.reference ]]</para>
+          <para style="P11">[[ voucher.reference ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P12">
+    <para style="P13">
       <font color="white"> </font>
     </para>
-    <para style="P12">
+    <para style="P13">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="255.0,114.0,114.0" style="Heading1">
       <tr>
         <td>
-          <para style="P14">Particulars</para>
+          <para style="P15">Particulars</para>
         </td>
         <td>
-          <para style="P15">Debit</para>
+          <para style="P16">Debit</para>
         </td>
         <td>
-          <para style="P15">Credit</para>
+          <para style="P16">Credit</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P19"/>
+    <para style="terp_default_1"/>
     <blockTable colWidths="482.0" style="voucher_lines">
       <tr>
         <td>
-          <para style="P20">[[ repeatIn(voucher.move_ids,'move_ids') ]] </para>
-          <blockTable colWidths="251.0,110.0,115.0" style="Table2">
-            <tr>
-              <td>
-                <para style="P11">[[ (move_ids.partner_id and move_ids.partner_id.name) or 'Account']] :</para>
-                <para style="P28">[[ move_ids.account_id.name ]] </para>
-                <para style="P28"><i>[[ move_ids.name ]] - [[ get_ref(voucher.id,move_ids) ]]</i></para>
-                <!--para style="P31">[[ get_ref(voucher.id,move_ids) ]]</para-->
-              </td>
-              <td>
-                <para style="P21">[[ move_ids.debit ]]</para>
-              </td>
-              <td>
-                <para style="P21">[[ move_ids.credit ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <para style="P22">
+          <para style="terp_default_1">
+            <font color="white"> </font>
+          </para>
+          <section>
+            <para style="terp_default_8">[[ repeatIn(voucher.move_ids,'move_ids') ]] </para>
+            <blockTable colWidths="251.0,114.0,111.0" style="Table4">
+              <tr>
+                <td>
+                  <para style="P12">[[ (move_ids.partner_id and move_ids.partner_id.name) or '']] :</para>
+                  <para style="P24">[[ move_ids.account_id.name ]] </para>
+                  <para style="P27">[[ get_ref(voucher.id,move_ids) ]]</para>
+                </td>
+                <td>
+                  <para style="P20">[[ move_ids.debit ]]</para>
+                </td>
+                <td>
+                  <para style="P20">[[ move_ids.credit ]]</para>
+                </td>
+              </tr>
+            </blockTable>
+            <para style="terp_default_1">
+              <font color="white"> </font>
+            </para>
+          </section>
+          <para style="P28">
             <font color="white"> </font>
           </para>
         </td>
@@ -197,7 +256,7 @@
     <blockTable colWidths="253.0,114.0,114.0" style="last_info">
       <tr>
         <td>
-          <para style="P13">
+          <para style="P14">
             <font color="white"> </font>
           </para>
         </td>
@@ -214,7 +273,7 @@
       </tr>
       <tr>
         <td>
-          <para style="P13">Through : </para>
+          <para style="P14">Through : </para>
         </td>
         <td>
           <para style="P3">
@@ -229,7 +288,7 @@
       </tr>
       <tr>
         <td>
-          <para style="P30">[[ voucher.narration or '']]</para>
+          <para style="P25">[[ voucher.narration or '']]</para>
         </td>
         <td>
           <para style="P3">
@@ -244,7 +303,7 @@
       </tr>
       <tr>
         <td>
-          <para style="P13">On Account of : </para>
+          <para style="P14">On Account of : </para>
         </td>
         <td>
           <para style="P3">
@@ -259,7 +318,7 @@
       </tr>
       <tr>
         <td>
-          <para style="P30">[[ voucher.name ]]</para>
+          <para style="P26">[[ voucher.name ]]</para>
         </td>
         <td>
           <para style="P3">
@@ -274,7 +333,22 @@
       </tr>
       <tr>
         <td>
-          <para style="P13">Amount (in words) : </para>
+          <para style="P14">Amount (in words) : </para>
+        </td>
+        <td>
+          <para style="P14">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P14">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P26">[[ convert(voucher.amount,voucher.currency_id.name) ]]</para>
         </td>
         <td>
           <para style="P13">
@@ -289,34 +363,19 @@
       </tr>
       <tr>
         <td>
-          <para style="P30">[[ convert(voucher.amount,voucher.currency_id.name) ]]</para>
-        </td>
-        <td>
-          <para style="P12">
+          <para style="P17">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P12">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P16">
-            <font color="white"> </font>
-          </para>
+          <para style="P18">[[ debit(voucher.move_ids)]]</para>
         </td>
         <td>
-          <para style="P17">[[ debit(voucher.move_ids)]]</para>
-        </td>
-        <td>
-          <para style="P17">[[ credit(voucher.move_ids) ]]</para>
+          <para style="P18">[[ credit(voucher.move_ids) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P18">
+    <para style="P19">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="142.0,99.0,105.0,136.0" style="Table3">
@@ -353,20 +412,20 @@
       </tr>
       <tr>
         <td>
-          <para style="P23"><i>Receiver's Signature</i></para>
+          <para style="P22">Receiver's Signature</para>
         </td>
         <td>
-          <para style="P23">
+          <para style="P22">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P23">
+          <para style="P22">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P23"><i>Authorised Signatory</i></para>
+          <para style="P22">Authorised Signatory</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account_voucher/report/report_voucher_amount.py b/addons/account_voucher/report/report_voucher_amount.py
index 9a271fa39ba..819c59b4391 100755
--- a/addons/account_voucher/report/report_voucher_amount.py
+++ b/addons/account_voucher/report/report_voucher_amount.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_voucher/report/report_voucher_amount.rml b/addons/account_voucher/report/report_voucher_amount.rml
index bcc47fa6434..d8175fe3b58 100755
--- a/addons/account_voucher/report/report_voucher_amount.rml
+++ b/addons/account_voucher/report/report_voucher_amount.rml
@@ -16,7 +16,7 @@
     </blockTableStyle>
     <blockTableStyle id="Heading1">
       <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>D
+      <blockValign value="TOP"/>
       <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"/>
@@ -27,7 +27,7 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table6">
+    <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
@@ -57,25 +57,25 @@
     <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P12" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P16" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P17" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P18" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P19" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P20" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P21" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P22" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P24" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P25" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P26" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P27" rightIndent="0.0" leftIndent="15.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P29" rightIndent="0.0" leftIndent="20.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P30" rightIndent="0.0" leftIndent="25.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P19" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P20" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P21" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P22" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P23" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P24" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P25" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P26" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P27" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P28" rightIndent="0.0" leftIndent="71.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P29" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
     <paraStyle name="Standard" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -84,10 +84,54 @@
     <paraStyle name="Index" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
     <paraStyle name="Table Contents" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Table Heading" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="CENTER" 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="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" 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="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_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="Drawing" fontName="Times-Italic" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
   </stylesheet>
   <images/>
   <story>
-    <para style="P25">[[ repeatIn(objects,'voucher') ]]</para>
+    <para style="P24">[[ repeatIn(objects,'voucher') ]]</para>
     <para style="P4">[[ company.name ]]</para>
     <para style="P6">[[ company.partner_id.address and company.partner_id.address[0].street ]]</para>
     <para style="P6">[[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]</para>
@@ -96,11 +140,11 @@
     <para style="P5">
       <font color="white"> </font>
     </para>
-    <para style="P23">Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P21">Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]]</para>
     <para style="P2">Cash Payment Voucher [[ (voucher.type == 'pay_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P23">Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P21">Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]</para>
     <para style="P2">Bank Payment Voucher [[ (voucher.type == 'bank_pay_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P22">
+    <para style="P20">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="68.0,124.0,122.0,62.0,106.0" style="Table1">
@@ -109,7 +153,7 @@
           <para style="P10">No.</para>
         </td>
         <td>
-          <para style="P26">[[ voucher.number ]]</para>
+          <para style="P11">[[ voucher.number ]]</para>
         </td>
         <td>
           <para style="P3">
@@ -120,7 +164,7 @@
           <para style="P10">Dated :</para>
         </td>
         <td>
-          <para style="P26">[[ time.strftime('%d %B,%Y', time.strptime(voucher.date , '%Y-%m-%d')) or '' ]]</para>
+          <para style="P11">[[ time.strftime('%d %B,%Y', time.strptime(voucher.date , '%Y-%m-%d')) or '' ]]</para>
         </td>
       </tr>
       <tr>
@@ -128,10 +172,10 @@
           <para style="P10">State :</para>
         </td>
         <td>
-          <para style="P24">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
-          <para style="P24">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
-          <para style="P24">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
-          <para style="P24">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
+          <para style="P19">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
+          <para style="P19">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+          <para style="P19">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
+          <para style="P19">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
         </td>
         <td>
           <para style="P3">
@@ -142,7 +186,7 @@
           <para style="P10">Ref. :</para>
         </td>
         <td>
-          <para style="P26">[[ voucher.reference ]]</para>
+          <para style="P11">[[ voucher.reference ]]</para>
         </td>
       </tr>
       <tr>
@@ -150,7 +194,7 @@
           <para style="P10">Account :</para>
         </td>
         <td>
-          <para style="P24">[[ voucher.account_id.name ]]</para>
+          <para style="P19">[[ voucher.account_id.name ]]</para>
         </td>
         <td>
           <para style="P3">
@@ -163,17 +207,19 @@
           </para>
         </td>
         <td>
-          <para style="P26">
+          <para style="P11">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
-    <para style="P12"/>
     <para style="P12">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="333.0,149.0" style="Heading1">
+    <para style="P12">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="344.0,138.0" style="Heading1">
       <tr>
         <td>
           <para style="P14">Particulars</para>
@@ -183,26 +229,31 @@
         </td>
       </tr>
     </blockTable>
-    <para style="P18">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="482.0" style="voucher_lines">
       <tr>
         <td>
-          <para style="P19">[[ repeatIn(voucher.payment_ids,'payment_ids') ]] </para>
-          <blockTable colWidths="324.0,152.0" style="Table6">
-            <tr>
-              <td>
-                <para style="P11">[[ payment_ids.partner_id.name ]] :</para>
-                <para style="P27">[[ payment_ids.account_id.name ]] </para>
-                <para style="P30">[[ payment_ids.ref ]] [[ payment_ids.amount ]] [[ payment_ids.type ]]</para>
-              </td>
-              <td>
-                <para style="P20">[[ payment_ids.amount ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <para style="P21">
+          <para style="terp_default_1">
+            <font color="white"> </font>
+          </para>
+          <section>
+            <para style="terp_default_8">[[ repeatIn(voucher.payment_ids,'payment_ids') ]] </para>
+            <blockTable colWidths="340.0,136.0" style="Table3">
+              <tr>
+                <td>
+                  <para style="P25">[[ payment_ids.partner_id.name ]] :</para>
+                  <para style="P27">[[ payment_ids.account_id.name ]] </para>
+                  <para style="P28">[[ payment_ids.ref ]] [[ payment_ids.amount ]] [[ payment_ids.type ]]</para>
+                </td>
+                <td>
+                  <para style="P26">[[ payment_ids.amount ]]</para>
+                </td>
+              </tr>
+            </blockTable>
+            <para style="terp_default_1">
+              <font color="white"> </font>
+            </para>
+          </section>
+          <para style="P29">
             <font color="white"> </font>
           </para>
         </td>
@@ -233,10 +284,10 @@
       </tr>
       <tr>
         <td>
-          <para style="P29">[[ voucher.narration or '' ]] </para>
+          <para style="P22">[[ voucher.narration or '' ]] </para>
         </td>
         <td>
-          <para style="P26">
+          <para style="P11">
             <font color="white"> </font>
           </para>
         </td>
@@ -253,10 +304,10 @@
       </tr>
       <tr>
         <td>
-          <para style="P29">[[ voucher.name ]]</para>
+          <para style="P23">[[ voucher.name ]]</para>
         </td>
         <td>
-          <para style="P26">
+          <para style="P11">
             <font color="white"> </font>
           </para>
         </td>
@@ -273,7 +324,7 @@
       </tr>
       <tr>
         <td>
-          <para style="P29">[[ convert(voucher.amount,voucher.currency_id.name) ]]</para>
+          <para style="P23">[[ convert(voucher.amount,voucher.currency_id.name) ]]</para>
         </td>
         <td>
           <para style="P12">
@@ -329,20 +380,20 @@
       </tr>
       <tr>
         <td>
-          <para style="P22">Receiver's Signature</para>
+          <para style="P20">Receiver's Signature</para>
         </td>
         <td>
-          <para style="P22">
+          <para style="P20">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P22">
+          <para style="P20">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P22">Authorised Signatory</para>
+          <para style="P20">Authorised Signatory</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py
index 0facac6301f..dc29ee9f404 100755
--- a/addons/account_voucher/report/rml_parse.py
+++ b/addons/account_voucher/report/rml_parse.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 9b5d9091dd4..0c6f605c0e2 100755
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index cc8a4af0dd8..d0f95206ee8 100755
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -16,7 +16,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_voucher_form">
             <field name="name">account.voucher.form</field>
             <field name="model">account.voucher</field>
@@ -69,7 +69,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.actions.act_window" id="action_voucher_list">
             <field name="name">Vouchers</field>
             <field name="res_model">account.voucher</field>
@@ -77,9 +77,9 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
         </record>
-        <menuitem action="action_voucher_list" id="menu_action_voucher_list" 
-        name="Voucher Entries" parent="account.menu_finance"/>
-        
+        <menuitem action="action_voucher_list" id="menu_action_voucher_list"
+        name="Voucher Entries" parent="account.menu_finance_entries" sequence="60"/>
+
         <!--  Receipt Vouchers -->
         <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
             <field name="name">Receipt Vouchers</field>
@@ -90,9 +90,9 @@
             <field name="domain">[('type','like','rec_voucher')]</field>
             <field name="context">{'type':'rec_voucher'}</field>
         </record>
-        <menuitem name="Receipt Vouchers" id="menu_action_receipt_vou_voucher_list" 
+        <menuitem name="Receipt Vouchers" id="menu_action_receipt_vou_voucher_list"
         action="action_receipt_vou_voucher_list" parent="menu_action_voucher_list"/>
-        
+
         <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">
             <field name="name">Cash Receipt</field>
             <field name="res_model">account.voucher</field>
@@ -102,9 +102,9 @@
             <field name="domain">[('type','=','rec_voucher')]</field>
             <field name="context">{'type':'rec_voucher'}</field>
         </record>
-        <menuitem name="Cash Receipts" id="menu_action_receipt_cashreceipt_voucher_list" 
+        <menuitem name="Cash Receipts" id="menu_action_receipt_cashreceipt_voucher_list"
         action="action_receipt_cashreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>
-                
+
         <record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list">
             <field name="name">Bank Receipt</field>
             <field name="res_model">account.voucher</field>
@@ -114,12 +114,12 @@
             <field name="domain">[('type','=','bank_rec_voucher')]</field>
             <field name="context">{'type':'bank_rec_voucher'}</field>
         </record>
-        <menuitem name="Bank Receipts" id="menu_action_receipt_bakreceipt_voucher_list" 
+        <menuitem name="Bank Receipts" id="menu_action_receipt_bakreceipt_voucher_list"
         action="action_receipt_bakreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>
-        
+
         <!--  End Receipt Vouchers -->
-        
-        
+
+
         <!-- Payment Vouchers -->
         <record model="ir.actions.act_window" id="action_payments_voucher_list">
             <field name="name">Payment Vouchers</field>
@@ -130,9 +130,9 @@
             <field name="domain">[('type','like','pay_voucher')]</field>
             <field name="context">{'type':'pay_voucher'}</field>
         </record>
-        <menuitem name="Payment Vouchers" id="menu_action_payments_voucher_list" 
+        <menuitem name="Payment Vouchers" id="menu_action_payments_voucher_list"
         action="action_payments_voucher_list" parent="menu_action_voucher_list"/>
-        
+
         <record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list">
             <field name="name">Payment Vouchers</field>
             <field name="res_model">account.voucher</field>
@@ -142,9 +142,9 @@
             <field name="domain">[('type','=','pay_voucher')]</field>
             <field name="context">{'type':'pay_voucher'}</field>
         </record>
-        <menuitem name="Cash Payments" id="menu_action_payments_cashpay_voucher_list" 
+        <menuitem name="Cash Payments" id="menu_action_payments_cashpay_voucher_list"
         action="action_payments_cashpay_voucher_list" parent="menu_action_payments_voucher_list"/>
-        
+
         <record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list">
             <field name="name">Payment Vouchers</field>
             <field name="res_model">account.voucher</field>
@@ -154,11 +154,11 @@
             <field name="domain">[('type','=','bank_pay_voucher')]</field>
             <field name="context">{'type':'bank_pay_voucher'}</field>
         </record>
-        <menuitem name="Bank Payments" id="menu_action_payments_bankpay_voucher_list" 
+        <menuitem name="Bank Payments" id="menu_action_payments_bankpay_voucher_list"
         action="action_payments_bankpay_voucher_list" parent="menu_action_payments_voucher_list"/>
-        
+
         <!-- End Payment Vouchers -->
-        
+
         <!-- Other Voucher Enries -->
         <record model="ir.actions.act_window" id="action_other_voucher_list">
             <field name="name">Other Vouchers</field>
@@ -167,9 +167,9 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
         </record>
-        <menuitem name="Other Vouchers" id="menu_action_other_voucher_list" 
+        <menuitem name="Other Vouchers" id="menu_action_other_voucher_list"
         action="action_other_voucher_list" parent="menu_action_voucher_list"/>
-        
+
         <record model="ir.actions.act_window" id="action_view_cont_voucher_form">
             <field name="name">Contra Voucher</field>
             <field name="res_model">account.voucher</field>
@@ -179,9 +179,9 @@
             <field name="domain">[('type','=','cont_voucher')]</field>
             <field name="context">{'type':'cont_voucher'}</field>
         </record>
-        <menuitem name="Contra Voucher" id="menu_action_view_cont_voucher_form" 
+        <menuitem name="Contra Voucher" id="menu_action_view_cont_voucher_form"
         action="action_view_cont_voucher_form" parent="menu_action_other_voucher_list"/>
-        
+
         <record model="ir.actions.act_window" id="action_view_jour_sale_voucher_form">
             <field name="name">Journal Sale Voucher</field>
             <field name="res_model">account.voucher</field>
@@ -191,9 +191,9 @@
             <field name="domain">[('type','=','journal_sale_vou')]</field>
             <field name="context">{'type':'journal_sale_vou'}</field>
         </record>
-        <menuitem name="Journal Sale Voucher" id="menu_action_view_jour_sale_voucher_form" 
+        <menuitem name="Journal Sale Voucher" id="menu_action_view_jour_sale_voucher_form"
         action="action_view_jour_sale_voucher_form" parent="menu_action_other_voucher_list"/>
-        
+
         <record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form">
             <field name="name">Journal Purchase Voucher</field>
             <field name="res_model">account.voucher</field>
@@ -203,9 +203,9 @@
             <field name="domain">[('type','=','journal_pur_voucher')]</field>
             <field name="context">{'type':'journal_pur_voucher'}</field>
         </record>
-        <menuitem name="Journal Purchase Voucher" id="menu_action_view_jour_pur_voucher_form" 
+        <menuitem name="Journal Purchase Voucher" id="menu_action_view_jour_pur_voucher_form"
         action="action_view_jour_pur_voucher_form" parent="menu_action_other_voucher_list"/>
-        
+
         <record model="ir.actions.act_window" id="action_view_jour_voucher_form">
             <field name="name">Journal Voucher</field>
             <field name="res_model">account.voucher</field>
@@ -215,8 +215,8 @@
             <field name="domain">[('type','=','journal_voucher')]</field>
             <field name="context">{'type':'journal_voucher'}</field>
         </record>
-        <menuitem 
-            name="Journal Voucher" id="menu_action_view_jour_voucher_form" 
+        <menuitem
+            name="Journal Voucher" id="menu_action_view_jour_voucher_form"
             action="action_view_jour_voucher_form" parent="menu_action_other_voucher_list"/>
 
         </data>
diff --git a/addons/account_voucher/wizard/__init__.py b/addons/account_voucher/wizard/__init__.py
index 4a9091d0015..136fd1d8ee9 100644
--- a/addons/account_voucher/wizard/__init__.py
+++ b/addons/account_voucher/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/account_voucher/wizard/open_voucher.py b/addons/account_voucher/wizard/open_voucher.py
index 7635e7480e2..5a3892e1a14 100644
--- a/addons/account_voucher/wizard/open_voucher.py
+++ b/addons/account_voucher/wizard/open_voucher.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/analytic_journal_billing_rate/__init__.py b/addons/analytic_journal_billing_rate/__init__.py
index 915367a7695..d2b6ac90561 100644
--- a/addons/analytic_journal_billing_rate/__init__.py
+++ b/addons/analytic_journal_billing_rate/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/analytic_journal_billing_rate/__terp__.py b/addons/analytic_journal_billing_rate/__terp__.py
index d2936caf9b0..0049d03f3c5 100644
--- a/addons/analytic_journal_billing_rate/__terp__.py
+++ b/addons/analytic_journal_billing_rate/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
index f0387c225e8..060cc389fe6 100644
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
+++ b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/analytic_user_function/__init__.py b/addons/analytic_user_function/__init__.py
index 6006bc24f63..ec05cd3a9ae 100644
--- a/addons/analytic_user_function/__init__.py
+++ b/addons/analytic_user_function/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/analytic_user_function/__terp__.py b/addons/analytic_user_function/__terp__.py
index cfbd0baaab9..a6149cabb7c 100644
--- a/addons/analytic_user_function/__terp__.py
+++ b/addons/analytic_user_function/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index e2279bb891e..852d0750a42 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/analytic_user_function/i18n/id.po b/addons/analytic_user_function/i18n/id.po
index 7591bb7d3e3..e77007b9648 100644
--- a/addons/analytic_user_function/i18n/id.po
+++ b/addons/analytic_user_function/i18n/id.po
@@ -7,58 +7,58 @@ 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:45+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-01-11 19:35+0000\n"
+"Last-Translator: Triwanto <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: 2009-12-16 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-01-12 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Salah dalam penyusunan format XML"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
-msgstr ""
+msgstr "Tabel hubungan antara pengguna dengan produk pada akun analitik"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produk"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Akun Analisis"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "Pengguna/Products Rel"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Pengguna"
 
 #. module: analytic_user_function
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Nama Obyek harus berawalan _x dan tidak mengandung karakter khusus !"
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
-msgstr ""
+msgstr "Fungsi Pengguna Analitik"
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
-msgstr ""
+msgstr "Produk Pengguna untuk Akun Analitik ini"
diff --git a/addons/auction/__init__.py b/addons/auction/__init__.py
index e9aad06aa1a..28bf4bd0e31 100644
--- a/addons/auction/__init__.py
+++ b/addons/auction/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py
index c41aad9159f..83064640266 100644
--- a/addons/auction/__terp__.py
+++ b/addons/auction/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 2483df35540..4ae909240a3 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index bc5547a3608..2189253f3ce 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 	<menuitem name="Auction Management" id="auction_menu_root" icon="terp-purchase"/>
-	<menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="1"/>
+	<menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7"/>
 
 	=======================================================
 	Auction Management/Configuration/artist
@@ -127,7 +127,7 @@
 		<field name="view_id" eval="False"/>
 	</record>
 
-	<menuitem name="Auction Dates" parent="auction_menu_root" id="auction_date_menu"/>
+	<menuitem name="Auction Dates" parent="auction_menu_root" id="auction_date_menu" sequence="1"/>
 	<menuitem name="Next Auction Dates" parent="auction_date_menu" id="menu_auction_dates_next1" action="action_auction_dates_next"/>
 	=======================================================
 	Auction Management/Auction Dates/Old Auction Dates
@@ -361,10 +361,10 @@
 		<field name="res_model">auction.lots</field>
 		<field name="view_type">form</field>
 		<field name="domain">[('state','=','sold')]</field>
-        <field name="filter" eval="True"/>		
+        <field name="filter" eval="True"/>
 	</record>
 
-	<menuitem name="Objects" parent="auction_menu_root" id="auction_objects_menu"/>
+	<menuitem name="Objects" parent="auction_menu_root" id="auction_objects_menu" sequence="2"/>
 	<menuitem name="All objects" action="action_all_objects" parent="auction_objects_menu" id="auction_all_objects_menu"/>
 
 	<record model="ir.actions.act_window" id="action_all_objects_to_sell">
@@ -373,7 +373,7 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','&lt;&gt;','sold')]</field>
-        <field name="filter" eval="True"/>		
+        <field name="filter" eval="True"/>
 	</record>
 
 	<record model="ir.actions.act_window" id="action_all_objects_unplanned">
@@ -382,7 +382,7 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('auction_id','=', False),('state','=','draft')]</field>
-        <field name="filter" eval="True"/>		
+        <field name="filter" eval="True"/>
 	</record>
 
 	<!--		for the sold object  start-->
@@ -392,7 +392,7 @@
 		<field name="res_model">auction.lots</field>
 		<field name="view_type">form</field>
 		<field name="domain">[('state','=','unsold')]</field>
-        <field name="filter" eval="True"/>		
+        <field name="filter" eval="True"/>
 	</record>
 
 	<!-- form3: simplified form meant for during the sale (action button in dates) -->
@@ -439,7 +439,7 @@
 	                    <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
 	                    <button name="button_draft" string="Set to draft" states="sold,unsold" type="object" icon="gtk-convert"/>
 	                    <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
-                    </group> 
+                    </group>
 				</page>
 				<page string="Statements">
 					<field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
@@ -465,7 +465,7 @@
 		<field name="res_model">report.unclassified.objects</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
-        <field name="filter" eval="True"/>		
+        <field name="filter" eval="True"/>
 	 </record>
 
 	<record model="ir.ui.view" id="v12">
@@ -583,7 +583,7 @@
 		<field name="view_id" ref="view_deposit_border_tree2"/>
 	</record>
 
-	<menuitem name="Sellers" id="auction_seller_menu" parent="auction_menu_root"/>
+	<menuitem name="Sellers" id="auction_seller_menu" parent="auction_menu_root" sequence="3"/>
 	<menuitem name="Deposit border" parent="auction_seller_menu" action="action_deposit_border" id="menu_auction_deposit_border"/>
 
 	=======================================================
@@ -679,7 +679,7 @@
 		<field name="view_mode">tree,form</field>
 	</record>
 
-	<menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root"/>
+	<menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/>
 	<menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>
 
 
@@ -728,7 +728,7 @@
 		</field>
 	</record>
 
-	<menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root"/>
+	<menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6"/>
 
 
 <record model="ir.actions.act_window" id="action_auction_report_allmonth_view1">
diff --git a/addons/auction/auction_wizard.xml b/addons/auction/auction_wizard.xml
index d98d8ae60ac..0a93799cc20 100644
--- a/addons/auction/auction_wizard.xml
+++ b/addons/auction/auction_wizard.xml
@@ -35,20 +35,20 @@
 		name="auction.pay.buy"
 		id="wizard_pay"/>
 
-		<wizard 
-			string="Gestion emporte" 
-			model="auction.dates" 
+		<wizard
+			string="Gestion emporte"
+			model="auction.dates"
 			name="auction.taken"
 			multi="1"
 			id="wizard_emporte"/>
-			
-	<menuitem name="Tools Bar Codes" 
+
+	<menuitem name="Tools Bar Codes"
 		id="auction_outils_menu"
-		parent="auction_menu_root"
+		parent="auction_menu_root" sequence="5"
 		/>
-		
-	<menuitem name="Deliveries Management" 
-		action="wizard_emporte" 
+
+	<menuitem name="Deliveries Management"
+		action="wizard_emporte"
 		type="wizard"
 		id="menu_wizard_emporte"
 		parent="auction_outils_menu"
diff --git a/addons/auction/i18n/bg.po b/addons/auction/i18n/bg.po
index 439292d57b4..ec0d6815581 100644
--- a/addons/auction/i18n/bg.po
+++ b/addons/auction/i18n/bg.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:15+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-19 09:48+0000\n"
+"Last-Translator: lem0na <nickyk@gmx.net>\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: 2009-12-16 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-01-22 04:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -44,19 +44,19 @@ msgstr "продавач"
 #. module: auction
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаване на действие"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
 #: selection:auction.lots.send.aie,init,numerotation:0
 msgid "Provisoire"
-msgstr ""
+msgstr "Временен"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
 #: selection:auction.lots.send.aie,init,numerotation:0
 msgid "Definitive (ordre catalogue)"
-msgstr ""
+msgstr "Зададен (за каталог)"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree1_my
@@ -71,7 +71,7 @@ msgstr "История на партида"
 #. module: auction
 #: field:report.seller.auction,avg_estimation:0
 msgid "Avg estimation"
-msgstr ""
+msgstr "Усреднена оценка"
 
 #. module: auction
 #: field:report.auction.object.date,obj_num:0
diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po
index 67206636571..9cd95c4bc2e 100644
--- a/addons/auction/i18n/pt_BR.po
+++ b/addons/auction/i18n/pt_BR.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-17 09:09+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-23 02:16+0000\n"
+"Last-Translator: Holverat Bortolossi <holverat@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: 2009-12-16 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-01-24 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
 #: field:report.deposit.border,total_marge:0
 msgid "Total margin"
-msgstr ""
+msgstr "Margem total"
 
 #. module: auction
 #: wizard_view:auction.lots.sms_send,init:0
@@ -29,7 +29,7 @@ msgstr ""
 #. module: auction
 #: view:auction.lots:0
 msgid "Set to draft"
-msgstr ""
+msgstr "Definir como rascunho"
 
 #. module: auction
 #: field:auction.deposit,partner_id:0
@@ -39,55 +39,55 @@ msgstr ""
 #: field:report.seller.auction,seller:0
 #: field:report.seller.auction2,seller:0
 msgid "Seller"
-msgstr ""
+msgstr "Loja"
 
 #. module: auction
 #: 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 ação."
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
 #: selection:auction.lots.send.aie,init,numerotation:0
 msgid "Provisoire"
-msgstr ""
+msgstr "Provisório"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
 #: selection:auction.lots.send.aie,init,numerotation:0
 msgid "Definitive (ordre catalogue)"
-msgstr ""
+msgstr "Definitivo (catálogo do ordre)"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree1_my
 msgid "My Encoded Objects Per Day"
-msgstr ""
+msgstr "Meus objetos codificados por dia"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_history
 msgid "Lot history"
-msgstr ""
+msgstr "Histórico de lote"
 
 #. module: auction
 #: field:report.seller.auction,avg_estimation:0
 msgid "Avg estimation"
-msgstr ""
+msgstr "Média estimada"
 
 #. module: auction
 #: field:report.auction.object.date,obj_num:0
 #: field:report.auction.view2,obj_number:0
 msgid "# of Objects"
-msgstr ""
+msgstr "dos Objetos"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_action_bids_form
 msgid "Bids line"
-msgstr ""
+msgstr "Linha de Lances"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Deposit Form"
-msgstr ""
+msgstr "Formulário de Depósitos"
 
 #. module: auction
 #: rml:auction.bids:0
@@ -108,22 +108,22 @@ msgstr "Comprador"
 #: field:report.auction.view,nobjects:0
 #: field:report.buyer.auction,object:0
 msgid "No of objects"
-msgstr ""
+msgstr "Nenhum dos objetos"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_adjudication_tree
 msgid "Adjudication by Auction"
-msgstr ""
+msgstr "Concedido em Leilão"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of paid items (based on invoices):"
-msgstr ""
+msgstr "# de itens pagos (com base na faturas):"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_numerotate_lot
 msgid "Numerotation (per lot)"
-msgstr ""
+msgstr "Numeração (por lote)"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
@@ -134,18 +134,18 @@ msgstr ""
 #: view:auction.deposit:0
 #: model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
-msgstr ""
+msgstr "Limite de Depósito"
 
 #. module: auction
 #: wizard_field:auction.lots.make_invoice,init,amount:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,amount:0
 msgid "Invoiced Amount"
-msgstr ""
+msgstr "Valor Faturado"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Tin / Copper wares"
-msgstr ""
+msgstr "Antigo/pequeno produto de cobre ou estanho"
 
 #. module: auction
 #: field:auction.lots,paid_ach:0
diff --git a/addons/auction/report/__init__.py b/addons/auction/report/__init__.py
index 0e0d5266425..2b7907ee6a2 100644
--- a/addons/auction/report/__init__.py
+++ b/addons/auction/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/artists_lots.py b/addons/auction/report/artists_lots.py
index 6cd3a9327b3..652a5d9801d 100644
--- a/addons/auction/report/artists_lots.py
+++ b/addons/auction/report/artists_lots.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/auction_artists.py b/addons/auction/report/auction_artists.py
index 9bf5b7cee9f..b61f9a70e21 100644
--- a/addons/auction/report/auction_artists.py
+++ b/addons/auction/report/auction_artists.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/auction_bids.py b/addons/auction/report/auction_bids.py
index cc8f694a5f0..7b0639e8849 100644
--- a/addons/auction/report/auction_bids.py
+++ b/addons/auction/report/auction_bids.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/auction_buyer_result.py b/addons/auction/report/auction_buyer_result.py
index bf91e2ab1b8..9534fcdfb56 100644
--- a/addons/auction/report/auction_buyer_result.py
+++ b/addons/auction/report/auction_buyer_result.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/auction_catelog.py b/addons/auction/report/auction_catelog.py
index b4b51ca4670..bfa42d730d0 100644
--- a/addons/auction/report/auction_catelog.py
+++ b/addons/auction/report/auction_catelog.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/auction_invoice.py b/addons/auction/report/auction_invoice.py
index 4eac70a4be5..f367d8df88e 100644
--- a/addons/auction/report/auction_invoice.py
+++ b/addons/auction/report/auction_invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/auction_objects.py b/addons/auction/report/auction_objects.py
index 01f5266d7f8..b3f632bb27e 100644
--- a/addons/auction/report/auction_objects.py
+++ b/addons/auction/report/auction_objects.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/auction_result.py b/addons/auction/report/auction_result.py
index 52b286307fc..0f77e456c28 100644
--- a/addons/auction/report/auction_result.py
+++ b/addons/auction/report/auction_result.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/auction_total_rml.py b/addons/auction/report/auction_total_rml.py
index 15f61bc103b..ea6b6ad72ec 100644
--- a/addons/auction/report/auction_total_rml.py
+++ b/addons/auction/report/auction_total_rml.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/bids_lots.py b/addons/auction/report/bids_lots.py
index 8f88c25dccc..3bcc0fd4853 100644
--- a/addons/auction/report/bids_lots.py
+++ b/addons/auction/report/bids_lots.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/bids_phones_details.py b/addons/auction/report/bids_phones_details.py
index 9207a28899c..4356fff941e 100644
--- a/addons/auction/report/bids_phones_details.py
+++ b/addons/auction/report/bids_phones_details.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/buyer_form_report.py b/addons/auction/report/buyer_form_report.py
index 9db5a8fccdf..2284ff78a16 100644
--- a/addons/auction/report/buyer_form_report.py
+++ b/addons/auction/report/buyer_form_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/buyer_list.py b/addons/auction/report/buyer_list.py
index 171c81a09f9..cb35640e8b6 100644
--- a/addons/auction/report/buyer_list.py
+++ b/addons/auction/report/buyer_list.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/catalog2.py b/addons/auction/report/catalog2.py
index 38493d6f6bd..95a72889f97 100644
--- a/addons/auction/report/catalog2.py
+++ b/addons/auction/report/catalog2.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/catelogwithpictures.py b/addons/auction/report/catelogwithpictures.py
index 4624fef6a2a..4cfa5f3acc7 100644
--- a/addons/auction/report/catelogwithpictures.py
+++ b/addons/auction/report/catelogwithpictures.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/deposit_seller.py b/addons/auction/report/deposit_seller.py
index 33e53bd0954..01aeef83f33 100644
--- a/addons/auction/report/deposit_seller.py
+++ b/addons/auction/report/deposit_seller.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/huissier.py b/addons/auction/report/huissier.py
index bb125dcfa5f..ad8065be31c 100644
--- a/addons/auction/report/huissier.py
+++ b/addons/auction/report/huissier.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/lots_list.py b/addons/auction/report/lots_list.py
index 1147b835250..e56c7cd7866 100644
--- a/addons/auction/report/lots_list.py
+++ b/addons/auction/report/lots_list.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/lots_list_inventory.py b/addons/auction/report/lots_list_inventory.py
index ceef9b62696..e740d6ac6c8 100644
--- a/addons/auction/report/lots_list_inventory.py
+++ b/addons/auction/report/lots_list_inventory.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/lots_list_landscape.py b/addons/auction/report/lots_list_landscape.py
index 8ce70784923..d85e375a8ef 100644
--- a/addons/auction/report/lots_list_landscape.py
+++ b/addons/auction/report/lots_list_landscape.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/photo_shadow.py b/addons/auction/report/photo_shadow.py
index 5264d8fd8d4..4aea8e31ba6 100644
--- a/addons/auction/report/photo_shadow.py
+++ b/addons/auction/report/photo_shadow.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/report_lot_bar_code.py b/addons/auction/report/report_lot_bar_code.py
index 681dd3a5439..1337738eb22 100644
--- a/addons/auction/report/report_lot_bar_code.py
+++ b/addons/auction/report/report_lot_bar_code.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/seller_address.py b/addons/auction/report/seller_address.py
index 9636a247629..cd33f690ea5 100644
--- a/addons/auction/report/seller_address.py
+++ b/addons/auction/report/seller_address.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/seller_form_report.py b/addons/auction/report/seller_form_report.py
index a9f191b4811..cc476558df9 100644
--- a/addons/auction/report/seller_form_report.py
+++ b/addons/auction/report/seller_form_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/report/total.py b/addons/auction/report/total.py
index 1b98f77da8d..135e495e4b6 100644
--- a/addons/auction/report/total.py
+++ b/addons/auction/report/total.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/__init__.py b/addons/auction/wizard/__init__.py
index fcc9b0adad0..ec07ef6e04f 100644
--- a/addons/auction/wizard/__init__.py
+++ b/addons/auction/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/auction_catalog_flagey.py b/addons/auction/wizard/auction_catalog_flagey.py
index f33861d17ba..fd73e7dadc4 100644
--- a/addons/auction/wizard/auction_catalog_flagey.py
+++ b/addons/auction/wizard/auction_catalog_flagey.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/auction_wizard_able_taken.py b/addons/auction/wizard/auction_wizard_able_taken.py
index 68fba235b41..261cc47c48b 100644
--- a/addons/auction/wizard/auction_wizard_able_taken.py
+++ b/addons/auction/wizard/auction_wizard_able_taken.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/auction_wizard_enable_taken.py b/addons/auction/wizard/auction_wizard_enable_taken.py
index b9a425b7091..01f54ca28dc 100644
--- a/addons/auction/wizard/auction_wizard_enable_taken.py
+++ b/addons/auction/wizard/auction_wizard_enable_taken.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_aie_send.py b/addons/auction/wizard/wizard_aie_send.py
index 5141d585b30..2d9c444cba1 100644
--- a/addons/auction/wizard/wizard_aie_send.py
+++ b/addons/auction/wizard/wizard_aie_send.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_aie_send_result.py b/addons/auction/wizard/wizard_aie_send_result.py
index 4c32a87ce7a..30b6b82c124 100644
--- a/addons/auction/wizard/wizard_aie_send_result.py
+++ b/addons/auction/wizard/wizard_aie_send_result.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_auction_invoice_buyer.py b/addons/auction/wizard/wizard_auction_invoice_buyer.py
index 1754c093db8..6cf12b5da22 100644
--- a/addons/auction/wizard/wizard_auction_invoice_buyer.py
+++ b/addons/auction/wizard/wizard_auction_invoice_buyer.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_auction_journal.py b/addons/auction/wizard/wizard_auction_journal.py
index 220c61d379f..79329592165 100644
--- a/addons/auction/wizard/wizard_auction_journal.py
+++ b/addons/auction/wizard/wizard_auction_journal.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_emporte.py b/addons/auction/wizard/wizard_emporte.py
index fc7b30b4655..1172404e218 100644
--- a/addons/auction/wizard/wizard_emporte.py
+++ b/addons/auction/wizard/wizard_emporte.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_lot_date_move.py b/addons/auction/wizard/wizard_lot_date_move.py
index 9ce6dbc8c0a..e6e13ea0ab2 100644
--- a/addons/auction/wizard/wizard_lot_date_move.py
+++ b/addons/auction/wizard/wizard_lot_date_move.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_lots_buyer_map.py b/addons/auction/wizard/wizard_lots_buyer_map.py
index b34547ac345..42c5f80a530 100644
--- a/addons/auction/wizard/wizard_lots_buyer_map.py
+++ b/addons/auction/wizard/wizard_lots_buyer_map.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_lots_cancel.py b/addons/auction/wizard/wizard_lots_cancel.py
index 474847cabb8..1d7f93b14d3 100644
--- a/addons/auction/wizard/wizard_lots_cancel.py
+++ b/addons/auction/wizard/wizard_lots_cancel.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_lots_invoice.py b/addons/auction/wizard/wizard_lots_invoice.py
index 5694aeddbc0..636b12cc2ff 100644
--- a/addons/auction/wizard/wizard_lots_invoice.py
+++ b/addons/auction/wizard/wizard_lots_invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_lots_numerotate.py b/addons/auction/wizard/wizard_lots_numerotate.py
index 82937888560..1232a559e4d 100644
--- a/addons/auction/wizard/wizard_lots_numerotate.py
+++ b/addons/auction/wizard/wizard_lots_numerotate.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_lots_pay.py b/addons/auction/wizard/wizard_lots_pay.py
index 5273d6dc6e2..a6b8f635ba4 100644
--- a/addons/auction/wizard/wizard_lots_pay.py
+++ b/addons/auction/wizard/wizard_lots_pay.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_lots_sms.py b/addons/auction/wizard/wizard_lots_sms.py
index 18e1c708bc3..dc60a9bd24d 100644
--- a/addons/auction/wizard/wizard_lots_sms.py
+++ b/addons/auction/wizard/wizard_lots_sms.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_pay.py b/addons/auction/wizard/wizard_pay.py
index 56c9c48f633..ff68c2b5b8d 100644
--- a/addons/auction/wizard/wizard_pay.py
+++ b/addons/auction/wizard/wizard_pay.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_payer.py b/addons/auction/wizard/wizard_payer.py
index ae36ae7e733..6e224fbadad 100644
--- a/addons/auction/wizard/wizard_payer.py
+++ b/addons/auction/wizard/wizard_payer.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/auction/wizard/wizard_transfer_unsold_object.py b/addons/auction/wizard/wizard_transfer_unsold_object.py
index 1e799c91800..dd42ed865cd 100644
--- a/addons/auction/wizard/wizard_transfer_unsold_object.py
+++ b/addons/auction/wizard/wizard_transfer_unsold_object.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/audittrail/__init__.py b/addons/audittrail/__init__.py
index d0e65eaeb09..cdaa3fd4181 100644
--- a/addons/audittrail/__init__.py
+++ b/addons/audittrail/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/audittrail/__terp__.py b/addons/audittrail/__terp__.py
index b640f4cf6b1..e7ecd839efb 100644
--- a/addons/audittrail/__terp__.py
+++ b/addons/audittrail/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index a1b8b2a6ffd..22ddcafd7f9 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/audittrail/i18n/pt_BR.po b/addons/audittrail/i18n/pt_BR.po
index ffe8c1787c2..bd8800a027c 100644
--- a/addons/audittrail/i18n/pt_BR.po
+++ b/addons/audittrail/i18n/pt_BR.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:21+0000\n"
-"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
+"PO-Revision-Date: 2010-01-20 01:10+0000\n"
+"Last-Translator: pedrobom <pedrobomlimeira@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: 2009-12-16 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-01-22 04:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
@@ -32,32 +32,32 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
 msgid "Log"
-msgstr ""
+msgstr "Registro (log)"
 
 #. module: audittrail
 #: selection:audittrail.rule,state:0
 msgid "Subscribed"
-msgstr ""
+msgstr "Inscrito"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value : "
-msgstr ""
+msgstr "Valor Anterior : "
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Create"
-msgstr ""
+msgstr "Criar"
 
 #. module: audittrail
 #: wizard_view:audittrail.view.log,init:0
 msgid "Audit Logs"
-msgstr ""
+msgstr "Logs de auditoria"
 
 #. module: audittrail
 #: field:audittrail.rule,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: audittrail
 #: selection:audittrail.rule,state:0
@@ -67,12 +67,12 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.log.line,old_value:0
 msgid "Old Value"
-msgstr ""
+msgstr "Valor Anterior"
 
 #. module: audittrail
 #: 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 ação."
 
 #. module: audittrail
 #: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log
@@ -87,7 +87,7 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.log,method:0
 msgid "Method"
-msgstr ""
+msgstr "Método"
 
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,from:0
@@ -97,17 +97,17 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.log.line,log:0
 msgid "Log ID"
-msgstr ""
+msgstr "Log ID"
 
 #. module: audittrail
 #: field:audittrail.log,res_id:0
 msgid "Resource Id"
-msgstr ""
+msgstr "ID Recurso"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Write"
-msgstr ""
+msgstr "Escrever"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail
@@ -117,23 +117,23 @@ msgstr ""
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Log Lines"
-msgstr ""
+msgstr "Linhas do Log"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Subscribe"
-msgstr ""
+msgstr "Assinar"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Read"
-msgstr ""
+msgstr "Ler"
 
 #. module: audittrail
 #: field:audittrail.log,object_id:0
 #: field:audittrail.rule,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Objeto"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -162,12 +162,12 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.log,timestamp:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: audittrail
 #: field:audittrail.log,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -182,92 +182,92 @@ msgstr "Invalido XML para Arquitetura da View"
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: audittrail
 #: field:audittrail.log,line_ids:0
 msgid "Log lines"
-msgstr ""
+msgstr "Linhas de Log"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree_sub
 msgid "Subscribed Rules"
-msgstr ""
+msgstr "Regras Inscritas"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_id:0
 msgid "Fields"
-msgstr ""
+msgstr "Campos"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rules"
-msgstr ""
+msgstr "Regras de Auditoria"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "audittrail.rule"
-msgstr ""
+msgstr "audittrail.rule"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "UnSubscribe"
-msgstr ""
+msgstr "Remover Inscrição"
 
 #. module: audittrail
 #: field:audittrail.rule,log_write:0
 msgid "Log writes"
-msgstr ""
+msgstr "Escritas de Log"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
 msgid "audittrail.log"
-msgstr ""
+msgstr "audittrail.log"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
 msgid "Field Description"
-msgstr ""
+msgstr "Descrição do Campo"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Delete"
-msgstr ""
+msgstr "Apagar"
 
 #. module: audittrail
 #: wizard_button:audittrail.view.log,init,open:0
 msgid "Open Logs"
-msgstr ""
+msgstr "Abrir Logs"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value_text:0
 msgid "New value Text"
-msgstr ""
+msgstr "Texto do novo valor"
 
 #. module: audittrail
 #: field:audittrail.rule,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Nome da Regra"
 
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log reads"
-msgstr ""
+msgstr "Leituras de Log"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
 msgid "Logs"
-msgstr ""
+msgstr "Logs"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value:0
 msgid "New Value"
-msgstr ""
+msgstr "Novo Valor"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_log_tree2
 msgid "View Logs"
-msgstr ""
+msgstr "Ver Logs"
 
 #. module: audittrail
 #: field:audittrail.rule,log_create:0
@@ -277,7 +277,7 @@ msgstr ""
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "AuditTrail Logs"
-msgstr ""
+msgstr "Logs de Auditoria"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
@@ -287,22 +287,22 @@ msgstr "Regras"
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value : "
-msgstr ""
+msgstr "Novo Valor: "
 
 #. module: audittrail
 #: field:audittrail.rule,user_id:0
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value_text:0
 msgid "Old value Text"
-msgstr ""
+msgstr "Texto do Valor Antigo"
 
 #. module: audittrail
 #: wizard_button:audittrail.view.log,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
diff --git a/addons/audittrail/wizard/__init__.py b/addons/audittrail/wizard/__init__.py
index 8045dc9580a..c7b5a20d884 100644
--- a/addons/audittrail/wizard/__init__.py
+++ b/addons/audittrail/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/audittrail/wizard/wizard_view_log.py b/addons/audittrail/wizard/wizard_view_log.py
index 59af1bebea8..81936bcd54c 100644
--- a/addons/audittrail/wizard/wizard_view_log.py
+++ b/addons/audittrail/wizard/wizard_view_log.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_calendar/__init__.py b/addons/base_calendar/__init__.py
new file mode 100644
index 00000000000..c127cc7c124
--- /dev/null
+++ b/addons/base_calendar/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import base_calendar
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/__terp__.py b/addons/base_calendar/__terp__.py
new file mode 100644
index 00000000000..51097c2b13c
--- /dev/null
+++ b/addons/base_calendar/__terp__.py
@@ -0,0 +1,52 @@
+# -*- 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" : "Basic Calendar Functionality", 
+    "version" : "1.0", 
+    "depends" : [
+                    "base", 
+                ], 
+     'description': """
+ Contains basic functionality for caldav system like:
+  - Maintenance of basic objects needed for caldav calendar
+      * Event(Meeting)
+      * Todo(Task)
+      * Reminder
+      * Attendee
+  - Availabilities of synchronisation using WebDAV
+""", 
+    "author" : "Tiny", 
+    'category': 'Generic Modules/Others', 
+    'website': 'http://www.openerp.com', 
+    "init_xml" : ["base_calendar_data.xml"], 
+    "demo_xml" : [], 
+    "update_xml" : [
+                    'security/ir.model.access.csv', 
+                    'base_calendar_wizard.xml', 
+                    'base_calendar_view.xml'
+                    ], 
+    "installable" : True, 
+    "active" : False, 
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/calendar.py b/addons/base_calendar/base_calendar.py
similarity index 57%
rename from addons/caldav/calendar.py
rename to addons/base_calendar/base_calendar.py
index 1eee04d9db6..84d9a744fe8 100644
--- a/addons/caldav/calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -22,16 +22,71 @@
 from datetime import datetime, timedelta
 from dateutil import parser
 from dateutil.rrule import *
-from osv import osv
+from osv import osv, fields
+from tools.translate import _
+import base64
+import pooler
 import re
 import vobject
-import common
 
 # O-1  Optional and can come only once
 # O-n  Optional and can come more than once
 # R-1  Required and can come only once
 # R-n  Required and can come more than once
 
+def uid2openobjectid(cr, uidval, oomodel, rdate):
+    __rege = re.compile(r'OpenObject-([\w|\.]+)_([0-9]+)@(\w+)$')
+    wematch = __rege.match(uidval.encode('utf8'))
+    if not wematch:
+        return (False, None)
+    else:
+        model, id, dbname = wematch.groups()
+        model_obj = pooler.get_pool(cr.dbname).get(model)
+        if (not model == oomodel) or (not dbname == cr.dbname):
+            return (False, None)
+        qry = 'select distinct(id) from %s' % model_obj._table
+        if rdate:
+            qry += " where recurrent_id='%s'" % (rdate)
+            cr.execute(qry)
+            r_id = cr.fetchone()
+            if r_id:
+                return (id, r_id[0])
+        cr.execute(qry)
+        ids = map(lambda x: str(x[0]), cr.fetchall())
+        if id in ids:
+            return (id, None)
+        return False
+
+def openobjectid2uid(cr, uidval, oomodel):
+    value = 'OpenObject-%s_%s@%s' % (oomodel, uidval, cr.dbname)
+    return value
+
+def get_attribute_mapping(cr, uid, calname, context={}):
+        if not context:
+            context = {}
+        pool = pooler.get_pool(cr.dbname)
+        field_obj = pool.get('basic.calendar.fields')
+        type_obj = pool.get('basic.calendar.lines')
+        type_id = type_obj.search(cr, uid, [('object_id.model', '=', context.get('model'))])
+        fids = field_obj.search(cr, uid, [('type_id', '=', type_id[0])])
+        res = {}
+        for field in field_obj.browse(cr, uid, fids):
+            attr = field.name.name
+            res[attr] = {}
+            res[attr]['field'] = field.field_id.name
+            res[attr]['type'] = field.field_id.ttype
+            if field.fn == 'hours':
+                res[attr]['type'] = "timedelta"
+            if res[attr]['type'] in ('one2many', 'many2many', 'many2one'):
+                res[attr]['object'] = field.field_id.relation
+            elif res[attr]['type'] in ('selection') and field.mapping:
+                res[attr]['mapping'] = eval(field.mapping)
+        if not res.get('uid', None):
+            res['uid'] = {}
+            res['uid']['field'] = 'id'
+            res[attr]['type'] = "integer"
+        return res
+
 def map_data(cr, uid, obj):
     vals = {}
     for map_dict in obj.__attribute__:
@@ -42,7 +97,7 @@ def map_data(cr, uid, obj):
             if field_type == 'selection':
                 if not map_val:
                     continue
-                mapping =obj.__attribute__[map_dict].get('mapping', False)
+                mapping = obj.__attribute__[map_dict].get('mapping', False)
                 if mapping:
                     map_val = mapping[map_val.lower()]
                 else:
@@ -69,18 +124,21 @@ def map_data(cr, uid, obj):
                 id = modobj.create(cr, uid, map_val)
                 vals[field] = id
                 continue
+            if field_type == 'timedelta':
+                if map_val:
+                    vals[field] = (map_val.seconds/float(86400) + map_val.days)
             if map_val:
                 vals[field] = map_val
     return vals
 
 class CalDAV(object):
-    __attribute__ = {
-    }
+    __attribute__ = {}
+
     def get_recurrent_dates(self, rrulestring, exdate, startdate=None):
         if not startdate:
-            startdate = datetime.now()         
+            startdate = datetime.now()
         rset1 = rrulestr(rrulestring, dtstart=startdate, forceset=True)
-    
+
         for date in exdate:
             datetime_obj = todate(date)
             rset1._exdate.append(datetime_obj)
@@ -97,13 +155,11 @@ class CalDAV(object):
             val = self.__attribute__.get(name).get(type, None)
             valtype =  self.__attribute__.get(name).get('type', None)
             if type == 'value':
-                if valtype and valtype=='datetime' and val:
+                if valtype and valtype == 'datetime' and val:
                     if isinstance(val, list):
                         val = ','.join(map(lambda x: x.strftime('%Y-%m-%d %H:%M:%S'), val))
                     else:
                         val = val.strftime('%Y-%m-%d %H:%M:%S')
-                if valtype and valtype=='integer' and val:
-                    val = int(val)
             return  val
         else:
             return  self.__attribute__.get(name, None)
@@ -113,35 +169,69 @@ class CalDAV(object):
             if self.__attribute__[name]:
                 self.__attribute__[name][type] = None
         return True
+    
+    def parse_ics(self, cr, uid, child):
+        att_data = []
+        for cal_data in child.getChildren():
+            if cal_data.name.lower() == 'attendee':
+                attendee = self.pool.get('basic.calendar.attendee')
+                att_data.append(attendee.import_cal(cr, uid, cal_data))
+                self.ical_set(cal_data.name.lower(), att_data, 'value')
+                continue
+            if cal_data.name.lower() == 'valarm':
+                alarm = self.pool.get('basic.calendar.alarm')
+                vals = alarm.import_cal(cr, uid, cal_data)
+                self.ical_set(cal_data.name.lower(), vals, 'value')
+                continue
+            if cal_data.name.lower() in self.__attribute__:
+                self.ical_set(cal_data.name.lower(), cal_data.value, 'value')
+        vals = map_data(cr, uid, self)
+        return vals
 
-    def export_ical(self, cr, uid, datas, vobj=None, context={}):
-        ical = vobject.iCalendar()
+    def create_ics(self, cr, uid, datas, name, ical, context=None):
+        if not datas:
+            model = context.get('model', None)
+            war_str = "No data available" + (model and " for " + model) or ""
+            raise osv.except_osv(_('Warning !'), _(war_str))
         for data in datas:
-            vevent = ical.add(vobj)
+            vevent = ical.add(name)
             for field in self.__attribute__.keys():
                 map_field = self.ical_get(field, 'field')
                 map_type = self.ical_get(field, 'type')
                 if map_field in data.keys():
-                    if field == 'uid' :
+                    if field == 'uid':
                         model = context.get('model', None)
                         if not model:
                             continue
-                        uidval = common.openobjectid2uid(cr, data[map_field], model)
+                        uidval = openobjectid2uid(cr, data[map_field], model)
+                        model_obj = self.pool.get(model)
+                        r_ids = []
+                        if model_obj._columns.get('recurrent_uid', None):
+                            cr.execute('select id from %s  where recurrent_uid=%s' 
+                                           % (model_obj._table, data[map_field]))
+                            r_ids = map(lambda x: x[0], cr.fetchall())
+                        if r_ids: 
+                            rdata = self.pool.get(model).read(cr, uid, r_ids)
+                            rcal = self.export_cal(cr, uid, rdata, context=context)
+                            for revents in rcal.contents['vevent']:
+                                ical.contents['vevent'].append(revents)
+                        if data.get('recurrent_uid', None):
+                            uidval = openobjectid2uid(cr, data['recurrent_uid'], model)
                         vevent.add('uid').value = uidval
-                    elif field == 'attendee' and data[map_field]:                                                                        
-                        #vevent.add('attendee').value = data[map_field]
-                        #TODO : To export attendee  
-                        pass
-                            
-                    elif field == 'valarm' and data[map_field]:                                                                             
-                        # vevent.add('valarm').value = data[map_field]                        
-                        #TODO : To export valarm 
-                        pass
-
+                    elif field == 'attendee' and data[map_field]:
+                        model = self.__attribute__[field].get('object', False)
+                        attendee_obj = self.pool.get('basic.calendar.attendee')
+                        vevent = attendee_obj.export_cal(cr, uid, model, \
+                                     data[map_field], vevent, context=context)
+                    elif field == 'valarm' and data[map_field]:
+                        model = self.__attribute__[field].get('object', False)
+                        alarm_obj = self.pool.get('basic.calendar.alarm')
+                        vevent = alarm_obj.export_cal(cr, uid, model, \
+                                    data[map_field][0], vevent, context=context)
                     elif data[map_field]:
-                        if map_type == "text":
+                        if map_type in ("char", "text"):
                             vevent.add(field).value = str(data[map_field])
-                        elif map_type == 'datetime' and data[map_field]:
+                        elif map_type in ('datetime', 'date') and data[map_field]:
                             if field in ('exdate'):
                                 vevent.add(field).value = [parser.parse(data[map_field])]
                             else:
@@ -149,33 +239,59 @@ class CalDAV(object):
                         elif map_type == "timedelta":
                             vevent.add(field).value = timedelta(hours=data[map_field])
                         elif map_type == "many2one":
-                             vevent.add(field).value = [data.get(map_field)[1]]
-                        if self.__attribute__.get(field).has_key('mapping'):
-                            for key1, val1 in self.ical_get(field, 'mapping').items():
-                                if val1 == data[map_field]:
-                                    vevent.add(field).value = key1        
-        return ical
+                            vevent.add(field).value = data.get(map_field)[1]
+                        elif map_type in ("float", "integer"):
+                            vevent.add(field).value = str(data.get(map_field))
+                        elif map_type == "selection":
+                            if not self.ical_get(field, 'mapping'):
+                                vevent.add(field).value = (data[map_field]).upper()
+                            else:
+                                for key1, val1 in self.ical_get(field, 'mapping').items():
+                                    if val1 == data[map_field]:
+                                        vevent.add(field).value = key1
+        return vevent
+    
+    def check_import(self, cr, uid, vals, context={}):
+        ids = []
+        model_obj = self.pool.get(context.get('model'))
+        try:
+            for val in vals:
+                exists, r_id = uid2openobjectid(cr, val['id'], context.get('model'), \
+                                                                 val.get('recurrent_id'))
+                if val.has_key('create_date'): val.pop('create_date')
+                val.pop('id')
+                if exists and r_id:
+                    val.update({'recurrent_uid': exists})
+                    model_obj.write(cr, uid, [r_id], val)
+                    ids.append(r_id)
+                elif exists:
+                    model_obj.write(cr, uid, [exists], val)
+                    ids.append(exists)
+                else:
+                    event_id = model_obj.create(cr, uid, val)
+                    ids.append(event_id)
+        except Exception, e:
+            raise osv.except_osv(('Error !'), (str(e)))
+        return ids
 
-    def import_ical(self, cr, uid, ical_data):
+    def export_cal(self, cr, uid, datas, vobj=None, context={}):
+        try:
+            self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, context)
+            ical = vobject.iCalendar()
+            self.create_ics(cr, uid, datas, vobj, ical, context=context)
+            return ical
+        except Exception, e:
+            raise osv.except_osv(('Error !'), (str(e)))
+
+    def import_cal(self, cr, uid, content, data_id=None, context=None):
+        ical_data = base64.decodestring(content)
+        self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, context)
         parsedCal = vobject.readOne(ical_data)
         att_data = []
         res = []
         for child in parsedCal.getChildren():
-            for cal_data in child.getChildren():
-                #if cal_data.name.lower() == 'attendee':
-                #    attendee = self.pool.get('basic.calendar.attendee')
-                #    att_data.append(attendee.import_ical(cr, uid, cal_data))
-                #    self.ical_set(cal_data.name.lower(), cal_data.value, 'value')
-                #    continue
-                #if cal_data.name.lower() == 'valarm':
-                #    alarm = self.pool.get('basic.calendar.alarm')
-                #    vals = alarm.import_ical(cr, uid, cal_data)
-                #    self.ical_set(cal_data.name.lower(), cal_data.value, 'value')
-                #    continue
-                if cal_data.name.lower() in self.__attribute__:
-                    self.ical_set(cal_data.name.lower(), cal_data.value, 'value')
             if child.name.lower() in ('vevent', 'vtodo'):
-                vals = map_data(cr, uid, self)
+                vals = self.parse_ics(cr, uid, child)
             else:
                 vals = {}
                 continue
@@ -184,8 +300,11 @@ class CalDAV(object):
         return res
 
 
-class Calendar(CalDAV, osv.osv_memory):
+class Calendar(CalDAV, osv.osv):
     _name = 'basic.calendar'
+    _description = 'Calendar'
+    _calname = 'calendar'
+
     __attribute__ = {
         'prodid': None, # Use: R-1, Type: TEXT, Specifies the identifier for the product that created the iCalendar object.
         'version': None, # Use: R-1, Type: TEXT, Specifies the identifier corresponding to the highest version number
@@ -198,13 +317,118 @@ class Calendar(CalDAV, osv.osv_memory):
         'vjournal': None, # Use: O-n, Type: Collection of Journal class
         'vfreebusy': None, # Use: O-n, Type: Collection of FreeBusy class
         'vtimezone': None, # Use: O-n, Type: Collection of Timezone class
-
+    }
+    _columns = {
+            'name': fields.char("Name", size=64), 
+            'line_ids': fields.one2many('basic.calendar.lines', 'calendar_id', 'Calendar Lines'), 
+            'active': fields.boolean('Active'), 
     }
 
+    _defaults = {
+                'active': lambda *a: True,
+                 }
+
+    def export_cal(self, cr, uid, datas, vobj='vevent', context={}):
+        try:
+            cal = self.browse(cr, uid, datas[0])
+            ical = vobject.iCalendar()
+            for line in cal.line_ids:
+                if line.name in ('alarm', 'attendee'):
+                    continue
+                mod_obj = self.pool.get(line.object_id.model)
+                data_ids = mod_obj.search(cr, uid, eval(line.domain), context=context)
+                datas = mod_obj.read(cr, uid, data_ids, context=context)
+                context.update({'model': line.object_id.model})
+                self.__attribute__ = get_attribute_mapping(cr, uid, line.name, context)
+                self.create_ics(cr, uid, datas, line.name, ical, context=context)
+            return ical.serialize()
+        except Exception, e:
+            raise osv.except_osv(('Error !'), (str(e)))
+
+    def import_cal(self, cr, uid, content, data_id=None, context=None):
+        ical_data = base64.decodestring(content)
+        parsedCal = vobject.readOne(ical_data)
+        if not data_id:
+            data_id = self.search(cr, uid, [])[0]
+        cal = self.browse(cr, uid, data_id)
+        cal_children = {}
+        count = 0
+        for line in cal.line_ids:
+            cal_children[line.name] = line.object_id.model
+        for child in parsedCal.getChildren():
+            if child.name.lower() in cal_children:
+                context.update({'model': cal_children[child.name.lower()]})
+                self.__attribute__ = get_attribute_mapping(cr, uid, child.name.lower(), context=context)
+                val = self.parse_ics(cr, uid, child)
+                obj = self.pool.get(cal_children[child.name.lower()])
+                if hasattr(obj, 'check_import'):
+                    obj.check_import(cr, uid, [val], context=context)
+                else:
+                    self.check_import(cr, uid, [val], context=context)
+        return {}
+
 Calendar()
+    
+class basic_calendar_line(osv.osv):
+    _name = 'basic.calendar.lines'
+    _description = 'Calendar Lines'
+    _columns = {
+            'name': fields.selection([('vevent', 'Event'), ('vtodo', 'TODO'), \
+                                    ('alarm', 'Alarm'), \
+                                    ('attendee', 'Attendee')], \
+                                    string="Type", size=64), 
+            'object_id': fields.many2one('ir.model', 'Object'), 
+            'calendar_id': fields.many2one('basic.calendar', 'Calendar', \
+                                       required=True, ondelete='cascade'), 
+            'domain': fields.char('Domain', size=124), 
+            'mapping_ids': fields.one2many('basic.calendar.fields', 'type_id', 'Fields Mapping')
+    }   
+
+    _defaults = {
+        'domain': lambda *a: '[]',
+    }
+    
+basic_calendar_line()
+
+class basic_calendar_attribute(osv.osv):
+    _name = 'basic.calendar.attributes'
+    _description = 'Calendar attributes'
+    _columns = {        
+        'name': fields.char("Name", size=64, required=True),
+        'type': fields.selection([('vevent', 'Event'), ('vtodo', 'TODO'), \
+                                    ('alarm', 'Alarm'), \
+                                    ('attendee', 'Attendee')], \
+                                    string="Type", size=64, required=True),        
+    }
+
+basic_calendar_attribute()
+
+class basic_calendar_fields(osv.osv):
+    _name = 'basic.calendar.fields'
+    _description = 'Calendar fields'
+
+    _columns = {
+        'field_id': fields.many2one('ir.model.fields', 'OpenObject Field'),
+        'name': fields.many2one('basic.calendar.attributes', 'Name', required=True),
+        'type_id': fields.many2one('basic.calendar.lines', 'Type', \
+                                   required=True, ondelete='cascade'),
+        'expr': fields.char("Expression", size=64),
+        'fn': fields.selection( [('field', 'Use the field'),
+                        ('const', 'Expression as constant'),
+                        ('hours', 'Interval in hours'),
+                        ],'Function'), 
+        'mapping': fields.text('Mapping'), 
+    }
+
+    _defaults = {
+        'fn': lambda *a: 'field',
+    }
+
+basic_calendar_fields()
 
 class Event(CalDAV, osv.osv_memory):
     _name = 'basic.calendar.event'
+    _calname = 'vevent'
     __attribute__ = {
         'class': None, # Use: O-1, Type: TEXT, Defines the access classification for a calendar  component like "PUBLIC" / "PRIVATE" / "CONFIDENTIAL"
         'created': None, # Use: O-1, Type: DATE-TIME, Specifies the date and time that the calendar information  was created by the calendar user agent in the calendar store.
@@ -240,13 +464,14 @@ class Event(CalDAV, osv.osv_memory):
         'duration': None, # Use: O-1, Type: DURATION, Specifies a positive duration of time.
         'dtend': None, # Use: O-1, Type: DATE-TIME, Specifies the date and time that a calendar component ends.
     }
-    def export_ical(self, cr, uid, datas, context={}):
-        return super(Event, self).export_ical(cr, uid, datas, 'vevent', context=context)
-    
+    def export_cal(self, cr, uid, datas, vobj='vevent', context={}):
+        return super(Event, self).export_cal(cr, uid, datas, 'vevent', context=context)
+
 Event()
 
 class ToDo(CalDAV, osv.osv_memory):
     _name = 'basic.calendar.todo'
+    _calname = 'vtodo'
 
     __attribute__ = {
                 'class': None, 
@@ -255,8 +480,8 @@ class ToDo(CalDAV, osv.osv_memory):
                 'description': None, 
                 'dtstamp': None, 
                 'dtstart': None, 
-                'duration': None,
-                'due': None,
+                'duration': None, 
+                'due': None, 
                 'geo': None, 
                 'last-mod ': None, 
                 'location': None, 
@@ -282,9 +507,9 @@ class ToDo(CalDAV, osv.osv_memory):
                 'rdate': None, 
                 'rrule': None, 
             }
-    
-    def export_ical(self, cr, uid, datas, context={}):
-        return super(ToDo, self).export_ical(cr, uid, datas, 'vtodo', context=context)
+
+    def export_cal(self, cr, uid, datas, vobj='vevent', context={}):
+        return super(ToDo, self).export_cal(cr, uid, datas, 'vtodo', context=context)
 
 ToDo()
 
@@ -323,6 +548,8 @@ class Timezone(CalDAV):
 
 class Alarm(CalDAV, osv.osv_memory):
     _name = 'basic.calendar.alarm'
+    _calname = 'alarm'
+
     __attribute__ = {
     'action': None, # Use: R-1, Type: Text, defines the action to be invoked when an alarm is triggered LIKE "AUDIO" / "DISPLAY" / "EMAIL" / "PROCEDURE"
     'description': None, #      Type: Text, Provides a more complete description of the calendar component, than that provided by the "SUMMARY" property. Use:- R-1 for DISPLAY,Use:- R-1 for EMAIL,Use:- R-1 for PROCEDURE
@@ -335,37 +562,33 @@ class Alarm(CalDAV, osv.osv_memory):
     'x-prop': None, 
     }
 
-    def export_ical(self, cr, uid, alarm_datas, context={}):
-        ical = vobject.iCalendar()
-        vevent = ical.add('vevent')
-        valarms = []
-        for alarm_data in alarm_datas:
-            valarm = vevent.add('valarm')
-            
-            # Compute trigger data
-            interval = alarm_data['trigger_interval']
-            occurs = alarm_data['trigger_occurs']
-            duration = (occurs == 'after' and alarm_data['trigger_duration']) \
-                                                or -(alarm_data['trigger_duration'])
-            related = alarm_data['trigger_related']
-            trigger = valarm.add('trigger')
-            trigger.params['related'] = [related.upper()]
-            if interval == 'days':
-                delta = timedelta(days=duration)
-            if interval == 'hours':
-                delta = timedelta(hours=duration)
-            if interval == 'minutes':
-                delta = timedelta(minutes=duration)
-            trigger.value = delta
+    def export_cal(self, cr, uid, model, alarm_id, vevent, context={}):
+        valarm = vevent.add('valarm')
+        alarm_object = self.pool.get(model)
+        alarm_data = alarm_object.read(cr, uid, alarm_id, [])
 
-            # Compute other details
-            valarm.add('description').value = alarm_data['name']
-            valarm.add('action').value = alarm_data['action']
-            
-            valarms.append(valarm)
-        return valarms
-        
-    def import_ical(self, cr, uid, ical_data):        
+        # Compute trigger data
+        interval = alarm_data['trigger_interval']
+        occurs = alarm_data['trigger_occurs']
+        duration = (occurs == 'after' and alarm_data['trigger_duration']) \
+                                        or -(alarm_data['trigger_duration'])
+        related = alarm_data['trigger_related']
+        trigger = valarm.add('TRIGGER')
+        trigger.params['related'] = [related.upper()]
+        if interval == 'days':
+            delta = timedelta(days=duration)
+        if interval == 'hours':
+            delta = timedelta(hours=duration)
+        if interval == 'minutes':
+            delta = timedelta(minutes=duration)
+        trigger.value = delta
+
+        # Compute other details
+        valarm.add('DESCRIPTION').value = alarm_data['name']
+        valarm.add('ACTION').value = alarm_data['action']
+        return vevent
+
+    def import_cal(self, cr, uid, ical_data):
         for child in ical_data.getChildren():
             if child.name.lower() == 'trigger':
                 seconds = child.value.seconds
@@ -375,15 +598,15 @@ class Alarm(CalDAV, osv.osv_memory):
                 related = 'before'
                 if not seconds:
                     duration = abs(days)
-                    related = days>0 and 'after' or 'before'
+                    related = days > 0 and 'after' or 'before'
                 elif (abs(diff) / 3600) == 0:
                     duration = abs(diff / 60)
                     interval = 'minutes'
-                    related = days>=0 and 'after' or 'before'
+                    related = days >= 0 and 'after' or 'before'
                 else:
                     duration = abs(diff / 3600)
                     interval = 'hours'
-                    related = days>=0 and 'after' or 'before'
+                    related = days >= 0 and 'after' or 'before'
                 self.ical_set('trigger_interval', interval, 'value')
                 self.ical_set('trigger_duration', duration, 'value')
                 self.ical_set('trigger_occurs', related.lower(), 'value')
@@ -399,6 +622,8 @@ Alarm()
 
 class Attendee(CalDAV, osv.osv_memory):
     _name = 'basic.calendar.attendee'
+    _calname = 'attendee'
+
     __attribute__ = {
     'cutype': None, # Use: 0-1    Specify the type of calendar user specified by the property like "INDIVIDUAL"/"GROUP"/"RESOURCE"/"ROOM"/"UNKNOWN".
     'member': None, # Use: 0-1    Specify the group or list membership of the calendar user specified by the property.
@@ -413,10 +638,11 @@ class Attendee(CalDAV, osv.osv_memory):
     'language': None, # Use: 0-1    Specify the language for text values in a property or property parameter.
     }
 
-    def import_ical(self, cr, uid, ical_data):        
+    def import_cal(self, cr, uid, ical_data):
         for para in ical_data.params:
             if para.lower() == 'cn':
-                self.ical_set(para.lower(), ical_data.params[para][0]+':'+ ical_data.value, 'value')
+                self.ical_set(para.lower(), ical_data.params[para][0]+':'+ \
+                        ical_data.value, 'value')
             else:
                 self.ical_set(para.lower(), ical_data.params[para][0].lower(), 'value')
         if not ical_data.params.get('CN'):
@@ -424,20 +650,22 @@ class Attendee(CalDAV, osv.osv_memory):
         vals = map_data(cr, uid, self)
         return vals
 
-    def export_ical(self, cr, uid, attendee_data, context={}):        
-        ical = vobject.iCalendar()
-        attendees = []        
-        vevent = ical.add('vevent')
-        for attendee in attendee_data:            
+    def export_cal(self, cr, uid, model, attendee_ids, vevent, context={}):
+        attendee_object = self.pool.get(model)
+        self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, context)
+        for attendee in attendee_object.read(cr, uid, attendee_ids, []):
             attendee_add = vevent.add('attendee')
-            for a_key, a_val in self.__attribute__.items():                
-                if attendee[a_val['field']]:
+            cn_val = ''
+            for a_key, a_val in self.__attribute__.items():
+                if attendee[a_val['field']] and a_val['field'] != 'cn':
                     if a_val['type'] == 'text':
                         attendee_add.params[a_key] = [str(attendee[a_val['field']])]
                     elif a_val['type'] == 'boolean':
                         attendee_add.params[a_key] = [str(attendee[a_val['field']])]
-            attendees.append(attendee_add)
-        return attendees
+                if a_val['field'] == 'cn':
+                    cn_val = [str(attendee[a_val['field']])]
+            attendee_add.params['CN'] = cn_val 
+        return vevent
 
 Attendee()
 
diff --git a/addons/base_calendar/base_calendar_data.xml b/addons/base_calendar/base_calendar_data.xml
new file mode 100644
index 00000000000..0e7250071c8
--- /dev/null
+++ b/addons/base_calendar/base_calendar_data.xml
@@ -0,0 +1,369 @@
+<?xml version="1.0"?>
+<openerp>
+	<data noupdate="1">
+		
+		<record model="basic.calendar" id="basic_calendar1">
+			<field name="name">OpenERP</field>
+		</record>
+
+		<!--		Event attributes-->
+
+		<record model="basic.calendar.attributes" id="field_event_comment">
+			<field name="name">comment</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_uid">
+			<field name="name">uid</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_seq">
+			<field name="name">seq</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_recurrence-id">
+			<field name="name">recurrence-id</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_transp">
+			<field name="name">transp</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_attendee">
+			<field name="name">attendee</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_related">
+			<field name="name">related</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_rrule">
+			<field name="name">rrule</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_dtend">
+			<field name="name">dtend</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_valarm">
+			<field name="name">valarm</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_priority">
+			<field name="name">priority</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_location">
+			<field name="name">location</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_exrule">
+			<field name="name">exrule</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_resources">
+			<field name="name">resources</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_rstatus">
+			<field name="name">rstatus</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_status">
+			<field name="name">status</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_exdate">
+			<field name="name">exdate</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_dtstamp">
+			<field name="name">dtstamp</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_description">
+			<field name="name">description</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_rdate">
+			<field name="name">rdate</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_dtstart">
+			<field name="name">dtstart</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_class">
+			<field name="name">class</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_x-openobject-model">
+			<field name="name">x-openobject-model</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_created">
+			<field name="name">created</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_url">
+			<field name="name">url</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_summary">
+			<field name="name">summary</field>
+			<field name="type">vevent</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_event_contact">
+			<field name="name">contact</field>
+			<field name="type">vevent</field>
+		</record>
+
+
+<!--		Todo attributes-->
+
+		<record model="basic.calendar.attributes" id="field_todo_status">
+			<field name="name">status</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_comment">
+			<field name="name">comment</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_attendee">
+			<field name="name">attendee</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_valarm">
+			<field name="name">valarm</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_description">
+			<field name="name">description</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_seq">
+			<field name="name">seq</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_url">
+			<field name="name">url</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_completed">
+			<field name="name">completed</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_percent">
+			<field name="name">percent</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_due">
+			<field name="name">due</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_summary">
+			<field name="name">summary</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_priority">
+			<field name="name">priority</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_exdate">
+			<field name="name">exdate</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_location">
+			<field name="name">location</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_exrule">
+			<field name="name">exrule</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_duration">
+			<field name="name">duration</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_organizer">
+			<field name="name">organizer</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_dtstart">
+			<field name="name">dtstart</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_rrule">
+			<field name="name">rrule</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_class">
+			<field name="name">class</field>
+			<field name="type">vtodo</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_todo_uid">
+			<field name="name">uid</field>
+			<field name="type">vtodo</field>
+		</record>
+
+<!--		Attendee's attributes-->
+
+		<record model="basic.calendar.attributes" id="field_attendee_cn">
+			<field name="name">cn</field>
+			<field name="type">attendee</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_attendee_sent-by">
+			<field name="name">sent-by</field>
+			<field name="type">attendee</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_attendee_language">
+			<field name="name">language</field>
+			<field name="type">attendee</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_attendee_delegated-from">
+			<field name="name">delegated-from</field>
+			<field name="type">attendee</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_attendee_member">
+			<field name="name">member</field>
+			<field name="type">attendee</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_attendee_cutype">
+			<field name="name">cutype</field>
+			<field name="type">attendee</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_attendee_role">
+			<field name="name">role</field>
+			<field name="type">attendee</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_attendee_partstat">
+			<field name="name">partstat</field>
+			<field name="type">attendee</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_attendee_delegated-to">
+			<field name="name">delegated-to</field>
+			<field name="type">attendee</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_attendee_dir">
+			<field name="name">dir</field>
+			<field name="type">attendee</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_attendee_rsvp">
+			<field name="name">rsvp</field>
+			<field name="type">attendee</field>
+		</record>
+
+<!--	Alarm attributes-->
+
+		<record model="basic.calendar.attributes" id="field_alarm_attendee">
+			<field name="name">attendee</field>
+			<field name="type">alarm</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_alarm_trigger_duration">
+			<field name="name">trigger_duration</field>
+			<field name="type">alarm</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_alarm_description">
+			<field name="name">description</field>
+			<field name="type">alarm</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_alarm_attach">
+			<field name="name">attach</field>
+			<field name="type">alarm</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_alarm_trigger_occurs">
+			<field name="name">trigger_occurs</field>
+			<field name="type">alarm</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_alarm_trigger_interval">
+			<field name="name">trigger_interval</field>
+			<field name="type">alarm</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_alarm_summary">
+			<field name="name">summary</field>
+			<field name="type">alarm</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_alarm_duration">
+			<field name="name">duration</field>
+			<field name="type">alarm</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_alarm_repeat">
+			<field name="name">repeat</field>
+			<field name="type">alarm</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_alarm_action">
+			<field name="name">action</field>
+			<field name="type">alarm</field>
+		</record>
+
+		<record model="basic.calendar.attributes" id="field_alarm_trigger_related">
+			<field name="name">trigger_related</field>
+			<field name="type">alarm</field>
+		</record>
+
+	</data>
+</openerp>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
new file mode 100644
index 00000000000..0165e483f53
--- /dev/null
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+		<record id="view_calendar_form" model="ir.ui.view">
+			<field name="name">Basic Calendar</field>
+			<field name="model">basic.calendar</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Basic Calendar">
+					<field name="name" required="1" select="1" />
+					<field name="active" select="1" />
+                    <field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
+					    <form string="Calendar Lines">
+					        <field name="name" required="1" select="1" />
+					        <field name="object_id" required="1" select="1" />
+					        <field name="domain" select="1" />
+					        <field name="mapping_ids" select="1" colspan="4" nolabel="1">
+						        <tree string="Attributes Mapping" editable="bottom">
+							        <field name="name" required="1" domain="[('type', '=', parent.name)]"/>
+							        <field name="fn" select="1" />
+							        <field name="field_id" select="1" domain="[('model_id', '=', parent.object_id)]" />
+							        <field name="expr" />
+						        </tree>
+						        <form string="Attributes Mapping">
+							        <field name="name" select="1" required="1" domain="[('type', '=', parent.name)]"/>
+							        <field name="field_id" select="1" domain="[('model_id', '=', parent.object_id)]"
+								        required="1" />
+							        <field name="fn" select="1" required="1" />
+							        <field name="expr" />
+							        <separator string="Value Mapping" colspan="4" />
+							        <field name="mapping" select="1" colspan="4" nolabel="1" />
+						        </form>
+					        </field>
+				        </form>
+                        <tree string="Attributes Mapping" editable="bottom">
+					        <field name="name" select="1" />
+					        <field name="object_id" select="1" />
+				        </tree>
+                    </field>
+				</form>
+			</field>
+		</record>
+
+		<record id="action_view_calendar" model="ir.actions.act_window">
+            <field name="name">Calendar</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">basic.calendar</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+		<menuitem id="menu_calendar_configuration" name="Calendar"
+			parent="base.menu_base_config" sequence="10" />
+
+		<menuitem id="menu_calendar"
+			name="Calendar" parent="menu_calendar_configuration"
+			sequence="5" action="action_view_calendar" />
+
+	</data>
+</openerp>
diff --git a/addons/base_calendar/base_calendar_wizard.xml b/addons/base_calendar/base_calendar_wizard.xml
new file mode 100644
index 00000000000..1c20f80a06c
--- /dev/null
+++ b/addons/base_calendar/base_calendar_wizard.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+		<wizard string="Import .ics File" model="basic.calendar"
+			name="calendar.event.import" id="wizard_cal_event_import" />
+
+		<wizard string="Subscribe to a Remote calendar"
+			model="basic.calendar" name="calendar.event.subscribe"
+			id="wizard_cal_event_subscribe" multi="True" />
+
+		<wizard string="Export .ics File" model="basic.calendar"
+			name="calendar.event.export" id="wizard_cal_event_export" />
+
+		<wizard string="Edit this event" model="basic.calendar.event"
+			name="calendar.event.edit.this" id="wizard_edit_this_event"
+			menu="False" />
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
new file mode 100644
index 00000000000..dd84c390183
--- /dev/null
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -0,0 +1,6 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_basic_calendar_all","basic.calendar","model_basic_calendar",,1,1,1,1
+"access_basic_calendar_event_all","basic.calendar.event","model_basic_calendar_event",,1,1,1,1
+"access_basic_calendar_attendee_all","basic.calendar.attendee","model_basic_calendar_attendee",,1,1,1,1
+"access_calendar_todo_all","basic.calendar.todo","model_basic_calendar_todo",,1,1,1,1
+"access_basic_calendar_alarm_all","basic.calendar.alarm","model_basic_calendar_alarm",,1,1,1,1
diff --git a/addons/project_calendar/wizard/__init__.py b/addons/base_calendar/wizard/__init__.py
old mode 100644
new mode 100755
similarity index 97%
rename from addons/project_calendar/wizard/__init__.py
rename to addons/base_calendar/wizard/__init__.py
index 6bb857e3a21..e02dcdc0b06
--- a/addons/project_calendar/wizard/__init__.py
+++ b/addons/base_calendar/wizard/__init__.py
@@ -22,5 +22,7 @@
 import wizard_cal_export
 import wizard_cal_import
 import wizard_cal_subscribe
+import wizard_cal_edit_event
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_calendar/wizard/wizard_cal_edit_event.py b/addons/base_calendar/wizard/wizard_cal_edit_event.py
new file mode 100644
index 00000000000..c7f4e44dbd1
--- /dev/null
+++ b/addons/base_calendar/wizard/wizard_cal_edit_event.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import pooler
+
+class event_edit_this(wizard.interface):
+    event_form = """<?xml version="1.0"?>
+                <form string="Edit Event">
+                    <separator string="" colspan="4" />
+                    <newline />
+                    <field name='name' colspan="4" />
+                    <newline />
+                    <field name='location' colspan="4" />
+                    <newline />
+                    <field name='date' />
+                    <field name='date_deadline' />
+                    <newline />
+                    <field name='alarm_id'/>
+                </form>"""
+
+    event_fields = {
+        'name': {'string': 'Title', 'type': 'char', 'size': 64}, 
+        'date': {'string': 'Start Date', 'type': 'datetime'}, 
+        'date_deadline': {'string': 'End Date', 'type': 'datetime'}, 
+        'location': {'string': 'Location', 'type': 'char', 'size': 124}, 
+        'alarm_id': {'string': 'Reminder', 'type': 'many2one', 'relation': 'res.alarm'}, 
+    }
+    
+    def _default_values(self, cr, uid, data, context=None):
+        model = data.get('model')
+        model_obj = pooler.get_pool(cr.dbname).get(model)
+        event = model_obj.read(cr, uid, data['id'], ['name', 'location', 'alarm_id'])
+        event.update({
+                      'date': context.get('date'), 
+                      'date_deadline': context.get('date_deadline')
+                      })
+        return event
+
+    def _modify_this(self, cr, uid, datas, context=None):
+        model = datas.get('model')
+        model_obj = pooler.get_pool(cr.dbname).get(model)
+        new_id = model_obj.modify_this(cr, uid, [datas['id']], datas['form'], context)
+        value = {
+                'name': 'New event', 
+                'view_type': 'form', 
+                'view_mode': 'form,tree', 
+                'res_model': model, 
+                'res_id': new_id, 
+                'view_id': False, 
+                'type': 'ir.actions.act_window', 
+            }
+        return value
+
+    states = {
+        'init': {
+            'actions': [_default_values], 
+            'result': {'type': 'form', 'arch': event_form, 'fields': event_fields, 
+                'state': [('end', 'Cancel', 'gtk-cancel'), ('edit', '_Save', 'gtk-save')]}
+        }, 
+        'edit': {
+            'actions': [], 
+            'result': {'type': 'action', 'action': _modify_this, 'state': 'end'}
+        }
+    }
+
+event_edit_this('calendar.event.edit.this')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/wizard_cal_export.py b/addons/base_calendar/wizard/wizard_cal_export.py
similarity index 80%
rename from addons/crm/wizard/wizard_cal_export.py
rename to addons/base_calendar/wizard/wizard_cal_export.py
index 6a537f24f78..f7896c738d7 100644
--- a/addons/crm/wizard/wizard_cal_export.py
+++ b/addons/base_calendar/wizard/wizard_cal_export.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -24,7 +24,7 @@ import base64
 import pooler
 
 
-class crm_cal_export_wizard(wizard.interface):
+class cal_event_export_wizard(wizard.interface):
     form1 = '''<?xml version="1.0"?>
     <form string="Export ICS">
         <field name="name"/>
@@ -35,8 +35,8 @@ class crm_cal_export_wizard(wizard.interface):
             'file_path': {
                 'string': 'Save ICS file', 
                 'type': 'binary', 
-                'required' : True, 
-                'filters' : '*.ics'
+                'required': True, 
+                'filters': '*.ics'
                 },
             'name': {
                     'string': 'File name', 
@@ -47,18 +47,19 @@ class crm_cal_export_wizard(wizard.interface):
             }
     
     def _process_export_ics(self, cr, uid, data, context):
-        case_obj = pooler.get_pool(cr.dbname).get('crm.meeting')
-        calendar = case_obj.export_cal(cr, uid, data['ids'], context)
+        model = data.get('model')
+        model_obj = pooler.get_pool(cr.dbname).get(model)
+        calendar = model_obj.export_cal(cr, uid, data['ids'], context)
         return {'file_path': base64.encodestring(calendar), \
-                                'name': 'OpenERP Events.ics'}
-    
+                            'name': 'OpenERP %s.ics' % (model_obj._description)}
+
     states = {
         'init': {
             'actions': [_process_export_ics], 
             'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, \
-                       'state': [('end', '_Cancel', 'gtk-cancel'), ('end', 'Ok', 'gtk-ok')]}}, 
+                       'state': [('end', '_Cancel', 'gtk-cancel')]}}, 
     }
     
-crm_cal_export_wizard('caldav.crm.export')
+cal_event_export_wizard('calendar.event.export')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/wizard_cal_import.py b/addons/base_calendar/wizard/wizard_cal_import.py
similarity index 84%
rename from addons/crm/wizard/wizard_cal_import.py
rename to addons/base_calendar/wizard/wizard_cal_import.py
index ce814bc2ca1..a5670f545fa 100644
--- a/addons/crm/wizard/wizard_cal_import.py
+++ b/addons/base_calendar/wizard/wizard_cal_import.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -23,7 +23,7 @@ import wizard
 import pooler
 
 
-class crm_cal_import_wizard(wizard.interface):
+class cal_event_import_wizard(wizard.interface):
     form1 = '''<?xml version="1.0"?>
     <form string="Import ICS">
         <separator string="Select ICS file"/>
@@ -52,8 +52,10 @@ class crm_cal_import_wizard(wizard.interface):
             }
 
     def _process_imp_ics(self, cr, uid, data, context=None):
-        case_obj = pooler.get_pool(cr.dbname).get('crm.meeting')
-        vals = case_obj.import_cal(cr, uid, data['form']['file_path'], context)
+        model = data.get('model')
+        model_obj = pooler.get_pool(cr.dbname).get(model)
+        context.update({'model': model})
+        vals = model_obj.import_cal(cr, uid, data['form']['file_path'], data['id'], context)
         global cnt
         cnt = 0
         if vals:
@@ -61,7 +63,8 @@ class crm_cal_import_wizard(wizard.interface):
         return {}
     
     def _result_set(self, cr, uid, data, context=None):
-        return {'msg': 'Imported %s Event(s)' % cnt}
+        msg = (cnt and "Imported %s components" % cnt) or 'Import Sucessful' 
+        return {'msg': msg}
     
     states = {
         'init': {
@@ -72,7 +75,7 @@ class crm_cal_import_wizard(wizard.interface):
         'open': {
             'actions': [], 
             'result': {'type': 'action', 'action': _process_imp_ics, 'state': 'display'}
-        },
+        }, 
        'display': {
             'actions': [_result_set], 
             'result': {'type': 'form', 'arch': display, 'fields': display_fields, \
@@ -80,6 +83,6 @@ class crm_cal_import_wizard(wizard.interface):
         }, 
     }
     
-crm_cal_import_wizard('caldav.crm.import')
+cal_event_import_wizard('calendar.event.import')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/wizard_cal_subscribe.py b/addons/base_calendar/wizard/wizard_cal_subscribe.py
similarity index 89%
rename from addons/crm/wizard/wizard_cal_subscribe.py
rename to addons/base_calendar/wizard/wizard_cal_subscribe.py
index 5c6fa0250d0..c4dceab660c 100644
--- a/addons/crm/wizard/wizard_cal_subscribe.py
+++ b/addons/base_calendar/wizard/wizard_cal_subscribe.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -25,7 +25,7 @@ import pooler
 import urllib
 import wizard
 
-class crm_cal_subscribe_wizard(wizard.interface):
+class cal_event_subscribe_wizard(wizard.interface):
     form1 = '''<?xml version="1.0"?>
     <form string="Subscribe to Remote ICS">
         <separator string="Provide path for Remote Calendar"/>
@@ -58,13 +58,14 @@ class crm_cal_subscribe_wizard(wizard.interface):
         cnt = 0
         try:
             f =  urllib.urlopen(data['form']['url_path'])
-            caldata= f.fp.read()
+            caldata = f.fp.read()
             f.close()
         except Exception,e:
             raise wizard.except_wizard(_('Error!'), _('Please provide Proper URL !'))
-        case_obj = pooler.get_pool(cr.dbname).get('crm.meeting')
+        model = data.get('model')
+        model_obj = pooler.get_pool(cr.dbname).get(model)
         context.update({'url': data['form']['url_path']})
-        vals = case_obj.import_cal(cr, uid, base64.encodestring(caldata), context)
+        vals = model_obj.import_cal(cr, uid, base64.encodestring(caldata), context)
         if vals:
             cnt = vals['count']
         return {}
@@ -89,6 +90,6 @@ class crm_cal_subscribe_wizard(wizard.interface):
         }, 
     }
     
-crm_cal_subscribe_wizard('caldav.crm.subscribe')
+cal_event_subscribe_wizard('calendar.event.subscribe')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_contact/__init__.py b/addons/base_contact/__init__.py
index b733b39bedd..7cd056c1c20 100644
--- a/addons/base_contact/__init__.py
+++ b/addons/base_contact/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__terp__.py
index 5d8be6bc885..60c8d5f8fc3 100644
--- a/addons/base_contact/__terp__.py
+++ b/addons/base_contact/__terp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -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/>.
 #
 ##############################################################################
 
@@ -40,7 +40,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'process'],
+    'depends': ['base','process','sale'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index ceaa35aaddd..457a96a1c6b 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -39,6 +39,13 @@ class res_partner_contact(osv.osv):
         res = [(r['shortcut'], r['name']) for r in res if r['domain']=='contact']
         return res
 
+    def _main_job(self, cr, uid, ids, fields, arg, context=None):
+        res = dict.fromkeys(ids, False)
+        for contact in self.browse(cr, uid, ids, context):
+            if contact.job_ids:
+                res[contact.id] = contact.job_ids[0].name_get()[0]
+        return res
+
     _columns = {
         'name': fields.char('Last Name', size=30,required=True),
         'first_name': fields.char('First Name', size=30),
@@ -52,7 +59,7 @@ class res_partner_contact(osv.osv):
         'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the partner contact without removing it."),
         'partner_id':fields.related('job_ids','address_id','partner_id',type='many2one', relation='res.partner', string='Main Employer'),
         'function_id':fields.related('job_ids','function_id',type='many2one', relation='res.partner.function', string='Main Function'),
-        'job_id':fields.related('job_ids',type='many2one', relation='res.partner.job', string='Main Job'),
+        'job_id': fields.function(_main_job, method=True, type='many2one', relation='res.partner.job', string='Main Job'),
         'email': fields.char('E-Mail', size=240),
         'comment' : fields.text('Notes', translate=True),
         'photo' : fields.binary('Image'),
@@ -81,6 +88,12 @@ res_partner_contact()
 
 class res_partner_address(osv.osv):
 
+    def search(self, cr, user, args, offset=0, limit=None, order=None,
+            context=None, count=False):
+        if context and context.has_key('address_partner_id' ) and context['address_partner_id']:
+            args.append(('partner_id', '=', context['address_partner_id']))
+        return super(res_partner_address, self).search(cr, user, args, offset, limit, order, context, count)
+
     #overriding of the name_get defined in base in order to remove the old contact name
     def name_get(self, cr, user, ids, context={}):
         if not len(ids):
@@ -155,7 +168,7 @@ class res_partner_job(osv.osv):
 
     _defaults = {
         'sequence_contact' : lambda *a: 0,
-        'state' : lambda *a: 'current', 
+        'state' : lambda *a: 'current',
     }
 res_partner_job()
 
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 4a2a1c1377f..6123e7ed938 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -48,16 +48,13 @@
                        <field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
                             <form string="Functions and Addresses">
                                <group string="Partner" colspan="2" col="4">
-                                   <field name="name"  colspan="4"/>
-                                   <field name="address_id" colspan="4"/>
-                                   <field name="function_id" colspan="4"/>
-                                <field name="fax"/>
-                                <field name="extension"/>
-                                <field name="other"/>
-                                   <field name="date_start" />
-                                   <field name="date_stop" />
-                                   <field name="state" />
-                                   <field name="sequence_contact" />
+	                               <field name="function_id"/>
+	                               <field name="address_id" context="{'address_partner_id': name}"/>
+	                               <field name="name"/>
+	                               <field name="date_start" />
+	                               <field name="date_stop" />
+	                               <field name="state" />
+	                               <field name="sequence_contact" />
                                </group>
                                <group string="Communication" colspan="2" col="2">
                                    <field name="phone"/>
@@ -65,7 +62,7 @@
                                    <field name="email" widget="email"/>
                                    <field name="extension"/>
                                    <field name="other"/>
-                               </group>                                    
+                               </group>
                             </form>
                             <tree string="Functions and Addresses">
                                 <field name="sequence_contact" string="Seq."/>
@@ -90,7 +87,7 @@
                     </page>
                     <page string="Picture">
                         <field name="photo" nolabel="1" colspan="2" widget="image"/>
-                    </page>                    
+                    </page>
                 </notebook>
             </form>
         </field>
@@ -108,7 +105,7 @@
             </search>
         </field>
     </record>
-    
+
     <record model="ir.actions.act_window" id="action_partner_contact_form">
         <field name="name">Contacts</field>
         <field name="res_model">res.partner.contact</field>
@@ -117,8 +114,8 @@
         <field name="view_id" ref="view_partner_contact_tree"/>
         <field name="search_view_id" ref="view_partner_contact_search"/>
     </record>
-    <menuitem name="Partners/" id="menu_partner_contact_form" action="action_partner_contact_form"/>
-    <menuitem name="Partners/Addresses"  id="base.menu_partner_address_form"/>
+    <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
+    <menuitem name="Addresses" id="base.menu_partner_address_form" parent = "base.menu_address_book" sequence="3"/>
 
 
     <!-- Views for Partners -->
@@ -141,7 +138,7 @@
                            <field name="country_id" select="2" completion="1"/>
                            <field name="state_id" select="2"/>
                         </group>
-                        <group string="Communication" colspan="2" col="2"> 
+                        <group string="Communication" colspan="2" col="2">
                            <field name="phone"/>
                            <field name="fax"/>
                            <field name="email" widget="email"/>
@@ -159,17 +156,17 @@
                             </tree>
                             <form string="Contacts">
                             <group string="Partner" colspan="2" col="2">
-                                <field name="sequence_partner"/>                            
+                                <field name="sequence_partner"/>
                                 <field name="name"/>
                                 <field name="contact_id"/>
                                 <field name="function_id"/>
                             </group>
-                            <group string="Communication" colspan="2" col="2">    
+                            <group string="Communication" colspan="2" col="2">
                                 <field name="phone"/>
                                 <field name="fax"/>
                                 <field name="extension"/>
                                 <field name="other"/>
-                                <field name="email" widget="email"/>                                
+                                <field name="email" widget="email"/>
                                 <field name="extension"/>
                                 <field name="other"/>
                             </group>
@@ -188,8 +185,8 @@
             </field>
         </field>
     </record>
-    
-    
+
+
 <!-- don't display the categories, since it is displayed in an other tab-->
         <record model="ir.ui.view" id="view_partner_form_inherit2">
             <field name="name">res.partner.form</field>
@@ -312,6 +309,7 @@
     </record>
 
 
+    <!--
     <record id='view_partner_address_form_inherited5' model='ir.ui.view'>
         <field name='name'>res.partner.address.form.inherited5</field>
         <field name='model'>res.partner.address</field>
@@ -319,7 +317,7 @@
         <field name='type'>form</field>
         <field name='arch' type='xml'>
             <group string="Communication" colspan="2" col="2" position="after">
-			<newline/>
+            <newline/>
                 <field name="job_ids" mode="tree,form" colspan="4">
                     <tree string="Contacts" editable="top">
                         <field name="contact_id"/>
@@ -341,19 +339,20 @@
             </group>
         </field>
     </record>
-	
-	<record id="view_res_partner_address_filter" model="ir.ui.view">
-	    <field name="name">res.partner.address.select</field>
-	    <field name="model">res.partner.address</field>
-	    <field name="type">search</field>
-	    <field name="inherit_id" ref="base.view_res_partner_address_filter"/>
-	    <field name="arch" type="xml">
-	        <search string="Search Contact">
-               	<field name="job_ids" select='1'/>
-			</search>
-	    </field>
+    -->
+
+    <record id="view_res_partner_address_filter" model="ir.ui.view">
+        <field name="name">res.partner.address.select</field>
+        <field name="model">res.partner.address</field>
+        <field name="type">search</field>
+        <field name="inherit_id" ref="base.view_res_partner_address_filter"/>
+        <field name="arch" type="xml">
+            <search string="Search Contact">
+                   <field name="job_ids" select='1'/>
+            </search>
+        </field>
     </record>
-    
+
     <!-- Views for res.partner.job -->
     <record model="ir.ui.view" id="view_partner_job_tree">
         <field name="name">res.partner.job.tree</field>
@@ -383,7 +382,7 @@
                 <notebook>
                     <page string="General">
                         <field name="name" select="1"/>
-                        <field name="address_id" select="1"/>
+                        <field name="address_id" select="1" context="{'address_partner_id': name}"/>
                         <field name="contact_id" select="1"/>
                         <field name="function_id" select="1"/>
                         <field name="email" select="2" widget="email"/>
@@ -408,11 +407,11 @@
         <field name="res_model">res.partner.job</field>
         <field name="view_type">form</field>
     </record>
-    <menuitem
-        name="Partners/Contact's Jobs" 
-        action="action_res_partner_job" 
-        id="menu_action_res_partner_job"
-        groups="base.group_extended"/>
+<!--    <menuitem-->
+<!--        name="Partners/Contact's Jobs"-->
+<!--        action="action_res_partner_job"-->
+<!--        id="menu_action_res_partner_job"-->
+<!--        groups="base.group_extended"/>-->
 
     <!-- Act window defining a shorcut on partners to open all his contacts -->
     <act_window domain="[('name', '=', active_id)]"
@@ -420,6 +419,7 @@
         res_model="res.partner.job"
         src_model="res.partner"
         />
-
+        <menuitem name="Contacts" id="menu_procurement_mgt_partner_contact_form" action="action_partner_contact_form"
+      parent="purchase.menu_procurement_management_supplier"/>
 </data>
 </openerp>
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index a20c496d34c..670d6329fbd 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/i18n/tr.po
@@ -7,30 +7,30 @@ 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 17:44+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-24 18:48+0000\n"
+"Last-Translator: Oktay Altunergil <oktaya@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: 2009-12-16 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-01-25 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
-msgstr ""
+msgstr "Bağlantı Sırası"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
 msgid "res.partner.contact"
-msgstr ""
+msgstr "res.partner.contact"
 
 #. module: base_contact
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Nesne adı x_ ile başlamalı ve özel karakterler içermemelidir!"
 
 #. module: base_contact
 #: field:res.partner.job,function_id:0
@@ -45,7 +45,7 @@ msgstr ""
 #: view:res.partner.address:0
 #: field:res.partner.address,job_ids:0
 msgid "Contacts"
-msgstr "Kişiler"
+msgstr "Bağlantılar"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
@@ -55,7 +55,7 @@ msgstr ""
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Current"
-msgstr ""
+msgstr "Güncel"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
@@ -70,7 +70,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.job,other:0
 msgid "Other"
-msgstr ""
+msgstr "Diğer"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
diff --git a/addons/base_contact/process/base_contact_process.xml b/addons/base_contact/process/base_contact_process.xml
index 650b832ac4a..f8d28ab8e93 100755
--- a/addons/base_contact/process/base_contact_process.xml
+++ b/addons/base_contact/process/base_contact_process.xml
@@ -5,13 +5,13 @@
 	<!--
 		Process
 	-->
-	
+
 		<record id="process_process_basecontactprocess0" model="process.process">
 			<field eval="&quot;&quot;&quot;Base Contact&quot;&quot;&quot;" name="name"/>
 			<field eval="1" name="active"/>
 			<field name="model_id" ref="base_contact.model_res_partner_contact"/>
 		</record>
-		
+
 	<!--
 		Process node
 	-->
@@ -37,7 +37,7 @@
 		</record>
 
 		<record id="process_node_function0" model="process.node">
-			<field name="menu_id" ref="base_contact.menu_action_res_partner_job"/>
+<!--			<field name="menu_id" ref="base_contact.menu_action_res_partner_job"/>-->
 			<field name="model_id" ref="base_contact.model_res_partner_job"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Jobs at a same partner address.&quot;&quot;&quot;" name="note"/>
@@ -55,7 +55,7 @@
 			<field name="process_id" ref="process_process_basecontactprocess0"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 	<!--
 		Process Transition
 	-->
@@ -86,6 +86,6 @@
 			<field model="process.node" name="target_node_id" ref="process_node_addresses0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_partners0"/>
 		</record>
-		
+
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/base_iban/__init__.py b/addons/base_iban/__init__.py
index 759bd22dcd3..9ba4ad3813c 100644
--- a/addons/base_iban/__init__.py
+++ b/addons/base_iban/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_iban/__terp__.py b/addons/base_iban/__terp__.py
index 14c63765f6f..e8527ee6459 100644
--- a/addons/base_iban/__terp__.py
+++ b/addons/base_iban/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py
index 9368e3ceffe..d441dec668e 100644
--- a/addons/base_iban/base_iban.py
+++ b/addons/base_iban/base_iban.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_merge/__init__.py b/addons/base_module_merge/__init__.py
index 1fb7e40fa94..1631b934faf 100644
--- a/addons/base_module_merge/__init__.py
+++ b/addons/base_module_merge/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_merge/__terp__.py b/addons/base_module_merge/__terp__.py
index 4d59a5968ef..95342490a81 100644
--- a/addons/base_module_merge/__terp__.py
+++ b/addons/base_module_merge/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_merge/wizard/__init__.py b/addons/base_module_merge/wizard/__init__.py
index 79f4e7632f0..873cfd42e0d 100644
--- a/addons/base_module_merge/wizard/__init__.py
+++ b/addons/base_module_merge/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_merge/wizard/base_module_merge.py b/addons/base_module_merge/wizard/base_module_merge.py
index 425e16780cf..f35af552510 100644
--- a/addons/base_module_merge/wizard/base_module_merge.py
+++ b/addons/base_module_merge/wizard/base_module_merge.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_publish/__init__.py b/addons/base_module_publish/__init__.py
index 250123c8f54..f8a7a810426 100644
--- a/addons/base_module_publish/__init__.py
+++ b/addons/base_module_publish/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_publish/__terp__.py b/addons/base_module_publish/__terp__.py
index 6436e253884..8c637ca4238 100644
--- a/addons/base_module_publish/__terp__.py
+++ b/addons/base_module_publish/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_publish/wizard/__init__.py b/addons/base_module_publish/wizard/__init__.py
index c103615dbfb..9c7ddc8d00a 100644
--- a/addons/base_module_publish/wizard/__init__.py
+++ b/addons/base_module_publish/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_publish/wizard/base_module_publish.py b/addons/base_module_publish/wizard/base_module_publish.py
index b75e65565ea..ea0d774d631 100644
--- a/addons/base_module_publish/wizard/base_module_publish.py
+++ b/addons/base_module_publish/wizard/base_module_publish.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_publish/wizard/base_module_publish_all.py b/addons/base_module_publish/wizard/base_module_publish_all.py
index da95311bd03..17f79da16d8 100644
--- a/addons/base_module_publish/wizard/base_module_publish_all.py
+++ b/addons/base_module_publish/wizard/base_module_publish_all.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_publish/wizard/module_zip.py b/addons/base_module_publish/wizard/module_zip.py
index 48d1791c701..5eb194954d9 100644
--- a/addons/base_module_publish/wizard/module_zip.py
+++ b/addons/base_module_publish/wizard/module_zip.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_publish/wizard/wizard_module_export.py b/addons/base_module_publish/wizard/wizard_module_export.py
index 8b6bbbae207..f7341d8056d 100644
--- a/addons/base_module_publish/wizard/wizard_module_export.py
+++ b/addons/base_module_publish/wizard/wizard_module_export.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/__init__.py b/addons/base_module_quality/__init__.py
index 25e9b2ae4f3..8ff78f7c202 100644
--- a/addons/base_module_quality/__init__.py
+++ b/addons/base_module_quality/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/__terp__.py b/addons/base_module_quality/__terp__.py
index 04375987672..eaf73199e43 100644
--- a/addons/base_module_quality/__terp__.py
+++ b/addons/base_module_quality/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/base_module_quality.py b/addons/base_module_quality/base_module_quality.py
index 8bc607d27fd..d6d67d448c8 100644
--- a/addons/base_module_quality/base_module_quality.py
+++ b/addons/base_module_quality/base_module_quality.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/method_test/__init__.py b/addons/base_module_quality/method_test/__init__.py
index 50473681cde..f1d0e2c7767 100644
--- a/addons/base_module_quality/method_test/__init__.py
+++ b/addons/base_module_quality/method_test/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/method_test/method_test.py b/addons/base_module_quality/method_test/method_test.py
index 90e125f40b9..ef4e3f59ea3 100644
--- a/addons/base_module_quality/method_test/method_test.py
+++ b/addons/base_module_quality/method_test/method_test.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/object_test/__init__.py b/addons/base_module_quality/object_test/__init__.py
index 50473681cde..f1d0e2c7767 100644
--- a/addons/base_module_quality/object_test/__init__.py
+++ b/addons/base_module_quality/object_test/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/object_test/object_test.py b/addons/base_module_quality/object_test/object_test.py
index dcf2f8c4091..0a3f8ce379d 100644
--- a/addons/base_module_quality/object_test/object_test.py
+++ b/addons/base_module_quality/object_test/object_test.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/pep8_test/__init__.py b/addons/base_module_quality/pep8_test/__init__.py
index 50473681cde..f1d0e2c7767 100644
--- a/addons/base_module_quality/pep8_test/__init__.py
+++ b/addons/base_module_quality/pep8_test/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/pep8_test/pep8_test.py b/addons/base_module_quality/pep8_test/pep8_test.py
index 0918c5cb537..52c04756382 100644
--- a/addons/base_module_quality/pep8_test/pep8_test.py
+++ b/addons/base_module_quality/pep8_test/pep8_test.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/pylint_test/__init__.py b/addons/base_module_quality/pylint_test/__init__.py
index 6089b4b3fbe..037c418f166 100644
--- a/addons/base_module_quality/pylint_test/__init__.py
+++ b/addons/base_module_quality/pylint_test/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/pylint_test/pylint_test.py b/addons/base_module_quality/pylint_test/pylint_test.py
index 01c115ea658..8dbbce0e2ce 100644
--- a/addons/base_module_quality/pylint_test/pylint_test.py
+++ b/addons/base_module_quality/pylint_test/pylint_test.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/speed_test/__init__.py b/addons/base_module_quality/speed_test/__init__.py
index 50473681cde..f1d0e2c7767 100644
--- a/addons/base_module_quality/speed_test/__init__.py
+++ b/addons/base_module_quality/speed_test/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/speed_test/speed_test.py b/addons/base_module_quality/speed_test/speed_test.py
index e2a34eaa4dd..92b73a1cafa 100644
--- a/addons/base_module_quality/speed_test/speed_test.py
+++ b/addons/base_module_quality/speed_test/speed_test.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/structure_test/__init__.py b/addons/base_module_quality/structure_test/__init__.py
index 50473681cde..f1d0e2c7767 100644
--- a/addons/base_module_quality/structure_test/__init__.py
+++ b/addons/base_module_quality/structure_test/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/structure_test/structure_test.py b/addons/base_module_quality/structure_test/structure_test.py
index f88bdb70a3d..466976f5d17 100644
--- a/addons/base_module_quality/structure_test/structure_test.py
+++ b/addons/base_module_quality/structure_test/structure_test.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/terp_test/__init__.py b/addons/base_module_quality/terp_test/__init__.py
index 50473681cde..f1d0e2c7767 100644
--- a/addons/base_module_quality/terp_test/__init__.py
+++ b/addons/base_module_quality/terp_test/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/terp_test/terp_test.py b/addons/base_module_quality/terp_test/terp_test.py
index 964f92f8e12..993a80fe32b 100644
--- a/addons/base_module_quality/terp_test/terp_test.py
+++ b/addons/base_module_quality/terp_test/terp_test.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/unit_test/__init__.py b/addons/base_module_quality/unit_test/__init__.py
index c193a98e39a..f96719c920e 100644
--- a/addons/base_module_quality/unit_test/__init__.py
+++ b/addons/base_module_quality/unit_test/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/base_module_quality/unit_test/unit_test.py b/addons/base_module_quality/unit_test/unit_test.py
index 13253486cd3..598d443382f 100644
--- a/addons/base_module_quality/unit_test/unit_test.py
+++ b/addons/base_module_quality/unit_test/unit_test.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/base_module_quality/wizard/__init__.py b/addons/base_module_quality/wizard/__init__.py
index 2d2f86dbafb..8f496a6ab41 100644
--- a/addons/base_module_quality/wizard/__init__.py
+++ b/addons/base_module_quality/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/wizard/module_quality_check.py b/addons/base_module_quality/wizard/module_quality_check.py
index 8a233f173cc..ef2994e6a27 100644
--- a/addons/base_module_quality/wizard/module_quality_check.py
+++ b/addons/base_module_quality/wizard/module_quality_check.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/wizard/quality_save_report.py b/addons/base_module_quality/wizard/quality_save_report.py
index 0c00b197e55..853698dee1f 100644
--- a/addons/base_module_quality/wizard/quality_save_report.py
+++ b/addons/base_module_quality/wizard/quality_save_report.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -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/>.
 #
 ##############################################################################
 
@@ -25,6 +25,7 @@ import cStringIO
 import wizard
 from osv import osv
 import pooler
+from tools.translate import _
 
 form_rep = '''<?xml version="1.0"?>
 <form string="Standard entries">
@@ -35,7 +36,7 @@ form_rep = '''<?xml version="1.0"?>
 
 
 fields_rep = {
-  'name': {'string': 'File name', 'type': 'char', 'required': True, 'help': 'Save report as .html format'},
+  'name': {'string': 'File name', 'type': 'char', 'required': True, 'help': 'Save report as .html format', 'size':64},
   'module_file': {'string': 'Save report', 'type': 'binary', 'required': True},
 }
 
diff --git a/addons/base_module_quality/workflow_test/__init__.py b/addons/base_module_quality/workflow_test/__init__.py
index 50473681cde..f1d0e2c7767 100644
--- a/addons/base_module_quality/workflow_test/__init__.py
+++ b/addons/base_module_quality/workflow_test/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_quality/workflow_test/workflow_test.py b/addons/base_module_quality/workflow_test/workflow_test.py
index 29592f8e7cd..f92107e8fbd 100644
--- a/addons/base_module_quality/workflow_test/workflow_test.py
+++ b/addons/base_module_quality/workflow_test/workflow_test.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_record/__init__.py b/addons/base_module_record/__init__.py
index 0614483d705..924e6245c8a 100644
--- a/addons/base_module_record/__init__.py
+++ b/addons/base_module_record/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_record/__terp__.py b/addons/base_module_record/__terp__.py
index 5037a5df982..51dceec5b70 100644
--- a/addons/base_module_record/__terp__.py
+++ b/addons/base_module_record/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index 002a3254143..daacccafba5 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_record/wizard/__init__.py b/addons/base_module_record/wizard/__init__.py
index 927d1b62b29..533abfd84dc 100644
--- a/addons/base_module_record/wizard/__init__.py
+++ b/addons/base_module_record/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_module_record/wizard/base_module_record_data.py b/addons/base_module_record/wizard/base_module_record_data.py
index 279b43ced3e..d9972abf66a 100644
--- a/addons/base_module_record/wizard/base_module_record_data.py
+++ b/addons/base_module_record/wizard/base_module_record_data.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/base_module_record/wizard/base_module_record_objects.py b/addons/base_module_record/wizard/base_module_record_objects.py
index 35da7fb0612..c74dd744bdf 100644
--- a/addons/base_module_record/wizard/base_module_record_objects.py
+++ b/addons/base_module_record/wizard/base_module_record_objects.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -56,7 +56,7 @@ def _info_default(self, cr, uid, data, context):
      cr.execute('select max(create_date) from ir_model_data')
      c=(cr.fetchone())[0].split('.')[0]
      c = time.strptime(c,"%Y-%m-%d %H:%M:%S")
-     sec=c.tm_sec + 1
+     sec=c.tm_sec!=59 and c.tm_sec + 1
      c=(c[0],c[1],c[2],c[3],c[4],sec,c[6],c[7],c[8])
      data['form']['check_date']=time.strftime("%Y-%m-%d %H:%M:%S",c)
      return data['form']
@@ -108,7 +108,7 @@ class base_module_record_objects(wizard.interface):
                     ('record', 'Record', 'gtk-ok'),
                 ]
             }
-        },
+         },
          'record': {
             'actions': [],
             'result': {'type':'action','action':_record_objects,'state':'intro'}
@@ -124,7 +124,7 @@ class base_module_record_objects(wizard.interface):
                     ('save', 'Continue', 'gtk-ok'),
                 ]
             },
-            },
+         },
          'save': {
             'actions': [inter_call],
             'result': {
diff --git a/addons/base_module_record/wizard/base_module_save.py b/addons/base_module_record/wizard/base_module_save.py
index 512403f56fd..d99ab3c7d2d 100644
--- a/addons/base_module_record/wizard/base_module_save.py
+++ b/addons/base_module_record/wizard/base_module_save.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_report_creator/__init__.py b/addons/base_report_creator/__init__.py
index 3b8f1e4abcd..1806d825a0d 100644
--- a/addons/base_report_creator/__init__.py
+++ b/addons/base_report_creator/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_report_creator/__terp__.py b/addons/base_report_creator/__terp__.py
index 543ac13f313..5a78a903a5c 100644
--- a/addons/base_report_creator/__terp__.py
+++ b/addons/base_report_creator/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 795015864bd..36547f68ae5 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -64,8 +64,12 @@ class report_creator(osv.osv):
         fields = {}
         i = 0
         for f in report.field_ids:
-            fields['field'+str(i)] = models[f.field_id.model][f.field_id.name]
-            i+=1
+            if f.field_id.model:
+                fields['field'+str(i)] = models[f.field_id.model][f.field_id.name]
+                i+=1
+            else:
+                fields['column_count'] = {'readonly': True, 'type': 'integer', 'string': 'Count', 'size': 64, 'name': 'column_count'}
+            
         return fields
 
     #
@@ -81,8 +85,12 @@ class report_creator(osv.osv):
         fields = {}
         i = 0
         for f in report.field_ids:
-            fields['field'+str(i)] = models[f.field_id.model][f.field_id.name]
-            i+=1
+            if f.field_id.model:
+                fields['field'+str(i)] = models[f.field_id.model][f.field_id.name]
+                i+=1
+            else:
+                fields['column_count'] = {'readonly': True, 'type': 'integer', 'string': 'Count', 'size': 64, 'name': 'column_count'}
+            
         arch = '<?xml version="1.0" encoding="utf-8"?>\n'
         if view_type=='graph':
             arch +='<graph string="%s" type="%s" orientation="%s">' % (report.name, report.view_graph_type,report.view_graph_orientation)
@@ -90,8 +98,12 @@ class report_creator(osv.osv):
                 i = 0
                 for f in report.field_ids:
                     if f.graph_mode==val:
-                        arch += '<field name="%s" select="1"/>' % ('field'+str(i),)
-                    i+=1
+                        if f.field_id.model:
+                            arch += '<field name="%s" select="1"/>' % ('field'+str(i),)
+                            i+=1
+                        else:
+                            arch += '<field name="%s" select="1"/>' % ('column_count',)
+                    
         elif view_type=='calendar':
             required_types = ['date_start','date_delay','color']
             set_dict = {'view_type':view_type,'string':report.name}
@@ -99,13 +111,21 @@ class report_creator(osv.osv):
             i=0
             for f in report.field_ids:
                 if f.calendar_mode and f.calendar_mode in required_types:
-                    set_dict[f.calendar_mode] = 'field'+str(i)
-                    i+=1
+                    if f.field_id.model:
+                        field_cal = 'field'+str(i)
+                        i+=1
+                    else:
+                        field_cal = 'column_count'
+                    set_dict[f.calendar_mode] = field_cal   
                     del required_types[required_types.index(f.calendar_mode)]
 
                 else:
-                    temp_list.append('''<field name="%(name)s" select="1"/>''' % {'name':'field'+str(i)})
-                    i+=1
+                    if f.field_id.model:
+                        temp_list.append('''<field name="%(name)s" select="1"/>''' % {'name':'field'+str(i)})
+                        i+=1
+                    else:
+                        temp_list.append('''<field name="%(name)s" select="1"/>''' % {'name':'column_count'})    
+                    
             arch += '''<%(view_type)s string="%(string)s" date_start="%(date_start)s" ''' %set_dict
             if set_dict.get('date_delay',False):
                 arch +=''' date_delay="%(date_delay)s"  '''%set_dict
@@ -121,8 +141,11 @@ class report_creator(osv.osv):
             arch += '<%s string="%s">\n' % (view_type, report.name)
             i = 0
             for f in report.field_ids:
-                arch += '<field name="%s" select="1"/>' % ('field'+str(i),)
-                i+=1
+                if f.field_id.model:
+                    arch += '<field name="%s" select="1"/>' % ('field'+str(i),)
+                    i+=1
+                else:
+                    arch += '<field name="%s" select="1"/>' % ('column_count',)
         arch += '</%s>' % (view_type,)
         result = {
             'arch': arch,
@@ -166,14 +189,20 @@ class report_creator(osv.osv):
         i = 0
         fields = {}
         for f in report.field_ids:
-            fields['field'+str(i)] = (f.field_id.model, f.field_id.name)
-            i+=1
+            if f.field_id.model:
+                fields['field'+str(i)] = (f.field_id.model, f.field_id.name)
+                i+=1
+            else:
+                fields['column_count'] = (False, 'Count')   
         newargs = []
         newargs2 = []
         for a in args:
-            res =  self.pool.get(fields[a[0]][0])._where_calc(cr, user, [[fields[a[0]][1],a[1],a[2]]], active_test=False, context=context)
-            newargs+=res[0]
-            newargs2+=res[1]
+            if fields[a[0]][0]:
+                res = self.pool.get(fields[a[0]][0])._where_calc(cr, user, [[fields[a[0]][1],a[1],a[2]]], active_test=False, context=context)
+                newargs+=res[0]
+                newargs2+=res[1]
+            else:
+                newargs += [("count(*) " + a[1] +" " + str(a[2]))]
         ctx = context or {}
         ctx['getid'] = True
         report = self._sql_query_get(cr, user, [context['report_id']], 'sql_query', None, ctx, where_plus=newargs, limit=limit, offset=offset)
@@ -198,7 +227,7 @@ class report_creator(osv.osv):
         filter_list = []
         for model in models:
             model_dict[model.model] = self.pool.get(model.model)._table
-
+            
         model_list = model_dict.keys()
         reference_model_dict = {}
         for model in model_dict:
@@ -207,10 +236,22 @@ class report_creator(osv.osv):
             rest_list.remove(model)
             model_pool = self.pool.get(model)
             fields_get = model_pool.fields_get(cr,uid)
-            fields_filter = dict(filter(lambda x:x[1].get('relation',False)
-                                        and x[1].get('relation') in rest_list
-                                        and x[1].get('type')=='many2one'
-                                        and not (isinstance(model_pool._columns[x[0]],fields.function) or isinstance(model_pool._columns[x[0]],fields.related) or isinstance(model_pool._columns[x[0]],fields.dummy)), fields_get.items()))
+            model_columns = {}
+            
+            def _get_inherit_fields(obj):
+                pool_model = self.pool.get(obj)
+                #Adding the columns of the model itself
+                model_columns.update(pool_model._columns)
+                #Adding the columns of its _inherits
+                for record in pool_model._inherits.keys():
+                     _get_inherit_fields(record)
+
+            _get_inherit_fields(model)         
+            
+            fields_filter = dict(filter(lambda x:x[1].get('relation',False) 
+                                        and x[1].get('relation') in rest_list 
+                                        and x[1].get('type')=='many2one' 
+                                        and not (isinstance(model_columns[x[0]],fields.function) or isinstance(model_columns[x[0]],fields.related)), fields_get.items()))
             if fields_filter:
                 model in model_list and model_list.remove(model)
             model_count = reference_model_dict.get(model,False)
@@ -225,9 +266,10 @@ class report_creator(osv.osv):
                     reference_model_dict[v.get('relation')] = relation_count+1
                 else:
                     reference_model_dict[v.get('relation')]=1
-
-                str_where = model_dict.get(model)+"."+ k + "=" + model_dict.get(v.get('relation'))+'.id'
-                where_list.append(str_where)
+                if k in self.pool.get(model)._columns:
+                    str_where = model_dict.get(model)+"."+ k + "=" + model_dict.get(v.get('relation'))+'.id'
+                    where_list.append(str_where)
+                    
         if reference_model_dict:
             self.model_set_id = model_dict.get(reference_model_dict.keys()[reference_model_dict.values().index(min(reference_model_dict.values()))])
         if model_list and not len(model_dict.keys()) == 1:
@@ -250,6 +292,7 @@ class report_creator(osv.osv):
 
 
         if where_list:
+            where_list = list(set(where_list))
             ret_str+="\n where \n"+" and\n".join(where_list)
             ret_str = ret_str.strip()
         if filter_list:
@@ -272,12 +315,16 @@ class report_creator(osv.osv):
             groupby = []
             i = 0
             for f in obj.field_ids:
+                # Allowing to use count(*)
+                if not f.field_id.model and f.group_method == 'count':
+                    fields.insert(0,('count(*) as column_count'))
+                    continue
                 t = self.pool.get(f.field_id.model_id.model)._table
                 if f.group_method == 'group':
                     fields.append('\t'+t+'.'+f.field_id.name+' as field'+str(i))
-                    groupby.append(t+'.'+f.field_id.name)
                 else:
                     fields.append('\t'+f.group_method+'('+t+'.'+f.field_id.name+')'+' as field'+str(i))
+                groupby.append(t+'.'+f.field_id.name)
                 i+=1
             models = self._path_get(cr, uid, obj.model_ids, obj.filter_ids)
             check = self._id_get(cr, uid, ids[0], context)
@@ -336,6 +383,9 @@ class report_creator(osv.osv):
         this_objs = self.browse(cr, uid, ids)
         for obj in this_objs:
             for fld in obj.field_ids:
+                # Allowing to use count(*)
+                if not fld.field_id.model and fld.group_method == 'count':
+                    continue
                 model_column = self.pool.get(fld.field_id.model)._columns[fld.field_id.name]
                 if (isinstance(model_column,fields.function) or isinstance(model_column,fields.related)) and not model_column.store:
                     return False
@@ -347,7 +397,10 @@ class report_creator(osv.osv):
         this_objs = self.browse(cr, uid, ids)
         for obj in this_objs:
             for fld in obj.field_ids:
-                model_column = self.pool.get(fld.field_id.model)._columns[fld.field_id.name]
+                # Allowing to use count(*)
+                if not fld.field_id.model and fld.group_method == 'count':
+                    continue
+                model_column = self.pool.get(fld.field_id.model)._columns[fld.field_id.name]                
                 if model_column._type not in aggregate_columns and fld.group_method in apply_functions:
                     return False
         return True
@@ -359,6 +412,9 @@ class report_creator(osv.osv):
         for obj in this_objs:
             if obj.view_type1=='calendar' or obj.view_type2=='calendar' or obj.view_type3=='calendar':
                 for fld in obj.field_ids:
+                    # Allowing to use count(*)
+                    if not fld.field_id.model and fld.group_method == 'count':
+                        continue
                     model_column = self.pool.get(fld.field_id.model)._columns[fld.field_id.name]
                     if fld.calendar_mode in ('date_start','date_end') and model_column._type not in ('date','datetime'):
                         return False
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index 1a1a8c17482..30c6b3735a9 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -14,7 +14,7 @@
             </tree>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="base_report_creator_tree">
         <field name="name">base_report_creator.report.tree</field>
         <field name="model">base_report_creator.report</field>
@@ -67,7 +67,7 @@
                         </form>
                         <tree editable="bottom" string="Fields to Display">
                             <field name="sequence"/>
-                            <field name="field_id" domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2]),('ttype','&lt;&gt;','many2many'),('ttype','&lt;&gt;','one2many')] or []"/>
+                            <field name="field_id" domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2]),('ttype','&lt;&gt;','many2many'),('ttype','&lt;&gt;','one2many')] or []" attrs="{'required':[('group_method','!=','count')]}"/>
                             <field name="group_method"/>
                             <field name="graph_mode"/>
                             <field name="calendar_mode"/>
@@ -104,9 +104,12 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-    <menuitem 
-        name="Custom Reports" parent="board.next_id_50"
-        id="menu_base_report_creator_action_config" 
+    <menuitem
+        name="Custom Reports" id="base.menu_custom_reports"
+        action="base_report_creator_action" parent="base.reporting_menu" sequence="1"/>
+    <menuitem
+        name="Custom Reports" parent="base.next_id_50"
+        id="menu_base_report_creator_action_config"
         action="base_report_creator_action"/>
 
     <record model="ir.ui.view" id="base_report_creator_tree_simple">
@@ -123,9 +126,9 @@
         <field name="res_model">base_report_creator.report</field>
         <field name="view_type">tree</field>
     </record>
-    <menuitem 
-        name="Custom Reports" parent="board.dashboard_menu"
-        id="menu_base_report_creator_action" 
+    <menuitem
+        name="Custom Reports" parent="base.menu_custom_reports"
+        id="menu_base_report_creator_action"
         action="base_report_creator_action_tree"/>
 
     <wizard
diff --git a/addons/base_report_creator/wizard/__init__.py b/addons/base_report_creator/wizard/__init__.py
index 4f24af84b58..8fd4dff283a 100644
--- a/addons/base_report_creator/wizard/__init__.py
+++ b/addons/base_report_creator/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_report_creator/wizard/base_report_creator_open.py b/addons/base_report_creator/wizard/base_report_creator_open.py
index 37e227fe005..be7420c5744 100644
--- a/addons/base_report_creator/wizard/base_report_creator_open.py
+++ b/addons/base_report_creator/wizard/base_report_creator_open.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -25,13 +25,15 @@ import netsvc
 import time
 import pooler
 from osv import osv
-
+from tools.translate import _
 
 
 
 class report_creator_open(wizard.interface):
     def _open_report(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
+        if context.get('report_id',False):
+            raise  wizard.except_wizard(_('UserError'),_('No Wizards available for this object!'))
         rep = pool.get('base_report_creator.report').browse(cr, uid, data['id'], context)
         view_mode = rep.view_type1
         if rep.view_type2:
diff --git a/addons/base_report_creator/wizard/report_menu_create.py b/addons/base_report_creator/wizard/report_menu_create.py
index 31773ed7613..5d3cc322a7f 100644
--- a/addons/base_report_creator/wizard/report_menu_create.py
+++ b/addons/base_report_creator/wizard/report_menu_create.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_report_creator/wizard/wiz_set_filter_fields.py b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
index a8cd20bc4a2..cf4accf56e9 100644
--- a/addons/base_report_creator/wizard/wiz_set_filter_fields.py
+++ b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -22,6 +22,7 @@
 import wizard
 import netsvc
 import pooler
+import tools
 
 relation_type=['one2many','many2one','many2many']
 char_type = ['char','text','selection']
@@ -121,7 +122,7 @@ def _set_filter_value(self, cr, uid, data, context):
     model_pool = pooler.get_pool(cr.dbname).get(model_name)
     table_name = model_pool._table
     model_name = model_pool._description
-    
+
     if field_type:
         if field_type == 'boolean':
             if value_data == 1:
@@ -138,12 +139,12 @@ def _set_filter_value(self, cr, uid, data, context):
             fields_list = set_field_operator(self,table_name+"."+field_data['name'],field_data['ttype'],form_data['operator'],value_data)
         if fields_list:
             create_dict = {
-                           'name':model_name + "/" +field_data['field_description'] +" "+ mapping_fields[form_data['operator']] + " " + str(fields_list[2]) + " ",
-                           'expression':' '.join(map(str,fields_list)),
+                           'name':model_name + "/" +field_data['field_description'] +" "+ mapping_fields[form_data['operator']] + " " + tools.ustr(fields_list[2]) + " ",
+                           'expression':' '.join(map(tools.ustr,fields_list)),
                            'report_id':data['id'],
                            'condition' : form_data['condition']
                            }
-            pooler.get_pool(cr.dbname).get('base_report_creator.report.filter').create(cr,uid,create_dict)
+            pooler.get_pool(cr.dbname).get('base_report_creator.report.filter').create(cr,uid,create_dict,context)
         #end if field_type == 'many2many' and value_data and len(value_data):
 #       pooler.get_pool(cr.dbname).get('custom.report.filter').create(cr,uid,form_data)
     #end if field_type:
diff --git a/addons/base_report_designer/__init__.py b/addons/base_report_designer/__init__.py
index cfbb6d80c02..46a0a1e2476 100644
--- a/addons/base_report_designer/__init__.py
+++ b/addons/base_report_designer/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_report_designer/__terp__.py b/addons/base_report_designer/__terp__.py
index 471e19acbbd..0d2ca29e657 100644
--- a/addons/base_report_designer/__terp__.py
+++ b/addons/base_report_designer/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py
index af13a5186ca..bddc9da9e17 100644
--- a/addons/base_report_designer/base_report_designer.py
+++ b/addons/base_report_designer/base_report_designer.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_report_designer/base_report_designer_wizard.xml b/addons/base_report_designer/base_report_designer_wizard.xml
index d320df74baa..3485428fbf5 100644
--- a/addons/base_report_designer/base_report_designer_wizard.xml
+++ b/addons/base_report_designer/base_report_designer_wizard.xml
@@ -8,12 +8,20 @@
 			name="base_report_designer.modify"
 			id="wizard_report_designer_modify"/>
 
+		<menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+    	<menuitem
+            id="base.next_id_50"
+            name="Configuration"
+            parent="base.reporting_menu"
+            groups="base.group_system"
+            sequence="3"/>
 		<menuitem
-			parent="base.menu_custom"
+			parent="base.next_id_50"
 			name="Report Designer"
 			action="wizard_report_designer_modify"
 			type="wizard"
-			id="menu_wizard_report_designer_modify"/>
+			id="menu_wizard_report_designer_modify"
+			sequence="70"/>
 
 
 
diff --git a/addons/base_report_designer/wizard/__init__.py b/addons/base_report_designer/wizard/__init__.py
index 39ae0957464..f80f87da1d5 100644
--- a/addons/base_report_designer/wizard/__init__.py
+++ b/addons/base_report_designer/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py
index 7427bf9bdf7..4fe9a42f5b7 100644
--- a/addons/base_report_designer/wizard/base_report_designer_modify.py
+++ b/addons/base_report_designer/wizard/base_report_designer_modify.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py b/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py
index 70c058b975a..ce14b22af8f 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 250123c8f54..2e2da2196e5 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import installer
 import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/__terp__.py b/addons/base_setup/__terp__.py
index 660206a20be..6f7f4337740 100644
--- a/addons/base_setup/__terp__.py
+++ b/addons/base_setup/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -41,7 +41,9 @@
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': ['base_setup_data.xml'],
-    'update_xml': ['security/ir.model.access.csv', 'base_setup_wizard.xml'],
+    'update_xml': ['security/ir.model.access.csv',
+                   'base_setup_wizard.xml',
+                   'base_setup_installer.xml'],
     'demo_xml': ['base_setup_demo.xml'],
     'installable': True,
     'active': True,
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
new file mode 100644
index 00000000000..b01e19a4a84
--- /dev/null
+++ b/addons/base_setup/base_setup_installer.xml
@@ -0,0 +1,71 @@
+<openerp>
+  <data>
+    <record id="view_base_setup_installer" model="ir.ui.view">
+      <field name="name">base.setup.installer.view</field>
+      <field name="model">base.setup.installer</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="arch" type="xml">
+        <data>
+          <form position="attributes"><attribute name="string">
+              Base Setup Modules Installation
+          </attribute></form>
+
+          <group string="res_config_contents" position="replace">
+            <separator string="Install Modules" colspan="4"/>
+            <image name="gtk-dialog-info"/>
+            <newline/>
+            <label align="0.0" string=" Lorem ipsum dolor
+                sit amet, consectetur adipiscing elit. Cras metus
+                augue, ultricies et vehicula id, fringilla quis
+                mauris. Vestibulum fringilla ipsum sit amet est
+                adipiscing eget euismod velit semper. Proin non mauris
+                velit. Donec malesuada nisi sed augue viverra commodo
+                sagittis nisi rutrum. Cras vitae libero nunc, a
+                molestie sapien. Proin et augue sit amet est egestas
+                fermentum ut eu lacus. Etiam nisi orci, volutpat
+                aliquam viverra interdum, vehicula iaculis
+                lectus. Mauris ligula sapien, auctor in pharetra non,
+                ultrices quis odio."/>
+            <group>
+              <separator string="Generic Modules" colspan="4"/>
+              <field name="crm"/> <field name="sale"/>
+              <field name="project"/> <field name="knowledge"/>
+              <field name="stock"/> <field name="mrp"/>
+              <field name="account"/>
+              <field name="charts" attrs="{'readonly':[('account','=',False)]}"/>
+              <field name="purchase"/> <field name="hr"/>
+              <field name="point_of_sale"/> <field name="marketing"/>
+              <field name="misc_tools"/> <field name="report_designer"/>
+              <separator string="Generic Modules" colspan="4"/>
+              <field name="profile_association"/>
+              <field name="profile_training"/>
+              <field name="profile_auction"/>
+              <field name="profile_bookstore"/>
+            </group>
+          </group>
+
+          <xpath expr='//button[@name="action_skip"]' position='replace'/>
+          <xpath expr='//button[@name="action_next"]' position='attributes'>
+            <attribute name='string'>Install Modules</attribute>
+          </xpath>
+        </data>
+      </field>
+    </record>
+
+    <record id="action_base_setup_installer" model="ir.actions.act_window">
+      <field name="name">Base Setup Modules Installation</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">base.setup.installer</field>
+      <field name="view_id" ref="view_base_setup_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="base_setup_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_base_setup_installer"/>
+      <field name="sequence">1</field>
+    </record>
+  </data>
+</openerp>
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 9b148f60e86..b1c018e705a 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.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 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-01-24 18:52+0000\n"
+"Last-Translator: Oktay Altunergil <oktaya@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: 2009-12-16 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-01-25 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -84,7 +84,7 @@ msgstr ""
 #: wizard_field:base_setup.base_setup,init,state_id:0
 #: wizard_field:base_setup.base_setup,update,state_id:0
 msgid "State"
-msgstr ""
+msgstr "Eyalet"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
new file mode 100644
index 00000000000..cb3dbdfdb9e
--- /dev/null
+++ b/addons/base_setup/installer.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from itertools import chain
+from operator import itemgetter
+import netsvc
+
+class base_setup_installer(osv.osv_memory):
+    _name = 'base.setup.installer'
+    _inherit = 'res.config.installer'
+
+    def _get_charts(self, cr, uid, context=None):
+        modules = self.pool.get('ir.module.module')
+        ids = modules.search(cr, uid, [('category_id','=','Account Charts'),
+                                       ('state','!=','installed')])
+        return list(
+            sorted(((m.name, m.shortdesc)
+                    for m in modules.browse(cr, uid, ids)),
+                   key=itemgetter(1)))
+
+    def _if_account(self, cr, uid, ids, context=None):
+        chart = self.read(cr, uid, ids, ['charts'],
+                          context=context)[0]['charts']
+        self.logger.notifyChannel(
+            'installer', netsvc.LOG_DEBUG,
+            'Addon "account" selected, installing chart of accounts %s'%chart)
+        return [chart]
+
+    _install_if = {
+        ('sale','crm'): ['sale_crm'],
+        ('sale','project'): ['project_mrp'],
+        }
+    _columns = {
+        # Generic modules
+        'crm':fields.boolean('Customer Relationship Management'),
+        'sale':fields.boolean('Sales Management'),
+        'project':fields.boolean('Project Management'),
+        'knowledge':fields.boolean('Knowledge Management'),
+        'stock':fields.boolean('Warehouse Management'),
+        'mrp':fields.boolean('Manufacturing'),
+        'account':fields.boolean('Financial & Accounting'),
+        'charts':fields.selection(_get_charts, 'Chart of Accounts',
+                                  readonly=True),
+        'purchase':fields.boolean('Purchase Management'),
+        'hr':fields.boolean('Human Resources'),
+        'point_of_sale':fields.boolean('Point of Sales'),
+        'marketing':fields.boolean('Marketing'),
+        'misc_tools':fields.boolean('Miscellaneous Tools'),
+        'report_designer':fields.boolean('Advanced Reporting'),
+        # Vertical modules
+        'profile_association':fields.boolean('Associations'),
+        'profile_training':fields.boolean('Training Centers'),
+        'profile_auction':fields.boolean('Auction Houses'),
+        'profile_bookstore':fields.boolean('Book Stores'),
+        }
+    _defaults = {
+        'crm': True,
+        }
+base_setup_installer()
+
diff --git a/addons/base_setup/wizard/__init__.py b/addons/base_setup/wizard/__init__.py
index deb6bd2fea0..a322ae346b3 100644
--- a/addons/base_setup/wizard/__init__.py
+++ b/addons/base_setup/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index 9a6e61084ce..0dd9175129d 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -241,8 +241,9 @@ class wizard_base_setup(wizard.interface):
         return 'charts'
 
     def _config(self, cr, uid, data, context=None):
-        users_obj=pooler.get_pool(cr.dbname).get('res.users')
-        action_obj=pooler.get_pool(cr.dbname).get('ir.actions.act_window')
+        pool = pooler.get_pool(cr.dbname)
+        users_obj=pool.get('res.users')
+        action_obj=pool.get('ir.actions.act_window')
 
         ids=action_obj.search(cr, uid, [('name', '=', 'Menu')])
         menu=action_obj.browse(cr, uid, ids)[0]
@@ -251,14 +252,8 @@ class wizard_base_setup(wizard.interface):
         users_obj.write(cr, uid, ids, {'action_id': menu.id})
         ids=users_obj.search(cr, uid, [('menu_id', '=', 'Setup')])
         users_obj.write(cr, uid, ids, {'menu_id': menu.id})
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'context':{'menu':True},
-                'target':'new',
-         }
+
+        return pool.get('res.config').next(cr, uid, [], context=context)
 
     fields={
         'profile':{
diff --git a/addons/base_vat/__init__.py b/addons/base_vat/__init__.py
index 3982c1f465f..5a220084ca0 100644
--- a/addons/base_vat/__init__.py
+++ b/addons/base_vat/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_vat/__terp__.py b/addons/base_vat/__terp__.py
index 4e624a85b5e..6e1f03e4644 100644
--- a/addons/base_vat/__terp__.py
+++ b/addons/base_vat/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/base_vat/partner.py b/addons/base_vat/partner.py
index bb822cddbe4..61643781fed 100644
--- a/addons/base_vat/partner.py
+++ b/addons/base_vat/partner.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    Copyright (C) 2008-2009 B2CK, Cedric Krier, Bertrand Chenal (the methods "check_vat_[a-z]{2}" 
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/board/__init__.py b/addons/board/__init__.py
index fe46dd720e8..47e5ea7bd80 100644
--- a/addons/board/__init__.py
+++ b/addons/board/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board/__terp__.py b/addons/board/__terp__.py
index c0147c674cd..07c595c1fc9 100644
--- a/addons/board/__terp__.py
+++ b/addons/board/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board/board.py b/addons/board/board.py
index 107477e8daf..7ea9fa9f1dc 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 3893d3f628b..2b9341decd3 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-graph" id="dashboard_menu" name="Dashboards"/>
-
+        <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+<!--		<menuitem icon="terp-graph" id="dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>-->
         <record id="view_board_note_tree" model="ir.ui.view">
             <field name="name">board.note.tree</field>
             <field name="model">board.note</field>
@@ -34,12 +34,7 @@
             <field name="view_mode">form,tree</field>
         </record>
 
-        <menuitem action="action_view_board_note_form" id="menu_view_board_note_form" parent="board.dashboard_menu"
-                  sequence="100"
-                  groups="base.group_system" />
-
-        <wizard id="wizard_board_create_menu" model="board.board" multi="True" name="board.board.menu.create" string="Create Board Menu"/>
-
+        <wizard id="wizard_board_create_menu" model="board.board" multi="True" name="board.board.menu.create" string="Create Board Menu" />
 
         <record id="view_board_tree" model="ir.ui.view">
             <field name="name">board.board.tree</field>
@@ -86,15 +81,18 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem
-            id="next_id_50"
+            id="base.next_id_50"
             name="Configuration"
-            parent="board.dashboard_menu"
+            parent="base.reporting_menu"
             groups="base.group_system"
-            sequence="0"/>
+            sequence="3"/>
         <menuitem
             action="action_view_board_list_form"
             id="menu_view_board_form"
-            parent="next_id_50"/>
+            parent="base.next_id_50" sequence="1"/>
+        <menuitem action="action_view_board_note_form" id="menu_view_board_note_form" parent="base.next_id_50"
+                  sequence="3"
+                  groups="base.group_system" />
         <act_window context="{'view': active_id}" id="dashboard_open" multi="True" name="Open Dashboard" res_model="board.board" src_model="board.board"/>
 
     </data>
diff --git a/addons/board/wizard/__init__.py b/addons/board/wizard/__init__.py
index f4cae6e64bf..e6cc92cbfb1 100644
--- a/addons/board/wizard/__init__.py
+++ b/addons/board/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board/wizard/board_wizard.py b/addons/board/wizard/board_wizard.py
index 3dce42521da..9fae1c2ea7c 100644
--- a/addons/board/wizard/board_wizard.py
+++ b/addons/board/wizard/board_wizard.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_account/__init__.py b/addons/board_account/__init__.py
index e2c8cd49cc2..e68279cad8d 100644
--- a/addons/board_account/__init__.py
+++ b/addons/board_account/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_account/__terp__.py b/addons/board_account/__terp__.py
index 0fb16f1e04d..82ecb16fa37 100644
--- a/addons/board_account/__terp__.py
+++ b/addons/board_account/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_account/board_account_view.xml b/addons/board_account/board_account_view.xml
index 95d2db5a789..068e18bcf02 100644
--- a/addons/board_account/board_account_view.xml
+++ b/addons/board_account/board_account_view.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <record id="note_account_type" model="board.note.type">
             <field name="name">Accountants</field>
         </record>
-        
+
         <record id="action_account_analytic_line_to_invoice" model="ir.actions.act_window">
             <field name="name">Costs to invoice</field>
             <field name="res_model">report.account.analytic.line.to.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
         </record>
-        
+
         <record id="action_aged_receivable" model="ir.actions.act_window">
             <field name="name">Receivable Accounts</field>
             <field name="res_model">report.account.receivable</field>
@@ -27,10 +27,10 @@
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','income')]</field>
         </record>
-        
-        
+
+
         <act_window domain="[('state','&lt;&gt;','close'),('partner_id','&lt;&gt;',False),('to_invoice', '&lt;&gt;', False)]" id="act_my_account" name="Accounts to invoice" res_model="account.analytic.account" src_model="res.users" view_mode="tree,form" view_type="form"/>
-        
+
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
             <field name="model">board.board</field>
@@ -38,31 +38,31 @@
             <field name="arch" type="xml">
                 <form string="Account Board">
                     <hpaned>
-                        
+
                         <child1>
-                            
+
                             <action colspan="4" height="160" name="%(report_analytic.action_analytic_account_tree)d" string="Analytic accounts to close" width="510"/>
-                            
+
                             <action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/>
-                            
+
                             <action colspan="4" height="160" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
                         </child1>
-                        
+
                         <child2>
                             <button colspan="4" icon="terp-purchase" name="%(account_report.action_account_report_tree_view_indicator)d" string="My indicators" type="action"/>
-                            
+
                             <action colspan="4" height="220" name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
-                            
+
                             <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
-                            
+
                             <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/>
-                            
+
                         </child2>
                     </hpaned>
                 </form>
             </field>
         </record>
-        
+
         <record id="open_board_account" model="ir.actions.act_window">
             <field name="name">Accounting Dashboard</field>
             <field name="res_model">board.board</field>
@@ -71,8 +71,8 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_account_form"/>
         </record>
-        
-        <menuitem id="next_id_68" name="Accounting" parent="board.dashboard_menu"
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+		<menuitem id="next_id_68" name="Accounting" parent="base.dashboard"
             groups="account.group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="next_id_68" sequence="1"/>
     </data>
diff --git a/addons/board_association/__init__.py b/addons/board_association/__init__.py
index 0d29405d526..2aefd8b3c11 100644
--- a/addons/board_association/__init__.py
+++ b/addons/board_association/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_association/__terp__.py b/addons/board_association/__terp__.py
index fe8abde3ab1..ed2264fd6eb 100644
--- a/addons/board_association/__terp__.py
+++ b/addons/board_association/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_association/board_association_view.xml b/addons/board_association/board_association_view.xml
index 3e501cf4f6c..d010fee617b 100644
--- a/addons/board_association/board_association_view.xml
+++ b/addons/board_association/board_association_view.xml
@@ -35,7 +35,7 @@
                                 string="New members"
                                 name="%(membership.action_report_partner_member_year_tree)d"
                                 view_mode="graph,tree" colspan="4"/>
-                            <action 
+                            <action
                                 string="Registrations by Events"
                                 name="%(event.action_event_type_registration)d"
                                 view_mode="graph,tree"
@@ -53,9 +53,10 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_associations_manager_form"/>
         </record>
-
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+		<menuitem id="board_associations" name="Associations" parent="base.dashboard" />
         <menuitem
-            name="Associations" parent="board.dashboard_menu"
+            name="Associations" parent="board_associations"
             action="open_board_associations_manager"
             sequence="1"
             id="menu_board_associations_manager"
diff --git a/addons/board_auction/__init__.py b/addons/board_auction/__init__.py
index b8e137cb29e..9a6ca02408e 100644
--- a/addons/board_auction/__init__.py
+++ b/addons/board_auction/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_auction/__terp__.py b/addons/board_auction/__terp__.py
index f5a3733cf1e..bf43d74edf2 100644
--- a/addons/board_auction/__terp__.py
+++ b/addons/board_auction/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_auction/board_auction_manager_view.xml b/addons/board_auction/board_auction_manager_view.xml
index d132c8f619b..c20a6af14fd 100644
--- a/addons/board_auction/board_auction_manager_view.xml
+++ b/addons/board_auction/board_auction_manager_view.xml
@@ -14,7 +14,7 @@
 					<hpaned position="100">
 						<child1>
 
-						
+
 							<action
 								string="Latest objects"
 								name="%(auction.action_report_latest_objects_manager_tree)d"
@@ -49,12 +49,12 @@
 								string="Min/Adj/Max"
 								name="%(auction.action_report_auction_estimation_adj_category_manager_tree)d"
 								view_mode="graph,tree" colspan="4" />
-						
+
 							<action
 								string="Objects by day"
 								name="%(auction.action_report_auction_object_date_tree)d"
 								view_mode="graph,tree" colspan="4" />
-								
+
 						</child2>
 					</hpaned>
 				</form>
@@ -69,12 +69,13 @@
 			<field name="usage">menu</field>
 			<field name="view_id" ref="board_auction_manager_form1"/>
 		</record>
-
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+		<menuitem name="Auction Manager" id="board_menu_auction_manager" parent="base.dashboard" />
 		<menuitem
-			name="Dashboards/Auction/Auction Manager"
+			name="Auction Manager"
 			action="open_board_auction_manager"
 			sequence="1"
-			id="menu_board_auction_manager"/>
+			id="menu_board_auction_manager" parent="board_menu_auction_manager"/>
 
 	</data>
 </openerp>
diff --git a/addons/board_auction/board_auction_view.xml b/addons/board_auction/board_auction_view.xml
index d2d508d0c75..0099b6bd68e 100644
--- a/addons/board_auction/board_auction_view.xml
+++ b/addons/board_auction/board_auction_view.xml
@@ -58,12 +58,13 @@
 			<field name="usage">menu</field>
 			<field name="view_id" ref="board_auction_manager_form"/>
 		</record>
-
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+		<menuitem name="Auction Member" id="board_menu_auction_member" parent="base.dashboard" />
 		<menuitem
-			name="Dashboards/Auction/Auction Member"
+			name="Auction Member"
 			action="open_board_auction"
 			sequence="1"
-			id="menu_board_auction"/>
+			id="menu_board_auction" parent="board_menu_auction_member" />
 
 </data>
 </openerp>
diff --git a/addons/board_crm_configuration/__init__.py b/addons/board_crm_configuration/__init__.py
index b8e137cb29e..9a6ca02408e 100644
--- a/addons/board_crm_configuration/__init__.py
+++ b/addons/board_crm_configuration/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm_configuration/__terp__.py
index 19dce05b48e..3c303ee2d1c 100644
--- a/addons/board_crm_configuration/__terp__.py
+++ b/addons/board_crm_configuration/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm_configuration/board_crm_statistical_view.xml
index f1a7f1070f7..8dbe05735f0 100644
--- a/addons/board_crm_configuration/board_crm_statistical_view.xml
+++ b/addons/board_crm_configuration/board_crm_statistical_view.xml
@@ -6,7 +6,7 @@
          -->
         <record model="ir.ui.view" id="view_crm_lead_stage_graph1">
             <field name="name">Leads By Stage - Graph</field>
-            <field name="model">report.crm.case.section.stage</field>
+            <field name="model">report.crm.lead.section.stage</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Leads By Stage" type="pie">
@@ -17,12 +17,12 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_crm_case_categ_graph">
-            <field name="name">report.crm.case.categ.graph</field>
-            <field name="model">report.crm.case.categ</field>
+        <record model="ir.ui.view" id="view_crm_opportunity_categ_graph">
+            <field name="name">report.crm.opportunity.categ.graph</field>
+            <field name="model">report.crm.opportunity.categ</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Cases by Sections and Categories" type="bar" orientation="horizontal">
+                <graph string="Opportunity by Sections and Categories" type="bar" orientation="horizontal">
                     <field name="categ_id"/>
                     <field name="nbr" operator="+"/>
                     <field name="state" group="True"/>
@@ -31,34 +31,27 @@
         </record>
 
         <act_window name="Opportunities By Categories"
-            domain="[('section_id', '=', 'Opportunities'),('state','!=','done'),('state','!=','cancel')]"
-            res_model="report.crm.case.categ"
+            domain="[('state','!=','done'),('state','!=','cancel')]"
+            res_model="report.crm.opportunity.categ"
             view_type="form"
             view_mode="graph,tree,form"
-            view_id="view_crm_case_categ_graph"
+            view_id="view_crm_opportunity_categ_graph"
             id="act_oppor_categ"/>
 
         <record model="ir.actions.act_window" id="act_leads_state">
-            <field name="res_model">report.crm.case.section.stage</field>
+            <field name="res_model">report.crm.lead.section.stage</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_lead_stage_graph1"/>
-            <field name="domain">[('section_id', '=', 'Leads'),('state','!=','done'),('state','!=','cancel')]</field>
+            <field name="domain">[('state','!=','done'),('state','!=','cancel')]</field>
         </record>
 
-        <act_window name="Jobs Requests Of The Month by Applied Job"
-            domain="[('section_id', '=', 'Jobs'),('name','=',time.strftime('%Y-%m-01')),('state','!=','done'),('state','!=','cancel')]"
-            res_model="report.crm.case.categ"
-            view_type="form"
-            view_mode="graph,tree,form"
-            view_id="view_crm_case_categ_graph"
-            id="act_jobs_categ"/>
-
         <act_window name="Leads Of The Month By User"
-            domain="[('section_id', '=', 'Leads'),('name','=',time.strftime('%Y-%m-01')),('state','!=','cancel')]"
-            res_model="report.crm.case.user"
+            domain="[('month','=',time.strftime('%%m')),('state','!=','cancel')]"
+            res_model="report.crm.lead.user"
             view_type="form"
             view_mode="graph,tree,form"
+            view_id="view_crm_lead_stage_graph1"
             id="act_leads_month_user"/>
 
         <record model="ir.ui.view" id="board_crm_statistical_form">
@@ -84,11 +77,6 @@
 
                         </child1>
                         <child2>
-                            <action
-                                string="Jobs Requests Of The Month by Applied Job"
-                                name="%(act_jobs_categ)d"
-                                colspan="4"/>
-
 
                             <action
                                 string="Leads Of The Month By User"
@@ -110,8 +98,9 @@
             <field name="view_id" ref="board_crm_statistical_form"/>
         </record>
 
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
-            name="CRM Configuration" parent="board.dashboard_menu"
+            name="CRM Configuration" parent="base.dashboard"
             id="menu_board_crm_config"
             groups="crm.group_crm_manager"/>
         <menuitem
diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm_configuration/board_crm_view.xml
index 02114f3ac6e..586a3c64baa 100644
--- a/addons/board_crm_configuration/board_crm_view.xml
+++ b/addons/board_crm_configuration/board_crm_view.xml
@@ -4,35 +4,35 @@
 		<record model="board.note.type" id="note_crm_type">
 			<field name="name">CRM Configuration</field>
 		</record>
-
-		<record model="ir.ui.view" id="view_crm_case_user_graph1">
-			<field name="name">crm.case.user.graph1</field>
-			<field name="model">report.crm.case.user</field>
+		
+		<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
+			<field name="name">crm.opportunity.user.graph1</field>
+			<field name="model">report.crm.opportunity.user</field>
 			<field name="type">graph</field>
 			<field name="arch" type="xml">
-				<graph string="Cases by User and Section" type="pie">
+				<graph string="Opportunities by User and Section" type="pie">
 					<field name="state"/>
 					<field name="nbr" operator="+"/>
 				</graph>
 			</field>
-		</record>	
+		</record>
 
 		<record model="ir.actions.act_window" id="act_my_leads">
-			<field name="res_model">crm.case</field>
+			<field name="res_model">crm.lead</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 			<field name="view_id" ref="crm.crm_case_tree_view_leads"/>
-            <field name="domain">[('section_id.name', '=', 'Prospects'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+            <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
 
 		<record model="ir.actions.act_window" id="act_my_meetings">
-			<field name="res_model">crm.case</field>
+			<field name="res_model">crm.meeting</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 			<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
-			<field name="domain">[('section_id.name', '=', 'Meetings'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+			<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
-
+		
 		<act_window name="My Cases"
 				domain="[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]"
 				res_model="crm.case"
@@ -41,27 +41,19 @@
 				id="act_my_cases"/>
 
 		<record model="ir.actions.act_window" id="act_my_leads_stage">
-			<field name="res_model">report.crm.case.section.stage</field>
+			<field name="res_model">report.crm.lead.section.stage</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree,form</field>
 			<field name="view_id" ref="view_crm_lead_stage_graph1"/>
-            <field name="domain">[('section_id.name', '=', 'Leads'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+            <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
 
 		<record model="ir.actions.act_window" id="act_sales_pipeline">
-			<field name="res_model">report.crm.case.user</field>
+			<field name="res_model">report.crm.opportunity.user</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree,form</field>
-			<field name="view_id" ref="view_crm_case_user_graph1"/>
-			<field name="domain">[('section_id.name', '=', 'Opportunities'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
-		</record>
-
-		<record model="ir.actions.act_window" id="act_jobs_requests">
-			<field name="res_model">report.crm.case.user</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">graph,tree,form</field>
-			<field name="view_id" ref="view_crm_case_user_graph1"/>
-			<field name="domain">[('section_id.name','=','Jobs'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+			<field name="view_id" ref="view_crm_opportunity_user_graph1"/>
+			<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
 
 		<record model="ir.ui.view" id="board_crm_form">
@@ -86,7 +78,7 @@
 								name="%(act_my_meetings)d"
 								height="150"
 								colspan="4"/>
-
+	
 							<action
 								string="My Cases"
 								name="%(act_my_cases)d"
diff --git a/addons/board_document/__init__.py b/addons/board_document/__init__.py
index b8e137cb29e..9a6ca02408e 100644
--- a/addons/board_document/__init__.py
+++ b/addons/board_document/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_document/__terp__.py b/addons/board_document/__terp__.py
index d605df631e2..0ba8552fb51 100644
--- a/addons/board_document/__terp__.py
+++ b/addons/board_document/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_document/board_document_view.xml b/addons/board_document/board_document_view.xml
index d666be18a1b..a35e6f9efe7 100644
--- a/addons/board_document/board_document_view.xml
+++ b/addons/board_document/board_document_view.xml
@@ -18,7 +18,7 @@
                                 name="%(report_document.action_view_all_document_tree1)d"
                                 view_mode="tree"
                                 domain="[('name','=',time.strftime('%%Y-%%m-01'))]"/>
-                                 
+
                             <action
                                 string="File Size by Month"
                                 name="%(report_document.action_view_size_month)d"
@@ -28,8 +28,8 @@
                             <action
                                 string="Files by Resource Type"
                                 name="%(report_document.action_view_document_by_resourcetype_graph)d"
-                                view_mode="graph,tree"/>            
-                                
+                                view_mode="graph,tree"/>
+
                             <action
                                 string="Files by Partner"
                                 name="%(report_document.action_view_files_by_partner)d"
@@ -50,10 +50,11 @@
             <field name="view_id" ref="board_document_manager_form"/>
          </record>
 
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
          <menuitem
             name="Document"
             id="menu_board_document"
-            parent="board.dashboard_menu"
+            parent="base.dashboard"
             groups="document.group_document_manager"/>
 
 
@@ -76,7 +77,7 @@
                                 string="Wall of Shame"
                                 name="%(report_document.action_view_wall)d"
                                 view_mode="tree"/>
-                                
+
                         </child1>
                         <child2>
                             <action
diff --git a/addons/board_manufacturing/__init__.py b/addons/board_manufacturing/__init__.py
index 0d29405d526..2aefd8b3c11 100644
--- a/addons/board_manufacturing/__init__.py
+++ b/addons/board_manufacturing/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_manufacturing/__terp__.py b/addons/board_manufacturing/__terp__.py
index d646e2ac54a..9aee4983454 100644
--- a/addons/board_manufacturing/__terp__.py
+++ b/addons/board_manufacturing/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml
index d128bf62b81..7e913209c4a 100644
--- a/addons/board_manufacturing/board_manufacturing_view.xml
+++ b/addons/board_manufacturing/board_manufacturing_view.xml
@@ -36,10 +36,12 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_mrp_manager_form"/>
         </record>
+
+   		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
             id="next_id_87"
             name="Production"
-            parent="board.dashboard_menu"
+            parent="base.dashboard"
             groups="mrp.group_mrp_manager"/>
         <menuitem
             action="open_board_manufacturing"
diff --git a/addons/board_project/__init__.py b/addons/board_project/__init__.py
index e2c8cd49cc2..e68279cad8d 100644
--- a/addons/board_project/__init__.py
+++ b/addons/board_project/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_project/__terp__.py b/addons/board_project/__terp__.py
index 72aa71ab2df..e32ae9a789b 100644
--- a/addons/board_project/__terp__.py
+++ b/addons/board_project/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index 34253d9c4ae..ebb5f6c86b7 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -76,11 +76,11 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_project_form"/>
         </record>
-
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
             id="next_id_86"
             name="Project"
-            parent="board.dashboard_menu"/>
+            parent="base.dashboard"/>
         <menuitem
             action="open_board_project"
             icon="terp-graph"
diff --git a/addons/board_sale/__init__.py b/addons/board_sale/__init__.py
index e2c8cd49cc2..e68279cad8d 100644
--- a/addons/board_sale/__init__.py
+++ b/addons/board_sale/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_sale/__terp__.py b/addons/board_sale/__terp__.py
index c8ed6861c44..4a08eed8d96 100644
--- a/addons/board_sale/__terp__.py
+++ b/addons/board_sale/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/board_sale/board_sale_view.xml b/addons/board_sale/board_sale_view.xml
index 156b9ba9dd0..e5e469322c4 100644
--- a/addons/board_sale/board_sale_view.xml
+++ b/addons/board_sale/board_sale_view.xml
@@ -4,7 +4,7 @@
         <record id="note_sale_type" model="board.note.type">
             <field name="name">Sales</field>
         </record>
-        
+
         <record id="board_sales_manager_form" model="ir.ui.view">
             <field name="name">board.sales.manager.form</field>
             <field name="model">board.board</field>
@@ -17,7 +17,7 @@
                             <action colspan="4" name="%(report_sale.action_order_sale_list)d" string="Top ten sales of the month"/>
                             <action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases statistics"/>
                         </child1>
-                        
+
                         <child2>
                             <action colspan="4" name="%(report_sale.action_order_category_tree_all)d" string="Average Sales by Category of Products(this month)" view_mode="graph,tree"/>
                             <action colspan="4" name="%(report_crm.action_report_crm_case_user_tree)d" string="Cases of the month" view_mode="graph,tree"/>
@@ -26,7 +26,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="open_board_sales_manager" model="ir.actions.act_window">
             <field name="name">Sale Dashboard</field>
             <field name="res_model">board.board</field>
@@ -34,8 +34,9 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_sales_manager_form"/>
         </record>
-        
-        <menuitem id="next_id_88" name="Sales" parent="board.dashboard_menu"/><menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="next_id_88" sequence="1"/>
-        
+
+		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem id="next_id_88" name="Sales" parent="base.dashboard"/><menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="next_id_88" sequence="1"/>
+
     </data>
 </openerp>
diff --git a/addons/caldav/__init__.py b/addons/caldav/__init__.py
index c90e00d11f2..7197809ab2c 100644
--- a/addons/caldav/__init__.py
+++ b/addons/caldav/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import calendar
-import common
+import caldav
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/__terp__.py b/addons/caldav/__terp__.py
index b50a56d60de..7360019a638 100644
--- a/addons/caldav/__terp__.py
+++ b/addons/caldav/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -24,16 +24,14 @@
     "name" : "CalDAV", 
     "version" : "1.0", 
     "depends" : [
-                    "base", 
+                    "base_calendar", 
                 ], 
      'description': """
- To develop a full featured caldav system that support:
-  - access through webdav (based on xrg code)
+ Full featured caldav system that support:
   - alerts (create requests)
   - recurring events (*)
   - invitations to others people (exactly like sunbird)
-  - availabilities of users/calendars
-  - full day events""", 
+""", 
     "author" : "Tiny", 
     'category': 'Generic Modules/Others', 
     'website': 'http://www.openerp.com', 
diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
new file mode 100644
index 00000000000..34cc3fcf74f
--- /dev/null
+++ b/addons/caldav/caldav.py
@@ -0,0 +1,1072 @@
+# -*- 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 datetime import datetime, timedelta
+from datetime import datetime, timedelta
+from dateutil import parser
+from osv import fields, osv
+from base_calendar import base_calendar
+from service import web_services
+from tools.translate import _
+import base64
+import pooler
+import re
+import time
+
+months = {
+        1:"January", 2:"February", 3:"March", 4:"April", \
+        5:"May", 6:"June", 7:"July", 8:"August", 9:"September", \
+        10:"October", 11:"November", 12:"December"}
+
+def caldav_id2real_id(caldav_id=None, with_date=False):
+    if caldav_id and isinstance(caldav_id, (str, unicode)):
+        res = caldav_id.split('-')
+        if len(res) >= 2:
+            real_id = res[0]
+            if with_date:
+                real_date = time.strftime("%Y-%m-%d %H:%M:%S", \
+                                 time.strptime(res[1], "%Y%m%d%H%M%S"))
+                start = datetime.strptime(real_date, "%Y-%m-%d %H:%M:%S")
+                end = start + timedelta(hours=with_date)
+                return (int(real_id), real_date, end.strftime("%Y-%m-%d %H:%M:%S"))
+            return int(real_id)
+    return caldav_id and int(caldav_id) or caldav_id
+
+def real_id2caldav_id(real_id, recurrent_date):
+    if real_id and recurrent_date:
+        recurrent_date = time.strftime("%Y%m%d%H%M%S", \
+                         time.strptime(recurrent_date, "%Y-%m-%d %H:%M:%S"))
+        return '%d-%s' % (real_id, recurrent_date)
+    return real_id
+
+
+def _links_get(self, cr, uid, context={}):
+    obj = self.pool.get('res.request.link')
+    ids = obj.search(cr, uid, [])
+    res = obj.read(cr, uid, ids, ['object', 'name'], context)
+    return [(r['object'], r['name']) for r in res]
+
+class calendar_attendee(osv.osv):
+    _name = 'calendar.attendee'
+    _description = 'Attendee information'
+    _rec_name = 'cutype'
+
+    __attribute__ = {}
+
+    def _get_address(self, name=None, email=None):
+        if name and email:
+            name += ':'
+        return (name or '') + (email and ('MAILTO:' + email) or '')
+
+    def _compute_data(self, cr, uid, ids, name, arg, context):
+        name = name[0]
+        result = {}
+
+        def get_delegate_data(user):
+            email = user.address_id and user.address_id.email or ''
+            return self._get_address(user.name, email)
+
+        for attdata in self.browse(cr, uid, ids, context=context):
+            id = attdata.id
+            result[id] = {}
+            if name == 'sent_by':
+                if not attdata.sent_by_uid:
+                    result[id][name] = ''
+                    continue
+                else:
+                    result[id][name] =  self._get_address(attdata.sent_by_uid.name, \
+                                        attdata.sent_by_uid.address_id.email)
+            if name == 'cn':
+                if attdata.user_id:
+                    result[id][name] = self._get_address(attdata.user_id.name, attdata.email)
+                elif attdata.partner_address_id:
+                    result[id][name] = self._get_address(attdata.partner_id.name, attdata.email)
+                else:
+                    result[id][name] = self._get_address(None, attdata.email)
+            if name == 'delegated_to':
+                user_obj = self.pool.get('res.users')
+                todata = map(get_delegate_data, attdata.del_to_user_ids)
+                result[id][name] = ', '.join(todata)
+            if name == 'delegated_from':
+                dstring = []
+                user_obj = self.pool.get('res.users')
+                fromdata = map(get_delegate_data, attdata.del_from_user_ids)
+                result[id][name] = ', '.join(fromdata)
+            if name == 'event_date':
+                # TO fix date for project task
+                if attdata.ref:
+                    model, res_id = tuple(attdata.ref.split(','))
+                    model_obj = self.pool.get(model)
+                    obj = model_obj.read(cr, uid, res_id, ['date'])[0]
+                    result[id][name] = None#obj['date']
+                else:
+                    result[id][name] = None
+            if name == 'event_end_date':
+                if attdata.ref:
+                    model, res_id = tuple(attdata.ref.split(','))
+                    model_obj = self.pool.get(model)
+                    obj = model_obj.read(cr, uid, res_id, ['date_deadline'])[0]
+                    result[id][name] = obj['date_deadline']
+                else:
+                    result[id][name] = None
+            if name == 'sent_by_uid':
+                if attdata.ref:
+                    model, res_id = tuple(attdata.ref.split(','))
+                    model_obj = self.pool.get(model)
+                    obj = model_obj.read(cr, uid, res_id, ['user_id'])[0]
+                    result[id][name] = obj['user_id']
+                else:
+                    result[id][name] = uid
+        return result
+
+    def _links_get(self, cr, uid, context={}):
+        obj = self.pool.get('res.request.link')
+        ids = obj.search(cr, uid, [])
+        res = obj.read(cr, uid, ids, ['object', 'name'], context)
+        return [(r['object'], r['name']) for r in res]
+
+    def _lang_get(self, cr, uid, context={}):
+        obj = self.pool.get('res.lang')
+        ids = obj.search(cr, uid, [])
+        res = obj.read(cr, uid, ids, ['code', 'name'], context)
+        res = [((r['code']).replace('_', '-'), r['name']) for r in res]
+        return res
+
+    _columns = {
+        'cutype': fields.selection([('individual', 'Individual'), \
+                    ('group', 'Group'), ('resource', 'Resource'), \
+                    ('room', 'Room'), ('unknown', 'Unknown') ], \
+                    'User Type', help="Specify the type of calendar user"), 
+        'member': fields.char('Member', size=124, 
+                    help="Indicate the groups that the attendee belongs to"), 
+        'role': fields.selection([('req-participant', 'Participation required'), \
+                    ('chair', 'Chair Person'), \
+                    ('opt-participant', 'Optional Participation'), \
+                    ('non-participant', 'For information Purpose')], 'Role', \
+                    help='Participation role for the calendar user'), 
+        'state': fields.selection([('tentative', 'Tentative'), 
+                        ('needs-action', 'Needs Action'), 
+                        ('accepted', 'Accepted'), 
+                        ('declined', 'Declined'), 
+                        ('delegated', 'Delegated')], 'State', readonly=True, 
+                        help="Status of the attendee's participation"), 
+        'rsvp':  fields.boolean('Required Reply?', 
+                    help="Indicats whether the favor of a reply is requested"), 
+        'delegated_to': fields.function(_compute_data, method=True, \
+                string='Delegated To', type="char", size=124, store=True, \
+                multi='delegated_to', help="The users that the original \
+request was delegated to"), 
+        'del_to_user_ids': fields.many2many('res.users', 'att_del_to_user_rel', 
+                                  'attendee_id', 'user_id', 'Users'), 
+        'delegated_from': fields.function(_compute_data, method=True, string=\
+            'Delegated From', type="char", store=True, size=124, multi='delegated_from'), 
+        'del_from_user_ids': fields.many2many('res.users', 'att_del_from_user_rel', \
+                                      'attendee_id', 'user_id', 'Users'), 
+        'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"), 
+        'sent_by_uid': fields.many2one('res.users', 'Sent by User'), 
+        'cn': fields.function(_compute_data, method=True, string='Common name', type="char", size=124, multi='cn', store=True), 
+        'dir': fields.char('URI Reference', size=124, help="Reference to the URI that points to the directory information corresponding to the attendee."), 
+        'language': fields.selection(_lang_get, 'Language', 
+                                  help="To specify the language for text values in a property or property parameter."), 
+        'user_id': fields.many2one('res.users', 'User'), 
+        'partner_address_id': fields.many2one('res.partner.address', 'Contact'), 
+        'partner_id':fields.related('partner_address_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'), 
+        'email': fields.char('Email', size=124), 
+        'event_date': fields.function(_compute_data, method=True, string='Event Date', type="datetime", multi='event_date'), 
+        'event_end_date': fields.function(_compute_data, method=True, string='Event End Date', type="datetime", multi='event_end_date'), 
+        'ref': fields.reference('Document Ref', selection=_links_get, size=128), 
+        'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"), 
+     }
+    _defaults = {
+        'state':  lambda *x: 'needs-action', 
+    }
+
+    def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
+        if not user_id:
+            return {'value': {'email': ''}}
+        usr_obj = self.pool.get('res.users')
+        user = usr_obj.browse(cr, uid, user_id, *args)
+        return {'value': {'email': user.address_id.email, 'availability':user.availability}}
+
+    def do_tentative(self, cr, uid, ids, context=None, *args):
+        self.write(cr, uid, ids, {'state': 'tentative'}, context)
+
+    def do_accept(self, cr, uid, ids, context=None, *args):
+        self.write(cr, uid, ids, {'state': 'accepted'}, context)
+
+    def do_decline(self, cr, uid, ids, context=None, *args):
+        self.write(cr, uid, ids, {'state': 'declined'}, context)
+
+calendar_attendee()
+
+class res_alarm(osv.osv):
+    _name = 'res.alarm'
+    _description = 'Basic Alarm Information'
+    _columns = {
+        'name':fields.char('Name', size=256, required=True), 
+        'trigger_occurs': fields.selection([('before', 'Before'), ('after', 'After')], \
+                                        'Triggers', required=True), 
+        'trigger_interval': fields.selection([('minutes', 'Minutes'), ('hours', 'Hours'), \
+                ('days', 'Days')], 'Interval', required=True), 
+        'trigger_duration':  fields.integer('Duration', required=True), 
+        'trigger_related':  fields.selection([('start', 'The event starts'), ('end', \
+                                       'The event ends')], 'Related to', required=True), 
+        'duration': fields.integer('Duration', help="""Duration' and 'Repeat' \
+are both optional, but if one occurs, so MUST the other"""), 
+        'repeat': fields.integer('Repeat'), 
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the event alarm information without removing it."), 
+
+
+    }
+    _defaults = {
+        'trigger_interval':  lambda *x: 'minutes', 
+        'trigger_duration': lambda *x: 5, 
+        'trigger_occurs': lambda *x: 'before', 
+        'trigger_related': lambda *x: 'start', 
+        'active': lambda *x: 1, 
+    }
+
+    def do_alarm_create(self, cr, uid, ids, model, date, context={}):
+        alarm_obj = self.pool.get('calendar.alarm')
+        ir_obj = self.pool.get('ir.model')
+        model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
+        
+        model_obj = self.pool.get(model)
+        for data in model_obj.browse(cr, uid, ids):
+            basic_alarm = data.alarm_id
+            self.do_alarm_unlink(cr, uid, [data.id], model)
+            if basic_alarm:
+                vals = {
+                    'action': 'display', 
+                    'description': data.description, 
+                    'name': data.name, 
+                    'attendee_ids': [(6, 0, map(lambda x:x.id, data.attendee_ids))], 
+                    'trigger_related': basic_alarm.trigger_related, 
+                    'trigger_duration': basic_alarm.trigger_duration, 
+                    'trigger_occurs': basic_alarm.trigger_occurs, 
+                    'trigger_interval': basic_alarm.trigger_interval, 
+                    'duration': basic_alarm.duration, 
+                    'repeat': basic_alarm.repeat, 
+                    'state': 'run', 
+                    'event_date': data[date], 
+                    'res_id': data.id, 
+                    'model_id': model_id, 
+                    'user_id': uid
+                 }
+                alarm_id = alarm_obj.create(cr, uid, vals)
+                cr.execute('Update %s set caldav_alarm_id=%s, alarm_id=%s \
+                                        where id=%s' % (model_obj._table, \
+                                        alarm_id, basic_alarm.id, data.id))
+        cr.commit()
+        return True
+
+    def do_alarm_unlink(self, cr, uid, ids, model, context={}):
+        alarm_obj = self.pool.get('calendar.alarm')
+        ir_obj = self.pool.get('ir.model')
+        model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
+        model_obj = self.pool.get(model)
+        for datas in model_obj.browse(cr, uid, ids):
+            alarm_ids = alarm_obj.search(cr, uid, [('model_id', '=', model_id), ('res_id', '=', datas.id)])
+            if alarm_ids and len(alarm_ids):
+                alarm_obj.unlink(cr, uid, alarm_ids)
+                cr.execute('Update %s set caldav_alarm_id=NULL, alarm_id=NULL\
+                             where id=%s' % (model_obj._table, datas.id))
+        cr.commit()
+        return True
+
+res_alarm()
+
+class calendar_alarm(osv.osv):
+    _name = 'calendar.alarm'
+    _description = 'Event alarm information'
+    _inherits = {'res.alarm': "alarm_id"}
+    __attribute__ = {}
+
+    _columns = {
+            'alarm_id': fields.many2one('res.alarm', 'Basic Alarm', ondelete='cascade'), 
+            'name': fields.char('Summary', size=124, help="""Contains the text to be used as the message subject for email
+or contains the text to be used for display"""), 
+            'action': fields.selection([('audio', 'Audio'), ('display', 'Display'), \
+                    ('procedure', 'Procedure'), ('email', 'Email') ], 'Action', \
+                    required=True, help="Defines the action to be invoked when an alarm is triggered"), 
+            'description': fields.text('Description', help='Provides a more complete description of the calendar component, than that provided by the "SUMMARY" property'), 
+            'attendee_ids': fields.many2many('calendar.attendee', 'alarm_attendee_rel', \
+                                          'alarm_id', 'attendee_id', 'Attendees', readonly=True), 
+            'attach': fields.binary('Attachment', help="""* Points to a sound resource, which is rendered when the alarm is triggered for audio,
+* File which is intended to be sent as message attachments for email,
+* Points to a procedure resource, which is invoked when the alarm is triggered for procedure."""), 
+            'res_id': fields.integer('Resource ID'), 
+            'model_id': fields.many2one('ir.model', 'Model'), 
+            'user_id': fields.many2one('res.users', 'Owner'), 
+            'event_date': fields.datetime('Event Date'), 
+            'event_end_date': fields.datetime('Event End Date'), 
+            'trigger_date': fields.datetime('Trigger Date', readonly="True"), 
+            'state':fields.selection([
+                        ('draft', 'Draft'), 
+                        ('run', 'Run'), 
+                        ('stop', 'Stop'), 
+                        ('done', 'Done'), 
+                    ], 'State', select=True, readonly=True), 
+     }
+
+    _defaults = {
+        'action':  lambda *x: 'email', 
+        'state': lambda *x: 'run', 
+     }
+
+    def create(self, cr, uid, vals, context={}):
+        event_date = vals.get('event_date', False)
+        if event_date:
+            dtstart = datetime.strptime(vals['event_date'], "%Y-%m-%d %H:%M:%S")
+            if vals['trigger_interval'] == 'days':
+                delta = timedelta(days=vals['trigger_duration'])
+            if vals['trigger_interval'] == 'hours':
+                delta = timedelta(hours=vals['trigger_duration'])
+            if vals['trigger_interval'] == 'minutes':
+                delta = timedelta(minutes=vals['trigger_duration'])
+            trigger_date =  dtstart + (vals['trigger_occurs'] == 'after' and delta or -delta)
+            vals['trigger_date'] = trigger_date
+        res = super(calendar_alarm, self).create(cr, uid, vals, context)
+        return res
+
+    def do_run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, \
+                       context=None):
+        if not context:
+            context = {}
+        current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        cr.execute("select alarm.id as id \
+                    from calendar_alarm alarm \
+                    where alarm.state = %s and alarm.trigger_date <= %s", ('run', current_datetime))
+        res = cr.dictfetchall()
+        alarm_ids = map(lambda x: x['id'], res)
+        attendee_obj = self.pool.get('calendar.attendee')
+        request_obj = self.pool.get('res.request')
+        mail_to = []
+        for alarm in self.browse(cr, uid, alarm_ids):
+            if alarm.action == 'display':
+                value = {
+                   'name': alarm.name, 
+                   'act_from': alarm.user_id.id, 
+                   'act_to': alarm.user_id.id, 
+                   'body': alarm.description, 
+                   'trigger_date': alarm.trigger_date, 
+                   'ref_doc1':  '%s,%s'  % (alarm.model_id.model, alarm.res_id)
+                }
+                request_id = request_obj.create(cr, uid, value)
+                request_ids = [request_id]
+                for attendee in alarm.attendee_ids:
+                    value['act_to'] = attendee.user_id.id
+                    request_id = request_obj.create(cr, uid, value)
+                    request_ids.append(request_id)
+                request_obj.request_send(cr, uid, request_ids)
+
+            if alarm.action == 'email':
+                sub = '[Openobject Remainder] %s'  % (alarm.name)
+                body = """
+                Name: %s
+                Date: %s
+                Description: %s
+
+                From:
+                      %s
+                      %s
+
+                """  % (alarm.name, alarm.trigger_date, alarm.description, \
+                    alarm.user_id.name, alarm.user_id.sign)
+                mail_to = [alarm.user_id.address_id.email]
+                for att in alarm.attendee_ids:
+                    mail_to.append(att.user_id.address_id.email)
+
+                tools.email_send(
+                    tools.confirm['from_mail'], 
+                    mail_to, 
+                    sub, 
+                    body
+                )
+            self.write(cr, uid, [alarm.id], {'state':'done'})
+        return True
+
+calendar_alarm()
+
+
+class calendar_event(osv.osv):
+    _name = "calendar.event"
+    _description = "Calendar Event"
+    __attribute__ = {}
+
+    def onchange_rrule_type(self, cr, uid, ids, rtype, *args, **argv):
+        if rtype == 'none' or not rtype:
+            return {'value': {'rrule': ''}}
+        if rtype == 'custom':
+            return {}
+        rrule = self.pool.get('calendar.custom.rrule')
+        rrulestr = rrule.compute_rule_string(cr, uid, {'freq': rtype.upper(), \
+                                 'interval': 1})
+        return {'value': {'rrule': rrulestr}}
+    
+    def _get_duration(self, cr, uid, ids, name, arg, context):
+        res = {}
+        for event in self.browse(cr, uid, ids, context=context):
+            start = datetime.strptime(event.date, "%Y-%m-%d %H:%M:%S")
+            res[event.id] = 0
+            if event.date_deadline:
+                end = datetime.strptime(event.date_deadline[:19], "%Y-%m-%d %H:%M:%S")
+                diff = end - start
+                duration =  float(diff.days)* 24 + (float(diff.seconds) / 3600)
+                res[event.id] = round(duration, 2)
+        return res
+
+    def _set_duration(self, cr, uid, id, name, value, arg, context):
+        event = self.browse(cr, uid, id, context=context)
+        start = datetime.strptime(event.date, "%Y-%m-%d %H:%M:%S")
+        end = start + timedelta(hours=value)
+        cr.execute("UPDATE %s set date_deadline='%s' \
+                        where id=%s"% (self._table, end.strftime("%Y-%m-%d %H:%M:%S"), id))
+        return True
+    
+    _columns = {
+        'id': fields.integer('ID'), 
+        'sequence': fields.integer('Sequence'), 
+        'name': fields.char('Description', size=64, required=True), 
+        'date': fields.datetime('Date'), 
+        'date_deadline': fields.datetime('Deadline'), 
+        'create_date': fields.datetime('Created' ,readonly=True), 
+        'duration': fields.function(_get_duration, method=True, \
+                                    fnct_inv=_set_duration, string='Duration'), 
+        'description': fields.text('Your action'), 
+        'class': fields.selection([('public', 'Public'), ('private', 'Private'), \
+                 ('confidential', 'Confidential')], 'Mark as'), 
+        'location': fields.char('Location', size=264, help="Location of Event"), 
+        'show_as': fields.selection([('free', 'Free'), \
+                                  ('busy', 'Busy')], 
+                                   'Show as'), 
+        'caldav_url': fields.char('Caldav URL', size=264), 
+        'exdate': fields.text('Exception Date/Times', help="This property \
+defines the list of date/time exceptions for arecurring calendar component."), 
+        'exrule': fields.char('Exception Rule', size=352, help="defines a \
+rule or repeating pattern for anexception to a recurrence set"), 
+        'rrule': fields.char('Recurrent Rule', size=124), 
+        'rrule_type': fields.selection([('none', 'None'), ('daily', 'Daily'), \
+                            ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
+                            ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'), 
+        'alarm_id': fields.many2one('res.alarm', 'Alarm'), 
+        'caldav_alarm_id': fields.many2one('calendar.alarm', 'Alarm'), 
+        'recurrent_uid': fields.integer('Recurrent ID'), 
+        'recurrent_id': fields.datetime('Recurrent ID date'), 
+                }
+    
+    _defaults = {
+         'class': lambda *a: 'public', 
+         'show_as': lambda *a: 'busy', 
+    }
+
+    def export_cal(self, cr, uid, ids, context={}):
+        ids = map(lambda x: caldav_id2real_id(x), ids)
+        event_data = self.read(cr, uid, ids)
+        event_obj = self.pool.get('basic.calendar.event')
+        ical = event_obj.export_cal(cr, uid, event_data, context={'model': self._name})
+        cal_val = ical.serialize()
+        cal_val = cal_val.replace('"', '').strip()
+        return cal_val
+
+    def import_cal(self, cr, uid, data, data_id=None, context={}):
+        event_obj = self.pool.get('basic.calendar.event')
+        vals = event_obj.import_cal(cr, uid, data, context=context)
+        return self.check_import(cr, uid, vals, context=context)
+    
+    def check_import(self, cr, uid, vals, context={}):
+        ids = []
+        for val in vals:
+            exists, r_id = base_calendar.uid2openobjectid(cr, val['id'], self._name, \
+                                                             val.get('recurrent_id'))
+            if val.has_key('create_date'): val.pop('create_date')
+            val['caldav_url'] = context.get('url') or ''
+            val.pop('id')
+            if exists and r_id:
+                val.update({'recurrent_uid': exists})
+                self.write(cr, uid, [r_id], val)
+                ids.append(r_id)
+            elif exists:
+                self.write(cr, uid, [exists], val)
+                ids.append(exists)
+            else:
+                event_id = self.create(cr, uid, val)
+                ids.append(event_id)
+        return ids
+        
+    def modify_this(self, cr, uid, ids, defaults, context=None, *args):
+        datas = self.read(cr, uid, ids[0], context=context)
+        date = datas.get('date')
+        defaults.update({
+               'recurrent_uid': caldav_id2real_id(datas['id']), 
+               'recurrent_id': defaults.get('date'), 
+               'rrule_type': 'none', 
+               'rrule': ''
+                    })
+        new_id = self.copy(cr, uid, ids[0], default=defaults, context=context)
+        return new_id
+
+    def get_recurrent_ids(self, cr, uid, select, base_start_date, base_until_date, limit=100):
+        if not limit:
+            limit = 100
+        if isinstance(select, (str, int, long)):
+            ids = [select]
+        else:
+            ids = select
+        result = []
+        if ids and (base_start_date or base_until_date):
+            cr.execute("select m.id, m.rrule, m.date, m.date_deadline, \
+                            m.exdate  from "  + self._table + \
+                            " m where m.id in ("\
+                            + ','.join(map(lambda x: str(x), ids))+")")
+
+            count = 0
+            for data in cr.dictfetchall():
+                start_date = base_start_date and datetime.strptime(base_start_date, "%Y-%m-%d") or False
+                until_date = base_until_date and datetime.strptime(base_until_date, "%Y-%m-%d") or False
+                if count > limit:
+                    break
+                event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
+                if start_date and start_date <= event_date:
+                    start_date = event_date
+                if not data['rrule']:
+                    if start_date and (event_date < start_date):
+                        continue
+                    if until_date and (event_date > until_date):
+                        continue
+                    idval = real_id2caldav_id(data['id'], data['date'])
+                    result.append(idval)
+                    count += 1
+                else:
+                    exdate = data['exdate'] and data['exdate'].split(',') or []
+                    event_obj = self.pool.get('basic.calendar.event')
+                    rrule_str = data['rrule']
+                    new_rrule_str = []
+                    rrule_until_date = False
+                    is_until = False
+                    for rule in rrule_str.split(';'):
+                        name, value = rule.split('=')
+                        if name == "UNTIL":
+                            is_until = True
+                            value = parser.parse(value)
+                            rrule_until_date = parser.parse(value.strftime("%Y-%m-%d"))
+                            if until_date and until_date >= rrule_until_date:
+                                until_date = rrule_until_date
+                            if until_date:
+                                value = until_date.strftime("%Y%m%d%H%M%S")
+                        new_rule = '%s=%s' % (name, value)
+                        new_rrule_str.append(new_rule)
+                    if not is_until and until_date:
+                        value = until_date.strftime("%Y%m%d%H%M%S")
+                        name = "UNTIL"
+                        new_rule = '%s=%s' % (name, value)
+                        new_rrule_str.append(new_rule)
+                    new_rrule_str = ';'.join(new_rrule_str)
+                    start_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
+                    rdates = event_obj.get_recurrent_dates(str(new_rrule_str), exdate, start_date)
+                    for rdate in rdates:
+                        r_date = datetime.strptime(rdate, "%Y-%m-%d %H:%M:%S")
+                        if start_date and r_date < start_date:
+                            continue
+                        if until_date and r_date > until_date:
+                            continue
+                        idval = real_id2caldav_id(data['id'], rdate)
+                        result.append(idval)
+                        count += 1
+        if result:
+            ids = result
+        if isinstance(select, (str, int, long)):
+            return ids and ids[0] or False
+        return ids
+
+    def search(self, cr, uid, args, offset=0, limit=100, order=None, 
+            context=None, count=False):
+        args_without_date = []
+        start_date = False
+        until_date = False
+        for arg in args:
+            if arg[0] not in ('date', unicode('date')):
+                args_without_date.append(arg)
+            else:
+                if arg[1] in ('>', '>='):
+                    start_date = arg[2]
+                elif arg[1] in ('<', '<='):
+                    until_date = arg[2]
+        res = super(calendar_event, self).search(cr, uid, args_without_date, offset, 
+                limit, order, context, count)
+        return self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit)
+
+
+    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+        if isinstance(ids, (str, int, long)):
+            select = [ids]
+        else:
+            select = ids
+        new_ids = []
+        for id in select:
+            id = caldav_id2real_id(id)
+            if not id in new_ids:
+                new_ids.append(id)
+        res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
+        if vals.has_key('alarm_id'):
+            alarm_obj = self.pool.get('res.alarm')
+            alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date')
+        return res
+
+    def browse(self, cr, uid, ids, context=None, list_class=None, fields_process={}):
+        if isinstance(ids, (str, int, long)):
+            select = [ids]
+        else:
+            select = ids
+        select = map(lambda x: caldav_id2real_id(x), select)
+        res = super(calendar_event, self).browse(cr, uid, select, context, list_class, fields_process)
+        if isinstance(ids, (str, int, long)):
+            return res and res[0] or False
+        return res
+
+    def read(self, cr, uid, ids, fields=None, context={}, load='_classic_read'):
+        if isinstance(ids, (str, int, long)):
+            select = [ids]
+        else:
+            select = ids
+        select = map(lambda x: (x, caldav_id2real_id(x)), select)
+        result = []
+        if fields and 'date' not in fields:
+            fields.append('date')
+        for caldav_id, real_id in select:
+            res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, \
+                                              load=load)
+            ls = caldav_id2real_id(caldav_id, with_date=res.get('duration', 0))
+            if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
+                res['date'] = ls[1]
+                res['date_deadline'] = ls[2]
+            res['id'] = caldav_id
+
+            result.append(res)
+        if isinstance(ids, (str, int, long)):
+            return result and result[0] or False
+        return result
+
+    def copy(self, cr, uid, id, default=None, context={}):
+        res = super(calendar_event, self).copy(cr, uid, caldav_id2real_id(id), default, context)
+        alarm_obj = self.pool.get('res.alarm')
+        alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date')
+        return res
+
+    def unlink(self, cr, uid, ids, context=None):
+        res = False
+        for id in ids:
+            ls = caldav_id2real_id(id)
+            if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
+                date_new = ls[1]
+                for record in self.read(cr, uid, [caldav_id2real_id(id)], \
+                                            ['date', 'rrule', 'exdate']):
+                    if record['rrule']:
+                        exdate = (record['exdate'] and (record['exdate'] + ',')  or '') + \
+                                    ''.join((re.compile('\d')).findall(date_new)) + 'Z'
+                        if record['date'] == date_new:
+                            res = self.write(cr, uid, [caldav_id2real_id(id)], {'exdate': exdate})
+                    else:
+                        ids = map(lambda x: caldav_id2real_id(x), ids)
+                        res = super(calendar_event, self).unlink(cr, uid, caldav_id2real_id(ids))
+                        alarm_obj = self.pool.get('res.alarm')
+                        alarm_obj.do_alarm_unlink(cr, uid, ids, self._name)
+            else:
+                ids = map(lambda x: caldav_id2real_id(x), ids)
+                res = super(calendar_event, self).unlink(cr, uid, ids)
+                alarm_obj = self.pool.get('res.alarm')
+                alarm_obj.do_alarm_unlink(cr, uid, ids, self._name)
+        return res
+
+    def create(self, cr, uid, vals, context={}):
+        res = super(calendar_event, self).create(cr, uid, vals, context)
+        alarm_obj = self.pool.get('res.alarm')
+        alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date')
+        return res
+
+calendar_event()
+
+class calendar_todo(osv.osv):
+    _name = "calendar.todo"
+    _inherit = "calendar.event"
+    _description = "Calendar Task"
+
+    def _get_date(self, cr, uid, ids, name, arg, context):
+        res = {}
+        for event in self.browse(cr, uid, ids, context=context):
+            res[event.id] = event.date_start
+        return res
+
+    def _set_date(self, cr, uid, id, name, value, arg, context):
+        event = self.browse(cr, uid, id, context=context)
+        cr.execute("UPDATE %s set date_start='%s' where id=%s"  \
+                           % (self._table, value, id))
+        return True
+
+    _columns = {
+        'date': fields.function(_get_date, method=True,   fnct_inv=_set_date, \
+                                        string='Duration', store=True, type='datetime'),
+        'duration': fields.integer('Duration'), 
+    }
+    
+    __attribute__ = {}
+    
+    def import_cal(self, cr, uid, data, data_id=None,  context={}):
+        todo_obj = self.pool.get('basic.calendar.todo')
+        vals = todo_obj.import_cal(cr, uid, data, context=context)
+        return self.check_import(cr, uid, vals, context=context)
+    
+    def check_import(self, cr, uid, vals, context={}):
+        ids = []
+        for val in vals:
+            obj_tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+            if not val.has_key('planned_hours'):
+                # 'Computes duration' in days
+                plan = 0.0
+                if val.get('date') and  val.get('date_deadline'):
+                    start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S')
+                    end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S')
+                    diff = end - start
+                    plan = (diff.seconds/float(86400) + diff.days) * obj_tm.factor
+                val['planned_hours'] = plan
+            else:
+                # Converts timedelta into hours
+                hours = (val['planned_hours'].seconds / float(3600)) + \
+                                        (val['planned_hours'].days * 24)
+                val['planned_hours'] = hours
+            exists, r_id = base_calendar.uid2openobjectid(cr, val['id'], self._name, val.get('recurrent_id'))
+            val.pop('id')
+            if exists:
+                self.write(cr, uid, [exists], val)
+                ids.append(exists)
+            else:
+                task_id = self.create(cr, uid, val)
+                ids.append(task_id)
+        return ids
+        
+    def export_cal(self, cr, uid, ids, context={}):
+        task_datas = self.read(cr, uid, ids, [], context ={'read': True})
+        tasks = []
+        for task in task_datas:
+            if task.get('planned_hours', None) and task.get('date_deadline', None):
+                task.pop('planned_hours')
+            tasks.append(task)
+        todo_obj = self.pool.get('basic.calendar.todo')
+        ical = todo_obj.export_cal(cr, uid, tasks, context={'model': self._name})
+        calendar_val = ical.serialize()
+        calendar_val = calendar_val.replace('"', '').strip()
+        return calendar_val
+
+calendar_todo()
+ 
+class ir_attachment(osv.osv):
+    _name = 'ir.attachment'
+    _inherit = 'ir.attachment'
+
+    def search_count(self, cr, user, args, context=None):
+        args1 = []
+        for arg in args:
+            args1.append(map(lambda x:str(x).split('-')[0], arg))
+        return super(ir_attachment, self).search_count(cr, user, args1, context)
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, 
+            context=None, count=False):
+        new_args = args
+        for i, arg in enumerate(new_args):
+            if arg[0] == 'res_id':
+                new_args[i] = (arg[0], arg[1], caldav_id2real_id(arg[2]))
+        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset, 
+                            limit=limit, order=order, 
+                            context=context, count=False)
+ir_attachment()
+
+class ir_values(osv.osv):
+    _inherit = 'ir.values'
+
+    def set(self, cr, uid, key, key2, name, models, value, replace=True, \
+            isobject=False, meta=False, preserve_user=False, company=False):
+        new_model = []
+        for data in models:
+            if type(data) in (list, tuple):
+                new_model.append((data[0], caldav_id2real_id(data[1])))
+            else:
+                new_model.append(data)
+        return super(ir_values, self).set(cr, uid, key, key2, name, new_model, \
+                    value, replace, isobject, meta, preserve_user, company)
+
+    def get(self, cr, uid, key, key2, models, meta=False, context={}, \
+             res_id_req=False, without_user=True, key2_req=True):
+        new_model = []
+        for data in models:
+            if type(data) in (list, tuple):
+                new_model.append((data[0], caldav_id2real_id(data[1])))
+            else:
+                new_model.append(data)
+        return super(ir_values, self).get(cr, uid, key, key2, new_model, \
+                         meta, context, res_id_req, without_user, key2_req)
+
+ir_values()
+
+class ir_model(osv.osv):
+
+    _inherit = 'ir.model'
+
+    def read(self, cr, uid, ids, fields=None, context={}, 
+            load='_classic_read'):
+        data = super(ir_model, self).read(cr, uid, ids, fields=fields, \
+                        context=context, load=load)
+        if data:
+            for val in data:
+                val['id'] = caldav_id2real_id(val['id'])
+        return data
+
+ir_model()
+
+class virtual_report_spool(web_services.report_spool):
+
+    def exp_report(self, db, uid, object, ids, datas=None, context=None):
+        if object == 'printscreen.list':
+            return super(virtual_report_spool, self).exp_report(db, uid, \
+                            object, ids, datas, context)
+        new_ids = []
+        for id in ids:
+            new_ids.append(caldav_id2real_id(id))
+        datas['id'] = caldav_id2real_id(datas['id'])
+        super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, datas, context)
+        return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, datas, context)
+
+virtual_report_spool()
+
+class calendar_custom_rrule(osv.osv):
+    _name = "calendar.custom.rrule"
+    _description = "Custom Recurrency Rule"
+
+    _columns = {
+        'freq': fields.selection([('None', 'No Repeat'), \
+                            ('secondly', 'Secondly'), \
+                            ('minutely', 'Minutely'), \
+                            ('hourly', 'Hourly'), \
+                            ('daily', 'Daily'), \
+                            ('weekly', 'Weekly'), \
+                            ('monthly', 'Monthly'), \
+                            ('yearly', 'Yearly')], 'Frequency', required=True), 
+        'interval': fields.integer('Interval'), 
+        'count': fields.integer('Count'), 
+        'mo': fields.boolean('Mon'), 
+        'tu': fields.boolean('Tue'), 
+        'we': fields.boolean('Wed'), 
+        'th': fields.boolean('Thu'), 
+        'fr': fields.boolean('Fri'), 
+        'sa': fields.boolean('Sat'), 
+        'su': fields.boolean('Sun'), 
+        'select1': fields.selection([('date', 'Date of month'), \
+                            ('day', 'Day of month')], 'Option'), 
+        'day': fields.integer('Date of month'), 
+        'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
+                                   ('WE', 'Wednesday'), ('TH', 'Thursday'), \
+                                   ('FR', 'Friday'), ('SA', 'Saturday'), \
+                                   ('SU', 'Sunday')], 'Weekday'), 
+        'byday': fields.selection([('1', 'First'), ('2', 'Second'), \
+                                   ('3', 'Third'), ('4', 'Fourth'), \
+                                   ('5', 'Fifth'), ('-1', 'Last')], 'By day'), 
+        'month_list': fields.selection(months.items(), 'Month'), 
+        'end_date': fields.date('Repeat Until')
+    }
+
+    _defaults = {
+                 'freq':  lambda *x: 'daily', 
+                 'select1':  lambda *x: 'date', 
+                 'interval':  lambda *x: 1, 
+                 }
+
+    def compute_rule_string(self, cr, uid, datas, context=None, *args):
+        weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
+        weekstring = ''
+        monthstring = ''
+        yearstring = ''
+
+#    logic for computing rrule string
+
+        freq = datas.get('freq')
+        if freq == 'None':
+            obj.write(cr, uid, [res_obj.id], {'rrule': ''})
+            return {}
+
+        if freq == 'weekly':
+            byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
+            if byday:
+                weekstring = ';BYDAY=' + ','.join(byday)
+
+        elif freq == 'monthly':
+            if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
+                raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
+            if datas.get('select1')=='day':
+                monthstring = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
+            elif datas.get('select1')=='date':
+                monthstring = ';BYMONTHDAY=' + str(datas.get('day'))
+
+        elif freq == 'yearly':
+            if datas.get('select1')=='date'  and (datas.get('day') < 1 or datas.get('day') > 31):
+                raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
+            bymonth = ';BYMONTH=' + str(datas.get('month_list'))
+            if datas.get('select1')=='day':
+                bystring = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
+            elif datas.get('select1')=='date':
+                bystring = ';BYMONTHDAY=' + str(datas.get('day'))
+            yearstring = bymonth + bystring
+
+        if datas.get('end_date'):
+            datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + '235959Z'
+        enddate = (datas.get('count') and (';COUNT=' +  str(datas.get('count'))) or '') +\
+                             ((datas.get('end_date') and (';UNTIL=' + datas.get('end_date'))) or '')
+
+        rrule_string = 'FREQ=' + freq.upper() +  weekstring + ';INTERVAL=' + \
+                str(datas.get('interval')) + enddate + monthstring + yearstring
+
+#        End logic
+        return rrule_string
+
+    def do_add(self, cr, uid, ids, context={}):
+        datas = self.read(cr, uid, ids)[0]
+        if datas.get('interval') <= 0:
+            raise osv.except_osv(_('Error!'), ("Please select proper Interval"))
+
+
+        if not context or not context.get('model'):
+            return {}
+        else:
+            model = context.get('model')
+        obj = self.pool.get(model)
+        res_obj = obj.browse(cr, uid, context['active_id'])
+
+        rrule_string = self.compute_rule_string(cr, uid, datas)
+        obj.write(cr, uid, [res_obj.id], {'rrule': rrule_string})
+        return {}
+
+calendar_custom_rrule()
+
+class res_users(osv.osv):
+    _inherit = 'res.users'
+
+    def _get_user_avail(self, cr, uid, ids, context=None):
+        current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        res = {}
+        attendee_obj = self.pool.get('calendar.attendee')
+        attendee_ids = attendee_obj.search(cr, uid, [
+                    ('event_date', '<=', current_datetime), ('event_end_date', '<=', current_datetime), 
+                    ('state', '=', 'accepted'), ('user_id', 'in', ids)
+                    ])
+
+        result = cr.dictfetchall()
+        for attendee_data in attendee_obj.read(cr, uid, attendee_ids, ['user_id']):
+            user_id = attendee_data['user_id']
+            status = 'busy'
+            res.update({user_id:status})
+
+        #TOCHECK: Delegrated Event
+        #cr.execute("SELECT user_id,'busy' FROM att_del_to_user_rel where user_id = ANY(%s)", (ids,))
+        #res.update(cr.dictfetchall())
+        for user_id in ids:
+            if user_id not in res:
+                res[user_id] = 'free'
+
+        return res
+
+    def _get_user_avail_fun(self, cr, uid, ids, name, args, context=None):
+        return self._get_user_avail(cr, uid, ids, context=context)
+
+    _columns = {
+            'availability': fields.function(_get_user_avail_fun, type='selection', \
+                    selection=[('free', 'Free'), ('busy', 'Busy')], \
+                    string='Free/Busy', method=True), 
+    }
+res_users()
+
+class invite_attendee_wizard(osv.osv_memory):
+    _name = "caldav.invite.attendee"
+    _description = "Invite Attendees"
+
+    _columns = {
+        'type': fields.selection([('internal', 'Internal User'), \
+              ('external', 'External Email'), \
+              ('partner', 'Partner Contacts')], 'Type', required=True), 
+        'user_ids': fields.many2many('res.users', 'invite_user_rel', 
+                                  'invite_id', 'user_id', 'Users'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'email': fields.char('Email', size=124), 
+        'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
+                                  'invite_id', 'contact_id', 'Contacts'), 
+              }
+
+    def do_invite(self, cr, uid, ids, context={}):
+        datas = self.read(cr, uid, ids)[0]
+        if not context or not context.get('model'):
+            return {}
+        else:
+            model = context.get('model')
+        obj = self.pool.get(model)
+        res_obj = obj.browse(cr, uid, context['active_id'])
+        type = datas.get('type')
+        att_obj = self.pool.get('calendar.attendee')
+        vals = {'ref': '%s,%s' % (model, caldav_id2real_id(context['active_id']))}
+        if type == 'internal':
+            user_obj = self.pool.get('res.users')
+            for user_id in datas.get('user_ids', []):
+                user = user_obj.browse(cr, uid, user_id)
+                if not user.address_id.email:
+                    raise osv.except_osv(_('Error!'), \
+                                    ("User does not have an email Address"))
+                vals.update({'user_id': user_id, 
+                                     'email': user.address_id.email})
+                att_id = att_obj.create(cr, uid, vals)
+                obj.write(cr, uid, res_obj.id, {'attendee_ids': [(4, att_id)]})
+
+        elif  type == 'external' and datas.get('email'):
+            vals.update({'email': datas['email']})
+            att_id = att_obj.create(cr, uid, vals)
+            obj.write(cr, uid, res_obj.id, {'attendee_ids': [(4, att_id)]})
+        elif  type == 'partner':
+            add_obj = self.pool.get('res.partner.address')
+            for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
+                vals.update({
+                             'partner_address_id': contact.id, 
+                             'email': contact.email})
+                att_id = att_obj.create(cr, uid, vals)
+                obj.write(cr, uid, res_obj.id, {'attendee_ids': [(4, att_id)]})
+        return {}
+
+
+    def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
+        if not partner_id:
+            return {'value': {'contact_ids': []}}
+        cr.execute('select id from res_partner_address \
+                         where partner_id=%s' % (partner_id))
+        contacts = map(lambda x: x[0], cr.fetchall())
+        if not contacts:
+            raise osv.except_osv(_('Error!'), \
+                                ("Partner does not have any Contacts"))
+
+        return {'value': {'contact_ids': contacts}}
+
+invite_attendee_wizard()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/caldav_data.xml b/addons/caldav/caldav_data.xml
index 2b942d3b9ff..b909bf1dc82 100644
--- a/addons/caldav/caldav_data.xml
+++ b/addons/caldav/caldav_data.xml
@@ -76,7 +76,7 @@
 
 		<record model="res.alarm" id="alarm9">
 			<field name="name">3 hours before</field>
-			
+
 			<field name="active" eval="1" />
 			<field name="trigger_duration" eval="3" />
 			<field name="trigger_interval">hours</field>
@@ -86,7 +86,7 @@
 
 		<record model="res.alarm" id="alarm10">
 			<field name="name">4 hours before</field>
-			
+
 			<field name="active" eval="1" />
 			<field name="trigger_duration" eval="4" />
 			<field name="trigger_interval">hours</field>
@@ -96,7 +96,7 @@
 
 		<record model="res.alarm" id="alarm11">
 			<field name="name">5 hours before</field>
-			
+
 			<field name="active" eval="1" />
 			<field name="trigger_duration" eval="5" />
 			<field name="trigger_interval">hours</field>
@@ -106,7 +106,7 @@
 
 		<record model="res.alarm" id="alarm12">
 			<field name="name">18 hours before</field>
-			
+
 			<field name="active" eval="1" />
 			<field name="trigger_duration" eval="18" />
 			<field name="trigger_interval">hours</field>
@@ -115,9 +115,9 @@
 		</record>
 
 
-        <!-- Scheduler for Event Alarm-->
-        <record forcecreate="True" id="ir_cron_scheduler_alarm"
-						model="ir.cron">
+		<!-- Scheduler for Event Alarm-->
+		<record forcecreate="True" id="ir_cron_scheduler_alarm"
+			model="ir.cron">
 			<field name="name">Run Event Reminder</field>
 			<field eval="True" name="active" />
 			<field name="user_id" ref="base.user_root" />
@@ -130,5 +130,436 @@
 			<field eval="'(False,)'" name="args" />
 		</record>
 
+		<record model="basic.calendar.lines" id="calendar_lines_event">
+			<field name="name">vevent</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','calendar.event')]" />
+		</record>
+		
+		<record model="basic.calendar.lines" id="calendar_lines_todo">
+			<field name="name">vtodo</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','calendar.todo')]" />
+		</record>
+		
+		<record model="basic.calendar.lines" id="calendar_lines_alarm">
+			<field name="name">alarm</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','calendar.alarm')]" />
+		</record>
+		
+		<record model="basic.calendar.lines" id="calendar_lines_attendee">
+			<field name="name">attendee</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','calendar.attendee')]" />
+		</record>
+		
+		
+		
+<record model="basic.calendar.fields" id="map_event_1">
+    <field name="name" ref="base_calendar.field_event_uid"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_2">
+    <field name="name" ref="base_calendar.field_event_recurrence-id"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','recurrent_id'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_4">
+    <field name="name" ref="base_calendar.field_event_attendee"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_5">
+    <field name="name" ref="base_calendar.field_event_rrule"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_6">
+    <field name="name" ref="base_calendar.field_event_dtend"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_7">
+    <field name="name" ref="base_calendar.field_event_valarm"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','caldav_alarm_id'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_8">
+    <field name="name" ref="base_calendar.field_event_priority"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','priority'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_9">
+    <field name="name" ref="base_calendar.field_event_location"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_10">
+    <field name="name" ref="base_calendar.field_event_exrule"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_11">
+    <field name="name" ref="base_calendar.field_event_status"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_12">
+    <field name="name" ref="base_calendar.field_event_exdate"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_13">
+    <field name="name" ref="base_calendar.field_event_dtstamp"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_14">
+    <field name="name" ref="base_calendar.field_event_description"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_15">
+    <field name="name" ref="base_calendar.field_event_dtstart"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_16">
+    <field name="name" ref="base_calendar.field_event_class"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_18">
+    <field name="name" ref="base_calendar.field_event_created"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','create_date'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_19">
+    <field name="name" ref="base_calendar.field_event_url"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','caldav_url'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_event_20">
+    <field name="name" ref="base_calendar.field_event_summary"/>
+    <field name="type_id" ref="caldav.calendar_lines_event" />
+	<field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.event')]" />
+    <field name="fn">field</field>
+</record>
+
+
+
+<record model="basic.calendar.fields" id="map_todo_1">
+    <field name="name" ref="base_calendar.field_todo_status"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_2">
+    <field name="name" ref="base_calendar.field_todo_exdate"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_3">
+    <field name="name" ref="base_calendar.field_todo_attendee"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_4">
+    <field name="name" ref="base_calendar.field_todo_valarm"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','caldav_alarm_id'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_5">
+    <field name="name" ref="base_calendar.field_todo_description"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_6">
+    <field name="name" ref="base_calendar.field_todo_seq"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','sequence'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_7">
+    <field name="name" ref="base_calendar.field_todo_url"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','caldav_url'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_9">
+    <field name="name" ref="base_calendar.field_todo_percent"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','progress_rate'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_11">
+    <field name="name" ref="base_calendar.field_todo_summary"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_12">
+    <field name="name" ref="base_calendar.field_todo_priority"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','priority'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_13">
+    <field name="name" ref="base_calendar.field_todo_location"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_14">
+    <field name="name" ref="base_calendar.field_todo_exrule"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_15">
+    <field name="name" ref="base_calendar.field_todo_duration"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','planned_hours'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">hours</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_16">
+    <field name="name" ref="base_calendar.field_todo_dtstart"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_17">
+    <field name="name" ref="base_calendar.field_todo_rrule"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_18">
+    <field name="name" ref="base_calendar.field_todo_class"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_todo_19">
+    <field name="name" ref="base_calendar.field_todo_uid"/>
+    <field name="type_id" ref="caldav.calendar_lines_todo" />
+	<field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.todo')]" />
+    <field name="fn">field</field>
+</record>
+
+
+
+<record model="basic.calendar.fields" id="map_alarm_1">
+    <field name="name" ref="base_calendar.field_alarm_attendee"/>
+    <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_alarm_2">
+    <field name="name" ref="base_calendar.field_alarm_trigger_duration"/>
+    <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	<field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_alarm_3">
+    <field name="name" ref="base_calendar.field_alarm_description"/>
+    <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	<field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_alarm_4">
+    <field name="name" ref="base_calendar.field_alarm_attach"/>
+    <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	<field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_alarm_5">
+    <field name="name" ref="base_calendar.field_alarm_trigger_occurs"/>
+    <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	<field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_alarm_6">
+    <field name="name" ref="base_calendar.field_alarm_trigger_interval"/>
+    <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	<field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_alarm_7">
+    <field name="name" ref="base_calendar.field_alarm_summary"/>
+    <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	<field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_alarm_8">
+    <field name="name" ref="base_calendar.field_alarm_duration"/>
+    <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	<field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_alarm_9">
+    <field name="name" ref="base_calendar.field_alarm_repeat"/>
+    <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	<field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_alarm_10">
+    <field name="name" ref="base_calendar.field_alarm_action"/>
+    <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	<field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_alarm_11">
+    <field name="name" ref="base_calendar.field_alarm_trigger_related"/>
+    <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	<field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]" />
+    <field name="fn">field</field>
+</record>
+
+
+<record model="basic.calendar.fields" id="map_attendee_1">
+    <field name="name" ref="base_calendar.field_attendee_cn"/>
+    <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	<field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_attendee_2">
+    <field name="name" ref="base_calendar.field_attendee_sent-by"/>
+    <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	<field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_attendee_3">
+    <field name="name" ref="base_calendar.field_attendee_language"/>
+    <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	<field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_attendee_4">
+    <field name="name" ref="base_calendar.field_attendee_delegated-from"/>
+    <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	<field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_attendee_5">
+    <field name="name" ref="base_calendar.field_attendee_member"/>
+    <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	<field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_attendee_6">
+    <field name="name" ref="base_calendar.field_attendee_cutype"/>
+    <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	<field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_attendee_7">
+    <field name="name" ref="base_calendar.field_attendee_role"/>
+    <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	<field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_attendee_8">
+    <field name="name" ref="base_calendar.field_attendee_partstat"/>
+    <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	<field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_attendee_9">
+    <field name="name" ref="base_calendar.field_attendee_delegated-to"/>
+    <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	<field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_attendee_10">
+    <field name="name" ref="base_calendar.field_attendee_dir"/>
+    <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	<field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]" />
+    <field name="fn">field</field>
+</record>
+
+<record model="basic.calendar.fields" id="map_attendee_11">
+    <field name="name" ref="base_calendar.field_attendee_rsvp"/>
+    <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	<field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
+    <field name="fn">field</field>
+</record>
+
+
 	</data>
 </openerp>
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index eb92c487d58..06050f03b5a 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -9,35 +9,40 @@
             <field name="model">caldav.invite.attendee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invite Attendees"> 
-                    <separator string="Atendee details" colspan="4"/>                   
-                    <field name="attendee_ids" mode="tree,form" nolabel="1" widget="one2many_list" colspan="4"> 
-                            <form string="Attendee details">
-                                <field name="user_id" on_change="onchange_user_id(user_id)" />
-                                <field name="availability" />
-                        		<field name="email" select="1"/>                                
-                        		<newline />
-                        		<field name="role" select="1" />
-                        		<field name="cutype" select="1" />
-                        		<newline />
-                        		<field name="rsvp" />
-                            </form>
-                            <tree string="Attendee details" editable="bottom">
-                                <field name="user_id" on_change="onchange_user_id(user_id)" />
-                                <field name="availability" />
-                        		<field name="email" select="1"/>                                                  		
-                        		<field name="role" select="1" />
-                        		<field name="cutype" select="1" />
-                                <field name="language" />                        		
-                        		<field name="rsvp" />
-                            </tree>
-                    </field>
-                    <separator string="" colspan="6" />
-                    <label string="" colspan="2"/>
-                    <button icon='gtk-cancel' special="cancel" string="Cancel"/>
-                    <button string="Invite"
-            				name="do_invite"
-            				icon="gtk-ok" type="object" />
+                <form string="Invite People">
+                	<field name="type" />
+                	<newline/>
+                	<group col="1" colspan="4"
+                		attrs="{'invisible': [('type', '!=', 'external')]}">
+                		<field name="email" colspan="4"
+                			attrs="{'required': [('type', '=', 'external')]}" />
+                	</group>
+                	<group col="1" colspan="4"
+                		attrs="{'invisible': [('type', '!=', 'internal')]}">
+                		<separator string="Users" colspan="4" />
+                		<field name="user_ids" select="1" colspan="4"
+                			nolabel="1" />
+                		<newline />
+                	</group>
+                	<group col="2" colspan="4"
+                		attrs="{'invisible': [('type', '!=', 'partner')]}">
+                		<field name="partner_id" colspan="2"
+                			on_change="onchange_partner_id(partner_id)"
+                			attrs="{'required': [('type', '=', 'partner')]}" />
+                		<newline />
+                		<separator string="Partner Contacts"
+                			colspan="4" />
+                		<field name="contact_ids" select="1" colspan="4"
+                			nolabel="1" domain="[('partner_id', '=', partner_id)]"
+                			attrs="{'readonly': [('type', '!=', 'partner')]}" />
+                	</group>
+                	<newline/>
+                	<separator string="" colspan="6" />
+                	<label string="" colspan="2" />
+                	<button icon='gtk-cancel' special="cancel"
+                		string="Cancel" />
+                	<button name="do_invite" string="Invite"
+                		type="object" icon="gtk-ok" />
                 </form>
             </field>
         </record>
@@ -114,11 +119,11 @@
             <field name="model">calendar.attendee</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree string="Atendee details">
-            		<field name="cn" select="1" />
-            		<field name="state" />
-            		<field name="cutype" select="1" />
+            	<tree string="Atendee details" editable="top">
+            		<field name="email" select="1" />
             		<field name="role" select="1" />
+            		<field name="cutype" select="1" />
+            		<field name="state" />
             	</tree>
             </field>
         </record>
@@ -148,61 +153,27 @@
 	 	<field name="act_window_id" ref="action_view_attendee_form" />
 	 </record>
 	 
-	 
-	 <record id="caldav_attendee_tree_model" model="ir.ui.view">
-            <field name="name">calendar.attendee.tree1</field>
-            <field name="model">calendar.attendee</field>
-            <field name="type">tree</field>
-            <field name="priority">10</field>
-            <field name="arch" type="xml">
-            	<tree string="Atendee details">
-            		<field name="user_id" select="1" />
-            		<field name="email" />
-            		<field name="state" />
-            		<field name="cutype" select="1" />
-            		<field name="role" select="1" />
-            	</tree>
-            </field>
-        </record>
-        
-        <record id="caldav_attendee_form_model" model="ir.ui.view">
-            <field name="name">calendar.attendee.form1</field>
-            <field name="model">calendar.attendee</field>
-            <field name="type">form</field>
-            <field name="priority">10</field>
-            <field name="arch" type="xml">
-            	<form string="Atendee details">
-            		<field name="user_id" select="1"/>
-            		<field name="state" />
-            		<field name="cutype" select="1" />
-            		<field name="role" select="1" />
-            		<newline/>
-            		<field name="rsvp" select="1" />
-            	</form>
-            </field>
-        </record>
-   
         <record id="res_alarm_form_view" model="ir.ui.view">
             <field name="name">res.alarm.form</field>
             <field name="model">res.alarm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
             	<form string="Reminder details">
-                    <field name="name" select="1"/>	                      
-                    <field name="active"/>                 
-           			<group string="Reminder details" col="4" colspan="4">
-						<field name="trigger_duration" nolabel="1" select="1"/>
-						<field name="trigger_interval" nolabel="1" select="1"/>
-						<field name="trigger_occurs" nolabel="1" select="1"/>
-						<field name="trigger_related" nolabel="1" select="1"/>
-					</group>					
-                    <field name="duration"/> 
-                    <field name="repeat"/>                     
-				</form>
+                    <field name="name" />
+                    <field name="active" />
+                    <separator string="Reminder Details" colspan="4" />
+                    <field name="trigger_duration" select="1" />
+                    <field name="trigger_interval" select="1" />
+                    <field name="trigger_occurs" select="1" />
+                    <field name="trigger_related" select="1" />
+                    <separator string="" colspan="4" />
+                    <field name="duration" />
+                    <field name="repeat" />
+            	</form>
             </field>
         </record>
 
-         <record id="res_tree_view" model="ir.ui.view">
+         <record id="res_alarm_tree_view" model="ir.ui.view">
                 <field name="name">res.alarm.tree</field>
                 <field name="model">res.alarm</field>
                 <field name="type">tree</field>
@@ -215,15 +186,23 @@
 			            <field name="trigger_occurs" select="1"/>			            
 		            </tree>
                 </field>
-            </record>        
+            </record>
 
-		<record id="view_caldav_set_rrule_wizard" model="ir.ui.view">
-            <field name="name">Add RRule</field>
-            <field name="model">caldav.set.rrule</field>
+         <record id="action_res_alarm_view" model="ir.actions.act_window">
+         	<field name="name">Available Alarms</field>
+         	<field name="type">ir.actions.act_window</field>
+         	<field name="res_model">res.alarm</field>
+         	<field name="view_type">form</field>
+         	<field name="view_mode">tree,form</field>
+         </record>
+
+         <record id="view_custom_rule_form" model="ir.ui.view">
+            <field name="name">Custom Rule</field>
+            <field name="model">calendar.custom.rrule</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Add RRule">
-                    <separator string="Select data for Rule" colspan="4"/>
+            	<form string="Custom Rule">
+            		<separator string="Select data for Custom Rule" colspan="4"/>
                     <field name="freq" />
                     <field name="interval" />
                     <newline />
@@ -249,18 +228,15 @@
                     	<group col="2" colspan="4">
                     		<field name="select1"/>
                     	</group>
-                    	<group col="3" colspan="4" attrs="{'readonly' : [('select1','=','day')]}">
+                    	<group col="3" colspan="4" attrs="{'invisible' : [('select1','=','day')]}">
                     		<field name="day" attrs="{'required' : [('select1','=','date')]}"/>
                    		</group>
                    		<newline />
-                    	<group col="5" colspan="4" attrs="{'readonly' : [('select1','=','date')]}">
-                    		<label string="The" />
-                    		<field name="byday" nolabel="1"
+                    	<group col="3" colspan="4" attrs="{'invisible' : [('select1','=','date')]}">
+                    		<field name="byday"  string="The"
                     					attrs="{'required' : [('select1','=','day')]}"/>
                     		<field name="week_list" nolabel="1"
                     					attrs="{'required' : [('select1','=','day')]}"/>
-                    		<label string="of the Month" />
-                    		<newline />
                     	</group>
                     	<group col="2" colspan="4" attrs="{'invisible' : [('freq','!=','yearly')]}">
                     		<field name="month_list" string="of" colspan="1"
@@ -274,11 +250,11 @@
                 </form>
             </field>
         </record>
-
-        <record id="action_view_caldav_set_rrule_wizard" model="ir.actions.act_window">
-            <field name="name">Add RRule</field>
+	
+	<record id="action_calendar_custom_rrule_wizard" model="ir.actions.act_window">
+            <field name="name">Custom Rule</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">caldav.set.rrule</field>
+            <field name="res_model">calendar.custom.rrule</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
diff --git a/addons/caldav/common.py b/addons/caldav/common.py
deleted file mode 100644
index 73dfc09f41d..00000000000
--- a/addons/caldav/common.py
+++ /dev/null
@@ -1,716 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import fields, osv
-from service import web_services
-from tools.translate import _
-import re
-import time
-import datetime
-
-months = {
-        1:"January", 2:"February", 3:"March", 4:"April", \
-        5:"May", 6:"June", 7:"July", 8:"August", 9:"September", \
-        10:"October", 11:"November", 12:"December"}
-
-def caldav_id2real_id(caldav_id = None, with_date=False):
-    if caldav_id and isinstance(caldav_id, (str, unicode)):
-        res = caldav_id.split('-')
-        if len(res) >= 2:
-            real_id = res[0]
-            if with_date:
-                real_date = time.strftime("%Y-%m-%d %H:%M:%S", \
-                                 time.strptime(res[1], "%Y%m%d%H%M%S"))
-                return (int(real_id), real_date)
-            return int(real_id)
-    return caldav_id and int(caldav_id) or caldav_id
-
-def real_id2caldav_id(real_id, recurrent_date):
-    if real_id and recurrent_date:
-        recurrent_date = time.strftime("%Y%m%d%H%M%S", \
-                         time.strptime(recurrent_date, "%Y-%m-%d %H:%M:%S"))
-        return '%d-%s'%(real_id, recurrent_date)
-    return real_id
-
-def uid2openobjectid(cr, uidval, oomodel):
-    __rege = re.compile(r'OpenObject-([\w|\.]+)_([0-9]+)@(\w+)$')
-    wematch = __rege.match(uidval.encode('utf8'))
-    if not wematch:
-        return False
-    else:
-        model, id, dbname = wematch.groups()
-        if (not model == oomodel) or (not dbname == cr.dbname):
-            return False
-        cr.execute('select distinct(id) from %s' % model.replace('.', '_'))
-        ids = map(lambda x: str(x[0]), cr.fetchall())
-        if id in ids:
-            return id
-        return False
-
-def openobjectid2uid(cr, uidval, oomodel):
-    value = 'OpenObject-%s_%s@%s' % (oomodel, uidval, cr.dbname)
-    return value
-
-def _links_get(self, cr, uid, context={}):
-    obj = self.pool.get('res.request.link')
-    ids = obj.search(cr, uid, [])
-    res = obj.read(cr, uid, ids, ['object', 'name'], context)
-    return [(r['object'], r['name']) for r in res]
-
-class calendar_attendee(osv.osv):
-    _name = 'calendar.attendee'
-    _description = 'Attendee information'
-    _rec_name = 'cutype'
-
-    __attribute__ = {
-        'cutype': {'field':'cutype', 'type':'text'}, 
-        'member': {'field':'member', 'type':'text'}, 
-        'role': {'field':'role', 'type':'selection'}, 
-        'partstat': {'field':'state', 'type':'text'}, 
-        'rsvp': {'field':'rsvp', 'type':'boolean'}, 
-        'delegated-to': {'field':'delegated_to', 'type':'text'}, 
-        'delegated-from': {'field':'delegated_from', 'type':'text'}, 
-        'sent-by': {'field':'sent_by', 'type':'text'}, 
-        'cn': {'field':'cn', 'type':'text'}, 
-        'dir': {'field':'dir', 'type':'text'}, 
-        'language': {'field':'language', 'type':'text'}, 
-    }
-    def export_cal(self, cr, uid, ids, context={}):
-        basic_attendee_obj = self.pool.get('basic.calendar.attendee')        
-        basic_attendee_obj.__attribute__.update(self.__attribute__)        
-        data = self.read(cr, uid, ids)
-        attendees = basic_attendee_obj.export_ical(cr, uid, data, {'model': self._name})
-        cal_val = ''
-        for attendee in attendees:
-            cal_val += attendee.serialize()            
-        return cal_val
-
-    def import_cal(self, cr, uid, data, context={}):
-        file_content = base64.decodestring(data)        
-        basic_attendee_obj = self.pool.get('basic.calendar.attendee')        
-        basic_attendee_obj.__attribute__.update(self.__attribute__)
-        
-        vals = basic_attendee_obj.import_ical(cr, uid, file_content)
-        ids = []
-        for val in vals:            
-            is_exists = uid2openobjectid(cr, val['id'], self._name)
-            if val.has_key('create_date'): val.pop('create_date')            
-            val.pop('id')
-            if is_exists:                               
-                self.write(cr, uid, [is_exists], val)
-                ids.append(is_exists)
-            else:
-                attendee_id = self.create(cr, uid, val)
-                ids.append(attendee_id)                
-        return ids   
-
-    def _get_address(self, name=None, email=None):
-        if name and email:
-            name += ':'
-        return (name or '') + (email and ('MAILTO:' + email) or '')
-
-    def _compute_data(self, cr, uid, ids, name, arg, context):
-        name = name[0]
-        result = {}
-
-        def get_delegate_data(user):
-            email = user.address_id and user.address_id.email or ''
-            return self._get_address(user.name, email)
-
-        for attdata in self.browse(cr, uid, ids, context=context):
-            id = attdata.id
-            result[id] = {}            
-            if name == 'sent_by':
-                if not attdata.sent_by_uid:
-                    result[id][name] = ''
-                    continue
-                else:
-                    result[id][name] =  self._get_address(attdata.sent_by_uid.name, \
-                                        attdata.sent_by_uid.address_id.email)
-            if name == 'cn':
-                result[id][name] = self._get_address(attdata.user_id.name, attdata.email)
-            if name == 'delegated_to':
-                user_obj = self.pool.get('res.users')
-                todata = map(get_delegate_data, attdata.del_to_user_ids)
-                result[id][name] = ', '.join(todata)
-            if name == 'delegated_from':
-                dstring = []
-                user_obj = self.pool.get('res.users')
-                fromdata = map(get_delegate_data, attdata.del_from_user_ids)
-                result[id][name] = ', '.join(fromdata)
-            if name == 'event_date':
-                if attdata.ref:
-                    model, res_id = tuple(attdata.ref.split(','))
-                    model_obj = self.pool.get(model) 
-                    obj = model_obj.read(cr, uid, res_id, ['date'])[0]                     
-                    result[id][name] = obj['date']
-            if name == 'event_end_date':
-                if attdata.ref:
-                    model, res_id = tuple(attdata.ref.split(','))
-                    model_obj = self.pool.get(model) 
-                    obj = model_obj.read(cr, uid, res_id, ['date_deadline'])[0] 
-                    result[id][name] = obj['date_deadline']
-
-            if name == 'sent_by_uid':
-                if attdata.ref:
-                    model, res_id = tuple(attdata.ref.split(','))
-                    model_obj = self.pool.get(model) 
-                    obj = model_obj.read(cr, uid, res_id, ['user_id'])[0] 
-                    result[id][name] = obj['user_id']
-        return result
-
-    def _links_get(self, cr, uid, context={}):
-        obj = self.pool.get('res.request.link')
-        ids = obj.search(cr, uid, [])
-        res = obj.read(cr, uid, ids, ['object', 'name'], context)
-        return [(r['object'], r['name']) for r in res]
-
-    def _lang_get(self, cr, uid, context={}):
-        obj = self.pool.get('res.lang')
-        ids = obj.search(cr, uid, [])
-        res = obj.read(cr, uid, ids, ['code', 'name'], context)
-        res = [((r['code']).replace('_', '-'), r['name']) for r in res]
-        return res
-
-    _columns = {
-        'cutype': fields.selection([('individual', 'Individual'), \
-                    ('group', 'Group'), ('resource', 'Resource'), \
-                    ('room', 'Room'), ('unknown', 'Unknown') ], \
-                    'User Type', help="Specify the type of calendar user"), 
-        'member': fields.char('Member', size=124, 
-                    help="Indicate the groups that the attendee belongs to"), 
-        'role': fields.selection([('req-participant', 'Participation required'), \
-                    ('chair', 'Chair Person'), \
-                    ('opt-participant', 'Optional Participation'), \
-                    ('non-participant', 'For information Purpose')], 'Role', \
-                    help='Participation role for the calendar user'), 
-        'state': fields.selection([('tentative', 'Tentative'), 
-                        ('needs-action', 'Needs Action'), 
-                        ('accepted', 'Accepted'), 
-                        ('declined', 'Declined'), 
-                        ('delegated', 'Delegated')], 'State', readonly=True, 
-                        help="Status of the attendee's participation"), 
-        'rsvp':  fields.boolean('Required Reply?', 
-                    help="Indicats whether the favor of a reply is requested"), 
-        'delegated_to': fields.function(_compute_data, method=True, \
-                string='Delegated To', type="char", size=124, store=True, \
-                multi='delegated_to', help="The users that the original request \
-                                                    was delegated to"), 
-        'del_to_user_ids': fields.many2many('res.users', 'att_del_to_user_rel',
-                                  'attendee_id', 'user_id', 'Users'), 
-        'delegated_from': fields.function(_compute_data, method=True, string=\
-                'Delegated From', type="char", store=True, size=124, multi='delegated_from'), 
-        'del_from_user_ids': fields.many2many('res.users', 'att_del_from_user_rel', \
-                                      'attendee_id', 'user_id', 'Users'), 
-        'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"), 
-        'sent_by_uid': fields.function(_compute_data, method=True, string='Sent by', type="many2one", obj='res.users', multi='sent_by_uid'), 
-        'cn': fields.function(_compute_data, method=True, string='Common name', type="char", size=124, multi='cn', store=True), 
-        'dir': fields.char('URI Reference', size=124, help="Reference to the URI that points to the directory information corresponding to the attendee."), 
-        'language': fields.selection(_lang_get, 'Language', 
-                                  help="To specify the language for text values in a property or property parameter."), 
-        'user_id': fields.many2one('res.users', 'User', required=True),
-        'email': fields.char('Email', size=124),
-        'event_date' : fields.function(_compute_data, method=True, string='Event Date', type="datetime", multi='event_date'),
-        'event_end_date' : fields.function(_compute_data, method=True, string='Event End Date', type="datetime", multi='event_end_date'),
-        'ref':fields.reference('Document Ref', selection=_links_get, size=128),
-        'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"),
-     }
-    _defaults = {
-        'state':  lambda *x: 'needs-action',         
-    }
-
-    def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
-        if not user_id:
-            return {'value': {'email': ''}}
-        usr_obj = self.pool.get('res.users')
-        user = usr_obj.browse(cr, uid, user_id, *args)
-        return {'value': {'email': user.address_id.email, 'availability':user.availability}}
-
-    def do_tentative(self, cr, uid, ids, context=None, *args):
-        self.write(cr, uid, ids, {'state': 'tentative'}, context)
-
-    def do_accept(self, cr, uid, ids, context=None, *args):
-        self.write(cr, uid, ids, {'state': 'accepted'}, context)
-
-    def do_decline(self, cr, uid, ids, context=None, *args):
-        self.write(cr, uid, ids, {'state': 'declined'}, context)
-
-calendar_attendee()
-
-class res_alarm(osv.osv):
-    _name = 'res.alarm'
-    _description = 'basic alarm information'
-    _columns = {
-        'name':fields.char('Name', size=256, required=True), 
-        'trigger_occurs': fields.selection([('before', 'Before'), ('after', 'After')], \
-                                        'Trigger time', required=True), 
-        'trigger_interval': fields.selection([('minutes', 'Minutes'), ('hours', 'Hours'), \
-                ('days', 'Days')], 'Trigger duration', required=True), 
-        'trigger_duration':  fields.integer('Time', required=True), 
-        'trigger_related':  fields.selection([('start', 'The event starts'), ('end', \
-                                       'The event ends')], 'Trigger Occures at', required=True), 
-        'duration': fields.integer('Duration', help="""Duration' and 'Repeat' \
-are both optional, but if one occurs, so MUST the other"""), 
-        'repeat': fields.integer('Repeat'), 
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the event alarm information without removing it."), 
-
-
-    }
-    _defaults = {
-        'trigger_interval':  lambda *x: 'minutes', 
-        'trigger_duration': lambda *x: 5, 
-        'trigger_occurs': lambda *x: 'before', 
-        'trigger_related': lambda *x: 'start', 
-        'active': lambda *x: 1, 
-    }
-
-res_alarm()
-
-class calendar_alarm(osv.osv):
-    _name = 'calendar.alarm'
-    _description = 'Event alarm information'
-    _inherits = {'res.alarm': "alarm_id"}
-    __attribute__ = {
-            'action': {'field': 'action', 'type': 'text'}, 
-            'description': {'field': 'name', 'type': 'text'}, 
-            'summary': {'field': 'description', 'type': 'text'}, 
-            'attendee': {'field': 'attendee_ids', 'type': 'text'}, 
-            'trigger_related': {'field': 'trigger_related', 'type': 'text'}, 
-            'trigger_duration': {'field': 'trigger_duration', 'type': 'text'}, 
-            'trigger_occurs': {'field': 'trigger_occurs', 'type': 'text'}, 
-            'trigger_interval': {'field': 'trigger_interval', 'type': 'text'}, 
-            'duration': {'field': 'duration', 'type': 'text'}, 
-            'repeat': {'field': 'repeat', 'type': 'text'}, 
-            'attach': {'field': 'attach', 'type': 'text'}, 
-    }
-
-    _columns = {
-            'alarm_id': fields.many2one('res.alarm', 'Basic Alarm', ondelete='cascade'), 
-            'name': fields.char('Summary', size=124, help="""Contains the text to be used as the message subject for email
-or contains the text to be used for display"""), 
-            'action': fields.selection([('audio', 'Audio'), ('display', 'Display'), \
-                    ('procedure', 'Procedure'), ('email', 'Email') ], 'Action', \
-                    required=True, help="Defines the action to be invoked when an alarm is triggered"), 
-            'description': fields.text('Description', help='Provides a more complete description of the calendar component, than that provided by the "SUMMARY" property'), 
-            'attendee_ids': fields.many2many('calendar.attendee', 'alarm_attendee_rel', \
-                                          'alarm_id', 'attendee_id', 'Attendees', readonly=True), 
-            'attach': fields.binary('Attachment', help="""* Points to a sound resource, which is rendered when the alarm is triggered for audio,
-* File which is intended to be sent as message attachments for email,
-* Points to a procedure resource, which is invoked when the alarm is triggered for procedure."""), 
-            'res_id' : fields.integer('Resource ID'),
-            'model_id': fields.many2one('ir.model', 'Model'),
-            'user_id': fields.many2one('res.users', 'Owner'),
-            'event_date' : fields.datetime('Event Date'),
-            'event_end_date' : fields.datetime('Event End Date'),            
-            'trigger_date' : fields.datetime('Trigger Date', readonly="True"),
-            'state':fields.selection([
-                        ('draft', 'Draft'), 
-                        ('run', 'Run'), 
-                        ('stop', 'Stop'), 
-                        ('done', 'Done'), 
-                    ], 'State', select=True, readonly=True), 
-     }
-
-    _defaults = {
-        'action':  lambda *x: 'email', 
-        'state' : lambda *x: 'run', 
-     }
-
-    def export_cal(self, cr, uid, ids, context={}):
-        basic_alarm_obj = self.pool.get('basic.calendar.alarm')        
-        basic_alarm_obj.__attribute__.update(self.__attribute__)        
-        data = self.read(cr, uid, ids)
-        alarms = basic_alarm_obj.export_ical(cr, uid, data, {'model': self._name})
-        cal_val = ''
-        for alarm in alarms:
-            cal_val += alarm.serialize()        
-        return cal_val
-
-    def import_cal(self, cr, uid, data, context={}):
-        file_content = base64.decodestring(data)        
-        basic_alarm_obj = self.pool.get('basic.calendar.alarm')        
-        basic_alarm_obj.__attribute__.update(self.__attribute__)
-        
-        vals = basic_alarm_obj.import_ical(cr, uid, file_content)
-        ids = []
-        for val in vals:            
-            is_exists = uid2openobjectid(cr, val['id'], self._name)
-            if val.has_key('create_date'): val.pop('create_date')            
-            val.pop('id')
-            if is_exists:               
-                self.write(cr, uid, [is_exists], val)
-                ids.append(is_exists)
-            else:
-                alarm_id = self.create(cr, uid, val)
-                ids.append(alarm_id)                
-        return ids
-
-    def create(self, cr, uid, vals, context={}): 
-        event_date = vals.get('event_date', False)
-        if event_date:
-            dtstart = datetime.datetime.strptime(vals['event_date'], "%Y-%m-%d %H:%M:%S")
-            if vals['trigger_interval'] == 'days':
-                delta = datetime.timedelta(days=vals['trigger_duration'])
-            if vals['trigger_interval'] == 'hours':
-                delta = datetime.timedelta(hours=vals['trigger_duration'])
-            if vals['trigger_interval'] == 'minutes':
-                delta = datetime.timedelta(minutes=vals['trigger_duration'])
-            trigger_date =  dtstart + (vals['trigger_occurs'] == 'after' and delta or -delta)
-            vals['trigger_date'] = trigger_date
-        res = super(calendar_alarm, self).create(cr, uid, vals, context)
-        return res
-
-    def do_run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, \
-                       context=None):
-        if not context:
-            context = {}
-        current_datetime = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-        cr.execute("select alarm.id as id \
-                    from calendar_alarm alarm \
-                    where alarm.state = %s and alarm.trigger_date <= %s", ('run', current_datetime))
-        res = cr.dictfetchall()
-        alarm_ids = map(lambda x: x['id'], res)
-        attendee_obj = self.pool.get('calendar.attendee')
-        request_obj = self.pool.get('res.request')
-        mail_to = []
-        for alarm in self.browse(cr, uid, alarm_ids):
-            if alarm.action == 'display':
-                value = {
-                   'name': alarm.name, 
-                   'act_from': alarm.user_id.id, 
-                   'act_to': alarm.user_id.id, 
-                   'body': alarm.description, 
-                   'trigger_date': alarm.trigger_date, 
-                   'ref_doc1' :  '%s,%s' %(alarm.model_id.model, alarm.res_id)
-                }
-                request_id = request_obj.create(cr, uid, value)
-                request_ids = [request_id]
-                for attendee in alarm.attendee_ids:
-                    value['act_to'] = attendee.user_id.id
-                    request_id = request_obj.create(cr, uid, value)
-                    request_ids.append(request_id)
-                request_obj.request_send(cr, uid, request_ids)
-
-            if alarm.action == 'email':
-                sub = '[Openobject Remainder] %s' %(alarm.name)
-                body = """
-                Name : %s
-                Date : %s
-                Description : %s
-
-                From :
-                      %s
-                      %s
-
-                """ %(alarm.name, alarm.trigger_date, alarm.description, alarm.user_id.name, alarm.user_id.sign)
-                mail_to = [alarm.user_id.address_id.email]
-                for att in alarm.attendee_ids:
-                    mail_to.append(att.user_id.address_id.email)
-
-                tools.email_send(
-                    tools.confirm['from_mail'], 
-                    mail_to, 
-                    sub, 
-                    body
-                )
-            self.write(cr, uid, [alarm.id], {'state':'done'})
-        return True
-
-calendar_alarm()
-
-class ir_attachment(osv.osv):
-    _name = 'ir.attachment'
-    _inherit = 'ir.attachment'
-
-    def search_count(self, cr, user, args, context=None):
-        args1 = []
-        for arg in args:
-            args1.append(map(lambda x:str(x).split('-')[0], arg))
-        return super(ir_attachment, self).search_count(cr, user, args1, context)
-
-    def search(self, cr, uid, args, offset=0, limit=None, order=None, 
-            context=None, count=False):
-        new_args = args
-        for i, arg in enumerate(new_args):
-            if arg[0] == 'res_id':
-                new_args[i] = (arg[0], arg[1], caldav_id2real_id(arg[2]))
-        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset, 
-                                                limit=limit, order=order, 
-                                                context=context, count=False)
-ir_attachment()
-
-class ir_values(osv.osv):
-    _inherit = 'ir.values'
-
-    def set(self, cr, uid, key, key2, name, models, value, replace=True, isobject=False, \
-                         meta=False, preserve_user=False, company=False):
-        new_model = []
-        for data in models:
-            if type(data) in (list, tuple):
-                new_model.append((data[0], caldav_id2real_id(data[1])))
-            else:
-                new_model.append(data)
-        return super(ir_values, self).set(cr, uid, key, key2, name, new_model, value, \
-                                   replace, isobject, meta, preserve_user, company)
-
-    def get(self, cr, uid, key, key2, models, meta=False, context={}, res_id_req=False, \
-                    without_user=True, key2_req=True):
-        new_model = []
-        for data in models:
-            if type(data) in (list, tuple):
-                new_model.append((data[0], caldav_id2real_id(data[1])))
-            else:
-                new_model.append(data)
-        return super(ir_values, self).get(cr, uid, key, key2, new_model, meta, context, \
-                                      res_id_req, without_user, key2_req)
-
-ir_values()
-
-class ir_model(osv.osv):
-
-    _inherit = 'ir.model'
-
-    def read(self, cr, uid, ids, fields=None, context={}, 
-            load='_classic_read'):
-        data = super(ir_model, self).read(cr, uid, ids, fields=fields, context=context, load=load)
-        if data:
-            for val in data:
-                val['id'] = caldav_id2real_id(val['id'])
-        return data
-
-ir_model()
-
-class virtual_report_spool(web_services.report_spool):
-
-    def exp_report(self, db, uid, object, ids, datas=None, context=None):
-        if object == 'printscreen.list':
-            return super(virtual_report_spool, self).exp_report(db, uid, object, ids, datas, context)
-        new_ids = []
-        for id in ids:
-            new_ids.append(caldav_id2real_id(id))
-        datas['id'] = caldav_id2real_id(datas['id'])
-        super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, datas, context)
-        return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, datas, context)
-
-virtual_report_spool()
-
-class set_rrule_wizard(osv.osv_memory):
-    _name = "caldav.set.rrule"
-    _description = "Set RRULE"
-
-    _columns = {
-        'freq': fields.selection([('None', 'No Repeat'), \
-                            ('secondly', 'Secondly'), \
-                            ('minutely', 'Minutely'), \
-                            ('hourly', 'Hourly'), \
-                            ('daily', 'Daily'), \
-                            ('weekly', 'Weekly'), \
-                            ('monthly', 'Monthly'), \
-                            ('yearly', 'Yearly')], 'Frequency', required=True), 
-        'interval': fields.integer('Interval'), 
-        'count': fields.integer('Count'), 
-        'mo': fields.boolean('Mon'), 
-        'tu': fields.boolean('Tue'), 
-        'we': fields.boolean('Wed'), 
-        'th': fields.boolean('Thu'), 
-        'fr': fields.boolean('Fri'), 
-        'sa': fields.boolean('Sat'), 
-        'su': fields.boolean('Sun'), 
-        'select1': fields.selection([('date', 'Date of month'), \
-                            ('day', 'Day of month')], 'Select Option'), 
-        'day': fields.integer('Day of month'), 
-        'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
-                                       ('WE', 'Wednesday'), ('TH', 'Thursday'), \
-                                       ('FR', 'Friday'), ('SA', 'Saturday'), \
-                                       ('SU', 'Sunday')], 'Weekday'), 
-        'byday': fields.selection([('1', 'First'), ('2', 'Second'), \
-                                   ('3', 'Third'), ('4', 'Fourth'), \
-                                   ('5', 'Fifth'), ('-1', 'Last')], 'By day'), 
-        'month_list': fields.selection(months.items(), 'Month'), 
-        'end_date': fields.date('Repeat Until')
-    }
-
-    _defaults = {
-                 'freq':  lambda *x: 'daily', 
-                 'select1':  lambda *x: 'date', 
-                 'interval':  lambda *x: 1, 
-                 }
-
-    def compute_rule_string(self, cr, uid, datas, context=None, *args):
-        weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
-        weekstring = ''
-        monthstring = ''
-        yearstring = ''
-
-#    logic for computing rrule string
-
-        freq = datas.get('freq')
-        if freq == 'None':
-            obj.write(cr, uid, [res_obj.id], {'rrule' : ''})
-            return {}
-
-        if freq == 'weekly':
-            byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
-            if byday:
-                weekstring = ';BYDAY=' + ','.join(byday)
-
-        elif freq == 'monthly':
-            byday = ''
-            if datas.get('select1')=='date'  and (datas.get('day') < 1 or datas.get('day') > 31):
-                raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
-            if datas.get('byday') and datas.get('week_list'):
-                byday = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
-            monthstring = byday or (';BYMONTHDAY=' + str(datas.get('day')))
-
-        elif freq == 'yearly':
-            bymonth = ''
-            byday = ''
-            if datas.get('select1')=='date'  and (datas.get('day') < 1 or datas.get('day') > 31):
-                raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
-            if datas.get('byday') and datas.get('week_list'):
-                byday = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
-            if datas.get('month_list'):
-                bymonth = ';BYMONTH=' + str(datas.get('month_list'))
-            bymonthday = ';BYMONTHDAY=' + str(datas.get('day'))
-            yearstring = bymonth + (datas.get('day') and bymonthday or '') + byday
-
-        if datas.get('end_date'):
-            datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + '235959Z'
-        enddate = (datas.get('count') and (';COUNT=' +  str(datas.get('count'))) or '') +\
-                             ((datas.get('end_date') and (';UNTIL=' + datas.get('end_date'))) or '')
-
-        rrule_string = 'FREQ=' + freq +  weekstring + ';INTERVAL=' + \
-                str(datas.get('interval')) + enddate + monthstring + yearstring
-
-#        End logic
-        return rrule_string
-
-    def do_add(self, cr, uid, ids, context={}):
-        datas = self.read(cr, uid, ids)[0]
-        if datas.get('interval') <= 0:
-            raise osv.except_osv(_('Error!'), ("Please select proper Interval"))
-
-
-        if not context or not context.get('model'):
-            return {}
-        else:
-            model = context.get('model')
-        obj = self.pool.get(model)
-        res_obj = obj.browse(cr, uid, context['active_id'])
-
-        rrule_string = self.compute_rule_string(cr, uid, datas)
-        obj.write(cr, uid, [res_obj.id], {'rrule' : rrule_string})
-        return {}
-
-set_rrule_wizard()
-
-class res_users(osv.osv):
-    _inherit = 'res.users'
-    
-    def _get_user_avail(self, cr, uid, ids, context=None):
-        current_datetime = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-        res = {}       
-        attendee_obj = self.pool.get('calendar.attendee')
-        attendee_ids = attendee_obj.search(cr, uid, [
-                    ('event_date','<=',current_datetime), ('event_end_date','<=',current_datetime),
-                    ('state','=','accepted'), ('user_id','in',ids)
-                    ])
-        
-        result = cr.dictfetchall()
-        for attendee_data in attendee_obj.read(cr, uid, attendee_ids, ['user_id']):
-            user_id = attendee_data['user_id']
-            status = 'busy'
-            res.update({user_id:status})
-                
-        #TOCHECK : Delegrated Event
-        #cr.execute("SELECT user_id,'busy' FROM att_del_to_user_rel where user_id = ANY(%s)", (ids,))
-        #res.update(cr.dictfetchall())        
-        for user_id in ids:
-            if user_id not in res:
-                res[user_id] = 'free'
-        
-        return res
-
-    def _get_user_avail_fun(self, cr, uid, ids, name, args, context=None):        
-        return self._get_user_avail(cr, uid, ids, context=context)
-        
-    _columns = {
-            'availability': fields.function(_get_user_avail_fun, type='selection', \
-                    selection=[('free', 'Free'), ('busy', 'Busy')], \
-                    string='Free/Busy', method=True),
-    }
-res_users()
-
-class invite_attendee_wizard(osv.osv_memory):
-    _name = "caldav.invite.attendee"
-    _description = "Invite Attendees"
-
-    _columns = {                
-          'attendee_ids': fields.many2many('calendar.attendee', 'invite_attendee_rel', 'invite_id', 'attendee_id', 'Attendees Detail'),                
-    }
-
-    def create(self, cr, uid, vals, context={}):
-        attendee_ids = vals.get('attendee_ids',False)
-        model = context.get('model', False)
-        res_id = context.get('active_id', False)   
-        state = context.get('state', False) 
-        attendee_obj = self.pool.get('calendar.attendee')
-        
-        if attendee_ids and model and res_id: 
-            attend = False  
-            if model == 'calendar.attendee' and state == 'delegated':
-               attend = attendee_obj.read(cr, uid, res_id, ['ref','user_id','del_to_user_ids'])
-     
-            for v1, v2, attendee in attendee_ids:
-                vals = {}
-                ref = '%s,%d'%(model, res_id)
-                if attend:
-                    ref = attend['ref']
-                    del_from_user_ids = [attend['user_id'][0]]
-                    del_to_user_ids = attend['del_to_user_ids']
-                    del_to_user_ids.append(attendee['user_id'])
-                    vals.update({
-                        'del_from_user_ids' : [(6, 0, del_from_user_ids)]
-                    })
-                    attendee_obj.write(cr, uid, [res_id], {'state':'delegated','del_to_user_ids' : [(6, 0, del_to_user_ids)]})
-                                  
-                vals.update({
-                    'ref': ref,                    
-                })
-                attendee.update(vals)
-                attendee_obj.create(cr, uid, attendee)
-                
-        res = super(invite_attendee_wizard, self).create(cr, uid, {}, context=context)
-        return res
-
-    def do_invite(self, cr, uid, ids, context={}):        
-        return {}
-
-
-    def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
-        if not user_id:
-            return {'value': {'email': ''}}
-        user = self.pool.get('res.users').browse(cr, uid, user_id, *args)
-        return {'value': {'email': user.address_id.email}}
-
-invite_attendee_wizard()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/security/ir.model.access.csv b/addons/caldav/security/ir.model.access.csv
index 00855f665e9..8a720533140 100644
--- a/addons/caldav/security/ir.model.access.csv
+++ b/addons/caldav/security/ir.model.access.csv
@@ -1,6 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"basic_calendar_all","basic.calendar","model_basic_calendar",,1,1,1,1
-"basic_calendar_event_all","basic.calendar.event","model_basic_calendar_event",,1,1,1,1
-"basic_calendar_attendee_all","basic.calendar.attendee","model_basic_calendar_attendee",,1,1,1,1
-"access_basic_calendar_attendee","calendar.attendee","model_basic_calendar_attendee",,1,1,1,1
-"access_basic_calendar_alarm","calendar.alarm","model_basic_calendar_alarm",,1,1,1,1
+"access_calendar_attendee","calendar.attendee","model_calendar_attendee",,1,1,1,1
+"access_calendar_alarm","calendar.alarm","model_calendar_alarm",,1,1,1,1
+"access_res_alarm","res.alarm","model_res_alarm",,1,1,1,1
+"access_calendar_event_all","calendar.event","model_calendar_event",,1,1,1,1
diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index fdce2272fa9..e1f19604f16 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -22,18 +22,16 @@
 import crm
 import crm_mailgate
 import crm_segmentation
-import crm_config
 import crm_meeting
 import crm_lead
 import crm_phonecall
 import crm_opportunity
 import crm_claim
 import crm_fundraising
-import crm_job
 import crm_helpdesk
 
 
-import report
+#import report
 import wizard
 
 
diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 9ca8e817a97..d01f083c2d9 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Customer & Supplier Relationship Management', 
-    'version': '1.0', 
-    'category': 'Generic Modules/CRM & SRM', 
+    'name': 'Customer & Supplier Relationship Management',
+    'version': '1.0',
+    'category': 'Generic Modules/CRM & SRM',
     'description': """The generic Open ERP Customer Relationship Management
 system enables a group of people to intelligently and efficiently manage
 leads, opportunities, tasks, issues, requests, bugs, campaign, claims, etc.
@@ -54,25 +54,24 @@ between mails and Open ERP.""",
                  'crm_claims_data.xml', 
                  'crm_fund_data.xml', 
                  'crm_helpdesk_data.xml', 
-                 'crm_jobs_data.xml', 
                  'crm_lead_data.xml', 
                  'crm_meeting_data.xml', 
                  'crm_opportunity_data.xml', 
                  'crm_phonecall_data.xml', 
     ], 
+
     'update_xml': [
         'crm_wizard.xml', 
         'crm_view.xml', 
-        'crm_config_view.xml', 
-        'crm_job_wizard.xml', 
-        'crm_jobs_view.xml', 
-        'crm_jobs_menu.xml', 
         'crm_lead_wizard.xml', 
         'crm_lead_view.xml', 
         'crm_lead_menu.xml', 
         'crm_meeting_wizard.xml', 
         'crm_meeting_view.xml', 
         'crm_meeting_menu.xml', 
+        'crm_phonecall_wizard.xml', 
+        'crm_phonecall_view.xml', 
+        'crm_phonecall_menu.xml',         
         'crm_opportunity_wizard.xml', 
         'crm_opportunity_view.xml', 
         'crm_opportunity_menu.xml', 
@@ -80,22 +79,21 @@ between mails and Open ERP.""",
         'crm_fund_menu.xml', 
         'crm_claims_view.xml', 
         'crm_claims_menu.xml', 
-        'crm_phonecall_wizard.xml', 
-        'crm_phonecall_view.xml', 
-        'crm_phonecall_menu.xml', 
-        'crm_report_view.xml', 
-        'crm_helpdesk_view.xml', 
-        'crm_report.xml', 
+
+#        'crm_report_view.xml', 
+        'crm_helpdesk_view.xml',
+        'crm_helpdesk_menu.xml', 
+        #'crm_report.xml', 
         'security/crm_security.xml', 
-        'security/ir.model.access.csv', 
+        #'security/ir.model.access.csv', 
+
         'process/crm_configuration_process.xml'
-    ], 
+    ],
     'demo_xml': [
         'crm_demo.xml', 
         'crm_claims_demo.xml', 
         'crm_fund_demo.xml', 
         'crm_helpdesk_demo.xml', 
-        'crm_jobs_demo.xml', 
         'crm_lead_demo.xml', 
         'crm_meeting_demo.xml', 
         'crm_opportunity_demo.xml', 
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 16d8358f86f..f1b4eab309b 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -104,16 +104,66 @@ crm_case_section()
 class crm_case_categ(osv.osv):
     _name = "crm.case.categ"
     _description = "Category of case"
+
     _columns = {
         'name': fields.char('Case Category Name', size=64, required=True, translate=True),
         'probability': fields.float('Probability (%)', required=True),
         'section_id': fields.many2one('crm.case.section', 'Case Section'),
+        'object_id': fields.many2one('ir.model','Object Name'),        
     }
+    def _find_object_id(self, cr, uid, context=None):
+        object_id = context and context.get('object_id', False) or False
+        ids =self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
+        return ids and ids[0] 
     _defaults = {
-        'probability': lambda *args: 0.0
+        'probability': lambda *args: 0.0,
+        'object_id' : _find_object_id
     }
+#               
 crm_case_categ()
 
+class crm_case_resource_type(osv.osv):
+    _name = "crm.case.resource.type"
+    _description = "Resource Type of case"
+    _rec_name = "name"
+    _columns = {
+        'name': fields.char('Case Resource Type', size=64, required=True, translate=True),
+        'section_id': fields.many2one('crm.case.section', 'Case Section'),
+        'object_id': fields.many2one('ir.model','Object Name'),        
+    }
+    def _find_object_id(self, cr, uid, context=None):
+        object_id = context and context.get('object_id', False) or False
+        ids =self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
+        return ids and ids[0] 
+    _defaults = {
+        'object_id' : _find_object_id
+    }    
+crm_case_resource_type()
+
+
+class crm_case_stage(osv.osv):
+    _name = "crm.case.stage"
+    _description = "Stage of case"
+    _rec_name = 'name'
+    _order = "sequence"
+    _columns = {
+        'name': fields.char('Stage Name', size=64, required=True, translate=True),
+        'section_id': fields.many2one('crm.case.section', 'Case Section'),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
+        'object_id': fields.many2one('ir.model','Object Name'),
+    }
+    def _find_object_id(self, cr, uid, context=None):
+        object_id = context and context.get('object_id', False) or False
+        ids =self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
+        return ids and ids[0]     
+    _defaults = {
+        'sequence': lambda *args: 1,
+        'object_id' : _find_object_id
+    }
+    
+crm_case_stage()
+
+
 class crm_case_rule(osv.osv):
     _name = "crm.case.rule"
     _description = "Case Rule"
@@ -137,7 +187,8 @@ class crm_case_rule(osv.osv):
         'trg_date_range_type': fields.selection([('minutes', 'Minutes'),('hour','Hours'),('day','Days'),('month','Months')], 'Delay type'),
 
         'trg_section_id': fields.many2one('crm.case.section', 'Section'),
-        'trg_categ_id':  fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',trg_section_id)]"),
+    
+        #'trg_categ_id':  fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',trg_section_id)]"),
         'trg_user_id':  fields.many2one('res.users', 'Responsible'),
 
         'trg_partner_id': fields.many2one('res.partner', 'Partner'),
@@ -220,6 +271,7 @@ def _links_get(self, cr, uid, context={}):
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
     return [(r['object'], r['name']) for r in res]
 
+
 class crm_case(osv.osv):
     _name = "crm.case"
     _description = "Case"
@@ -232,22 +284,39 @@ class crm_case(osv.osv):
             else:
                 res[case.id] = False
         return res
+
     def copy(self, cr, uid, id, default=None, context={}):
         if not default: default = {}
-        default.update( {'state':'draft', 'id':False, 'history_line':[],'log_ids':[]})
+        default.update( {'state':'draft', 'id':False})
         return super(crm_case, self).copy(cr, uid, id, default, context)
 
+    def _get_log_ids(self, cr, uid, ids, field_names, arg, context={}):
+        result = {}
+        history_obj = False
+        model_obj = self.pool.get('ir.model')
+        if 'history_line' in field_names:
+            history_obj = self.pool.get('crm.case.history')
+            name = 'history_line'
+        if 'log_ids' in field_names:
+            history_obj = self.pool.get('crm.case.log')
+            name = 'log_ids'
+        if not history_obj:
+            return result
+        for case in self.browse(cr, uid, ids, context):
+            model_ids = model_obj.search(cr, uid, [('model','=',case._name)])
+            history_ids = history_obj.search(cr, uid, [('model_id','=',model_ids[0]),('res_id','=',case.id)])             
+            if history_ids:
+                result[case.id] = {name:history_ids}
+            else:
+                result[case.id] = {name:[]}         
+        return result
+
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'name': fields.char('Description',size=64,required=True),
-        'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the case without removing it."),
         'description': fields.text('Your action'),
         'section_id': fields.many2one('crm.case.section', 'Section', select=True, help='Section to which Case belongs to. Define Responsible user and Email account for mail gateway.'),
-        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id)]", help='Category related to the section.Subdivide the CRM cases independently or section-wise.'),
-        'planned_revenue': fields.float('Planned Revenue'),
-        'planned_cost': fields.float('Planned Costs'),
-        'probability': fields.float('Probability (%)'),
         'email_from': fields.char('Partner Email', size=128, help="These people will receive email."),
         'email_cc': fields.char('Watchers Emails', size=252 , help="These people will receive a copy of the future" \
                                                                     " communication between partner and users by email"),
@@ -255,25 +324,17 @@ class crm_case(osv.osv):
             string='Latest E-Mail', type='text'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"),
-        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
-                                                                       "the partner mentality in relation to our services.The scale has" \
-                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
         'date': fields.datetime('Date'),
         'create_date': fields.datetime('Created' ,readonly=True),
         'date_deadline': fields.datetime('Deadline'),
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
-                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
         'user_id': fields.many2one('res.users', 'Responsible'),
-        'history_line': fields.one2many('crm.case.history', 'case_id', 'Communication', readonly=1),
-        'log_ids': fields.one2many('crm.case.log', 'case_id', 'Logs History', readonly=1),
+        'history_line': fields.function(_get_log_ids, method=True, type='one2many', multi="history_line", relation="crm.case.history", string="Communication"),
+        'log_ids': fields.function(_get_log_ids, method=True, type='one2many', multi="log_ids", relation="crm.case.log", string="Logs History"),
         'state': fields.selection(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\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
-        'ref' : fields.reference('Reference', selection=_links_get, size=128),
-        'ref2' : fields.reference('Reference 2', selection=_links_get, size=128),
 
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
@@ -313,11 +374,10 @@ class crm_case(osv.osv):
         'partner_address_id': _get_default_partner_address,
         'email_from': _get_default_email,
         'state': lambda *a: 'draft',
-        'priority': lambda *a: AVAILABLE_PRIORITIES[2][0],
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'section_id': _get_section,
     }
-    _order = 'priority, date_deadline desc, date desc,id desc'
+    _order = 'date_deadline desc, date desc,id desc'
 
     def unlink(self, cr, uid, ids, context={}):
         for case in self.browse(cr, uid, ids, context):
@@ -326,6 +386,41 @@ class crm_case(osv.osv):
                     _('You can not delete this case. You should better cancel it.'))
         return super(crm_case, self).unlink(cr, uid, ids, context)
 
+    def stage_next(self, cr, uid, ids, context={}):
+        ok = False
+        sid = self.pool.get('crm.case.stage').search(cr, uid, [('object_id.model', '=', self._name)], context=context)
+        s = {}
+        previous = {}
+        for stage in self.pool.get('crm.case.stage').browse(cr, uid, sid, context=context):
+            section = stage.section_id.id or False
+            s.setdefault(section, {})
+            s[section][previous.get(section, False)] = stage.id
+            previous[section] = stage.id
+
+        for case in self.browse(cr, uid, ids, context):
+            section = (case.section_id.id or False)
+            if section in s:
+                st = case.stage_id.id  or False
+                if st in s[section]:
+                    self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
+
+        return True
+
+    def onchange_case_id(self, cr, uid, ids, case_id, name, partner_id, context={}):
+        if not case_id:
+            return {}
+        case = self.browse(cr, uid, case_id, context=context)
+        value = {}
+        if not name:
+            value['name'] = case.name
+        if (not partner_id) and case.partner_id:
+            value['partner_id'] = case.partner_id.id
+            if case.partner_address_id:
+                value['partner_address_id'] = case.partner_address_id.id
+            if case.email_from:
+                value['email_from'] = case.email_from
+        return {'value': value}
+
     def _action(self, cr, uid, cases, state_to, scrit=None, context={}):
         if not scrit:
             scrit = []
@@ -483,54 +578,17 @@ class crm_case(osv.osv):
         }
         return self.format_body(body % data)
 
-    def email_send(self, cr, uid, case, emails, body, context={}):
-        body = self.format_mail(case, body)
-        if case.user_id and case.user_id.address_id and case.user_id.address_id.email:
-            emailfrom = case.user_id.address_id.email
-        else:
-            emailfrom = case.section_id.reply_to
-        name = '[%d] %s' % (case.id, case.name.encode('utf8'))
-        reply_to = case.section_id.reply_to or False
-        if reply_to: reply_to = reply_to.encode('utf8')
-        if not emailfrom:
-            raise osv.except_osv(_('Error!'),
-                    _("No E-Mail ID Found for your Company address or missing reply address in section!"))
-        tools.email_send(emailfrom, emails, name, body, reply_to=reply_to, tinycrm=str(case.id))
-        return True
-    def __log(self, cr, uid, cases, keyword, context={}):
-        if not self.pool.get('res.partner.event.type').check(cr, uid, 'crm_case_'+keyword):
-            return False
-        for case in cases:
-            if case.partner_id:
-                translated_keyword = keyword
-                if 'translated_keyword' in context:
-                    translated_keyword = context['translated_keyword']
-                name = _('Case') +  ' ' + translated_keyword + ': ' + case.name
-                if isinstance(name, str):
-                    name = unicode(name, 'utf-8')
-                if len(name) > 64:
-                    name = name[:61] + '...'
-                self.pool.get('res.partner.event').create(cr, uid, {
-                    'name': name,
-                    'som':(case.som or False) and case.som.id,
-                    'description':case.description,
-                    'partner_id':case.partner_id.id,
-                    'date':time.strftime('%Y-%m-%d %H:%M:%S'),
-                    'canal_id':(case.canal_id or False) and case.canal_id.id,
-                    'user_id':uid,
-                    'document': 'crm.case,%i' % case.id,
-                })
-        return True
 
     def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, context={}):
+        model_obj = self.pool.get('ir.model')
         for case in cases:
+            model_ids = model_obj.search(cr, uid, [('model','=',case._name)])            
             data = {
-                'name': keyword,
-                'som': case.som.id,
-                'canal_id': case.canal_id.id,
+                'name': keyword,                
                 'user_id': uid,
                 'date': time.strftime('%Y-%m-%d %H:%M:%S'),
-                'case_id': case.id,
+                'model_id' : model_ids and model_ids[0] or False,
+                'res_id': case.id,
                 'section_id': case.section_id.id
             }
             obj = self.pool.get('crm.case.log')
@@ -540,7 +598,7 @@ class crm_case(osv.osv):
                 data['email'] = email or \
                         (case.user_id and case.user_id.address_id and \
                             case.user_id.address_id.email) or False
-            obj.create(cr, uid, data, context)
+            res = obj.create(cr, uid, data, context)            
         return True
     _history = __history
 
@@ -548,7 +606,6 @@ class crm_case(osv.osv):
         res = super(crm_case, self).create(cr, uid, *args, **argv)
         cases = self.browse(cr, uid, [res])
         cases[0].state # to fill the browse record cache
-        self.__log(cr,uid, cases, 'draft', context={'translated_keyword': _('draft')})
         self._action(cr,uid, cases, 'draft')
         return res
 
@@ -601,8 +658,8 @@ class crm_case(osv.osv):
 
     def add_reply(self, cursor, user, ids, context=None):
         for case in self.browse(cursor, user, ids, context=context):
-            if case.history_line:
-                description = case.history_line[0].description
+            if case.email_last:
+                description = email_last
                 self.write(cursor, user, case.id, {
                     'description': '> ' + description.replace('\n','\n> '),
                     }, context=context)
@@ -663,11 +720,7 @@ class crm_case(osv.osv):
             data['email_from'] = self.pool.get('res.partner.address').browse(cr, uid, addr['contact']).email
         return {'value':data}
 
-    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
-        if not categ:
-            return {'value':{}}
-        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
-        return {'value':{'probability':cat}}
+
 
 
     def onchange_partner_address_id(self, cr, uid, ids, part, email=False):
@@ -681,7 +734,6 @@ class crm_case(osv.osv):
     def case_close(self, cr, uid, ids, *args):
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
-        self.__log(cr,uid, cases, 'done', context={'translated_keyword': _('done')})
         self.__history(cr, uid, cases, _('Close'))
         self.write(cr, uid, ids, {'state':'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
         #
@@ -709,7 +761,6 @@ class crm_case(osv.osv):
 
     def case_open(self, cr, uid, ids, *args):
         cases = self.browse(cr, uid, ids)
-        self.__log(cr, uid, cases, 'open', context={'translated_keyword': _('open')})
         self.__history(cr, uid, cases, _('Open'))
         for case in cases:
             data = {'state':'open', 'active':True}
@@ -723,7 +774,6 @@ class crm_case(osv.osv):
     def case_cancel(self, cr, uid, ids, *args):
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
-        self.__log(cr, uid, cases, 'cancel', context={'translated_keyword': _('cancel')})
         self.__history(cr, uid, cases, _('Cancel'))
         self.write(cr, uid, ids, {'state':'cancel', 'active':True})
         self._action(cr,uid, cases, 'cancel')
@@ -732,7 +782,6 @@ class crm_case(osv.osv):
     def case_pending(self, cr, uid, ids, *args):
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
-        self.__log(cr, uid, cases, 'pending', context={'translated_keyword': _('draft')})
         self.__history(cr, uid, cases, _('Pending'))
         self.write(cr, uid, ids, {'state':'pending', 'active':True})
         self._action(cr,uid, cases, 'pending')
@@ -741,13 +790,13 @@ class crm_case(osv.osv):
     def case_reset(self, cr, uid, ids, *args):
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
-        self.__log(cr, uid, cases, 'draft', context={'translated_keyword': _('draft')})
         self.__history(cr, uid, cases, _('Draft'))
         self.write(cr, uid, ids, {'state':'draft', 'active':True})
         self._action(cr, uid, cases, 'draft')
         return True
 crm_case()
 
+
 class crm_case_log(osv.osv):
     _name = "crm.case.log"
     _description = "Case Communication History"
@@ -759,7 +808,8 @@ class crm_case_log(osv.osv):
         'canal_id': fields.many2one('res.partner.canal', 'Channel'),
         'section_id': fields.many2one('crm.case.section', 'Section'),
         'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
-        'case_id': fields.many2one('crm.case', 'Case', required=True, ondelete='cascade')
+        'model_id': fields.many2one('ir.model', "Model"),
+        'res_id': fields.integer('Resource ID'),
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
@@ -773,9 +823,9 @@ class crm_case_history(osv.osv):
     _inherits = {'crm.case.log':"log_id"}
 
     def create(self, cr, user, vals, context=None):
-        if vals.has_key('case_id') and vals['case_id']:
-            case_obj = self.pool.get('crm.case')
-            cases = case_obj.browse(cr, user, [vals['case_id']])
+        if vals.has_key('res_id') and vals['res_id']:
+            case_obj = self.pool.get(vals['model_id'])
+            cases = case_obj.browse(cr, user, [vals['res_id']])
             case_obj._action(cr, user, cases, '')
         return super(crm_case_history, self).create(cr, user, vals, context)
 
@@ -864,4 +914,3 @@ users()
 
 
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_claim.py b/addons/crm/crm_claim.py
index 0606e39a052..5e83ce1c367 100644
--- a/addons/crm/crm_claim.py
+++ b/addons/crm/crm_claim.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -25,129 +25,46 @@ import os
 import pooler
 import netsvc
 from tools.translate import _
+import crm
+
+
 
 class crm_claim(osv.osv):
     _name = "crm.claim"
     _description = "Claim Cases"
     _order = "id desc"
-    _inherits = {'crm.case':"inherit_case_id"}
+    _inherit = 'crm.case'
     _columns = {
-        'inherit_case_id': fields.many2one('crm.case','Case',ondelete='cascade'),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
+        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'planned_revenue': fields.float('Planned Revenue'),
+        'planned_cost': fields.float('Planned Costs'),
+        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                       "the partner mentality in relation to our services.The scale has" \
+                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
+        'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'type_id': fields.many2one('crm.case.resource.type', 'Claim Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"),
+        
+        'partner_name': fields.char("Employee's Name", size=64),
+        'partner_mobile': fields.char('Mobile', size=32),
+        'partner_phone': fields.char('Phone', size=32),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"),
+        'probability': fields.float('Probability (%)'),    
     }
-    def _map_ids(self, method, cr, uid, ids, *args, **argv):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        case_data = self.browse(cr, uid, select)
-        new_ids = []
-        for case in case_data:
-            if case.inherit_case_id:
-                new_ids.append(case.inherit_case_id.id)
-        res = getattr(self.pool.get('crm.case'),method)(cr, uid, new_ids, *args, **argv)
-        if isinstance(ids, (str, int, long)) and isinstance(res, list):
-            return res and res[0] or False
-        return res
+    
+    _defaults = {
+                 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+    }
+    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
+        if not categ:
+            return {'value':{}}
+        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
+        return {'value':{'probability':cat}}    
 
-
-    def onchange_case_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_case_id',cr,uid,ids,*args,**argv)
-    def stage_next(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('stage_next',cr,uid,ids,*args,**argv)
-    def onchange_partner_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_id',cr,uid,ids,*args,**argv)
-    def onchange_partner_address_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_address_id',cr,uid,ids,*args,**argv)
-    def onchange_categ_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_categ_id',cr,uid,ids,*args,**argv)
-    def case_close(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_close',cr,uid,ids,*args,**argv)
-    def case_open(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_open',cr,uid,ids,*args,**argv)
-    def case_cancel(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_cancel',cr,uid,ids,*args,**argv)
-    def case_reset(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_reset',cr,uid,ids,*args,**argv)
-    def case_escalate(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_escalate',cr,uid,ids,*args,**argv)
-    def case_pending(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_pending',cr,uid,ids,*args,**argv)
-
-    def msg_new(self, cr, uid, msg):
-        mailgate_obj = self.pool.get('mail.gateway')
-        msg_body = mailgate_obj.msg_body_get(msg)
-        data = {
-            'name': msg['Subject'],
-            'email_from': msg['From'],
-            'email_cc': msg['Cc'],
-            'user_id': False,
-            'description': msg_body['body'],
-            'history_line': [(0, 0, {'description': msg_body['body'], 'email': msg['From'] })],
-        }
-        res = mailgate_obj.partner_get(cr, uid, msg['From'])
-        if res:
-            data.update(res)
-        res = self.create(cr, uid, data)
-        return res
-
-    def msg_update(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_update',cr, uid, ids, *args, **argv)
-    def emails_get(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('emails_get',cr, uid, ids, *args, **argv)
-    def msg_send(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_send',cr, uid, ids, *args, **argv)
 crm_claim()
 
 
-class crm_claim_assign_wizard(osv.osv_memory):
-    _name = 'crm.claim.assign_wizard'
-
-    _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Section', required=False),
-        'user_id': fields.many2one('res.users', 'Responsible'),
-    }
-
-    def _get_default_section(self, cr, uid, context):
-        case_id = context.get('active_id',False)
-        if not case_id:
-            return False
-        case_obj = self.pool.get('crm.claim')
-        case = case_obj.read(cr, uid, case_id, ['state','section_id'])
-        if case['state'] in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        return case['section_id']
-
-
-    _defaults = {
-        'section_id': _get_default_section
-    }
-    def action_create(self, cr, uid, ids, context=None):
-        case_obj = self.pool.get('crm.claim')
-        case_id = context.get('active_id',[])
-        res = self.read(cr, uid, ids)[0]
-        case = case_obj.browse(cr, uid, case_id)
-        if case.state in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        new_case_id = case_obj.copy(cr, uid, case_id, default=
-                                            {
-                                                'section_id':res.get('section_id',False),
-                                                'user_id':res.get('user_id',False),
-                                                'case_id' : case.inherit_case_id.id
-                                            }, context=context)
-        case_obj.case_close(cr, uid, [case_id])
-
-        data_obj = self.pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_claims_filter')
-        search_view = data_obj.read(cr, uid, result, ['res_id'])
-        value = {
-            'name': _('Claims'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.claim',
-            'res_id': int(new_case_id),
-            'type': 'ir.actions.act_window',
-            'search_view_id': search_view['res_id']
-        }
-        return value
-
-crm_claim_assign_wizard()
diff --git a/addons/crm/crm_claims_data.xml b/addons/crm/crm_claims_data.xml
index c4b41a30b9e..f9388e06daf 100644
--- a/addons/crm/crm_claims_data.xml
+++ b/addons/crm/crm_claims_data.xml
@@ -1,37 +1,38 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<record model="crm.case.section" id="section_support_claims">
-		<field name="name">Claims</field>
-		<field name="code">Claim</field>
-	</record>
 
 	<!--
-	Case Categories
+	Claims Categories
 	-->
 	<record model="crm.case.categ" id="categ_claim1">
 		<field name="name">Factual Claims</field>
-		<field name="section_id" ref="section_support_claims"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 	</record>
 	<record model="crm.case.categ" id="categ_claim2">
 		<field name="name">Value Claims</field>
-		<field name="section_id" ref="section_support_claims"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 	</record>
 	<record model="crm.case.categ" id="categ_claim3">
 		<field name="name">Policy Claims</field>
-		<field name="section_id" ref="section_support_claims"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 	</record>
 
 	<!--
 	Case Category2
 	-->
-	<record model="crm.case.category2" id="category_claim1">
+	<record model="crm.case.resource.type" id="type_claim1">
 		<field name="name">Corrective</field>
-		<field name="section_id" ref="section_support_claims"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 	</record>	
-	<record model="crm.case.category2" id="category_claim2">
+	<record model="crm.case.resource.type" id="type_claim2">
 		<field name="name">Preventive</field>
-		<field name="section_id" ref="section_support_claims"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 	</record>
 
 	<!--
@@ -39,23 +40,28 @@
 	-->
 	<record model="crm.case.stage" id="stage_claim1">
 		<field name="name">Accepted as Claim</field>
-		<field name="section_id" ref="section_support_claims"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 	</record>	
 	<record model="crm.case.stage" id="stage_claim2">
 		<field name="name">Fixed</field>
-		<field name="section_id" ref="section_support_claims"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 	</record>	
 	<record model="crm.case.stage" id="stage_claim3">
 		<field name="name">Won't fix</field>
-		<field name="section_id" ref="section_support_claims"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 	</record>	
 	<record model="crm.case.stage" id="stage_claim4">
 		<field name="name">Invalid</field>
-		<field name="section_id" ref="section_support_claims"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 	</record>	
 	<record model="crm.case.stage" id="stage_claim5">
 		<field name="name">Awaiting Response</field>
-		<field name="section_id" ref="section_support_claims"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 	</record>
 </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/crm/crm_claims_demo.xml b/addons/crm/crm_claims_demo.xml
index b53cb1b717b..525998c02ff 100644
--- a/addons/crm/crm_claims_demo.xml
+++ b/addons/crm/crm_claims_demo.xml
@@ -7,13 +7,13 @@
 		<record id="crm_case_claim01" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_15"/>
 			<field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
-			<field name="category2_id" ref="crm.category_claim1"/>
+			<field name="type_id" ref="crm.type_claim1"/>
 			<field name="partner_id" ref="base.res_partner_11"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Problem with the delivery of goods&quot;" name="name"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_claims"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_claim1"/>
@@ -23,13 +23,13 @@
 		<record id="crm_case_claim02" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_6"/>
 			<field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
-			<field name="category2_id" ref="crm.category_claim2"/>
+			<field name="type_id" ref="crm.type_claim2"/>
 			<field name="partner_id" ref="base.res_partner_6"/>
 			<field eval="&quot;4&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Damaged Products&quot;" name="name"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_claims"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(392) 895-7917&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_claim2"/>
@@ -39,13 +39,13 @@
 		<record id="crm_case_claim03" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_2"/>
 			<field eval="time.strftime('%Y-%m-15 17:44:12')" name="date"/>
-			<field name="category2_id" ref="crm.category_claim1"/>
+			<field name="type_id" ref="crm.type_claim1"/>
 			<field name="partner_id" ref="base.res_partner_10"/>
 			<field eval="&quot;2&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_demo"/>
 			<field eval="&quot;Document related problems&quot;" name="name"/>
 			<field eval="&quot;done&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_claims"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(820) 167-3208&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_claim3"/>
@@ -55,13 +55,13 @@
 		</record>
 		<record id="crm_case_claim04" model="crm.claim">
 			<field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/>
-			<field name="category2_id" ref="crm.category_claim2"/>
+			<field name="type_id" ref="crm.type_claim2"/>
 			<field name="partner_id" ref="base.res_partner_tinyatwork"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Product quality not maintained&quot;" name="name"/>
 			<field eval="&quot;draft&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_claims"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(077) 582-4035&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_claim1"/>
@@ -71,13 +71,13 @@
 		<record id="crm_case_claim05" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_10"/>
 			<field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
-			<field name="category2_id" ref="crm.category_claim1"/>
+			<field name="type_id" ref="crm.type_claim1"/>
 			<field name="partner_id" ref="base.res_partner_5"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Some products missing&quot;" name="name"/>
 			<field eval="&quot;pending&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_claims"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(333) 715-1450&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_claim3"/>
@@ -87,13 +87,13 @@
 		<record id="crm_case_claim06" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_1"/>
 			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm.category_claim2"/>
+			<field name="type_id" ref="crm.type_claim2"/>
 			<field name="partner_id" ref="base.res_partner_9"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Problem with the delivery of assignments&quot;" name="name"/>
 			<field eval="&quot;cancel&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_claims"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(468) 017-2684&quot;" name="partner_mobile"/>
 			<field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
 			<field name="categ_id" ref="crm.categ_claim1"/>
@@ -103,13 +103,13 @@
 		</record>
 		<record id="crm_case_claims07" model="crm.claim">
 			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm.category_claim1"/>
+			<field name="type_id" ref="crm.type_claim1"/>
 			<field name="partner_id" ref="base.res_partner_seagate"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Documents unclear&quot;" name="name"/>
 			<field eval="&quot;done&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_claims"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;	(463) 014-1208&quot;" name="partner_mobile"/>
 			<field eval="time.strftime('%Y-%m-19 13:01:05')" name="date"/>
 			<field name="categ_id" ref="crm.categ_claim3"/>
diff --git a/addons/crm/crm_claims_menu.xml b/addons/crm/crm_claims_menu.xml
index a17056ed66d..211c632a804 100644
--- a/addons/crm/crm_claims_menu.xml
+++ b/addons/crm/crm_claims_menu.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    <menuitem id="menu_aftersale" name="After-Sale Services" parent="crm.menu_crm"/>
-    
+    <menuitem id="base.menu_aftersale" name="After-Sale Services" parent="base.menu_base_partner" sequence="6"/>
+
     ######################## CLAIMS (menu) ###########################
     <record model="ir.actions.act_window" id="crm_case_categ_claim0">
-        <field name="name">All Claims</field>
+        <field name="name">Claims</field>
         <field name="res_model">crm.claim</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
+        <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_claims_tree_view"/>        
         <field name="context" eval="{'default_state':'open'}"/>
-        <field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>        
+        <field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_claims_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_claim0"/>
-    </record>    
+    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
@@ -31,7 +31,15 @@
         <field name="view_id" ref="crm_case_claims_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_claim0"/>
     </record>
-    <menuitem name="Claims" id="menu_crm_case_claims"  parent="menu_aftersale" action="crm_case_categ_claim0"/>
-    
+    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
+        <field name="sequence" eval="4"/>
+        <field name="view_mode">graph</field>
+        <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
+        <field name="act_window_id" ref="crm_case_categ_claim0"/>
+    </record>  
+
+    <menuitem name="Claims" id="menu_crm_case_claims"  parent="base.menu_aftersale" action="crm_case_categ_claim0"/>
+
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index f2fb7f4607d..17dd87caa50 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -4,35 +4,29 @@
     # ------------------------------------------------------
     # Claims
     # ------------------------------------------------------
-
-    <record model="ir.ui.view" id="crm_claim_assign_wizard_form">
-        <field name="name">crm.claim.assign_wizard.form</field>
-        <field name="model">crm.claim.assign_wizard</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="To Assign">
-                <group col="2">            	
-                    <field name="section_id" select="1" widget="selection"/>
-                    <field name="user_id"/>
-                </group>
-                <newline/>                    
-                <separator colspan="4"/>                             
-                <group col="2" colspan="2">
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="gtk-execute" name="action_create" string="Assign" type="object"/>
-                </group>
-            </form>
-        </field>
-    </record>
-    <record id="action_crm_claim_assign_wizard" model="ir.actions.act_window">
-        <field name="name">To Assign</field>
-        <field name="res_model">crm.claim.assign_wizard</field>
+    <record id="crm_claim_categ_action" model="ir.actions.act_window">
+        <field name="name">Claim Categories</field>
+        <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
-        <field name="view_id" ref="crm_claim_assign_wizard_form"/>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
+ 		<field name="view_id" ref="crm.crm_case_categ_tree-view"/>        
+       	<field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+		<field name="context">{'object_id':'crm.claim'}</field>       	
     </record>
-
+    <menuitem action="crm_claim_categ_action" id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ"/>
+    # ------------------------------------------------------
+    # Stages
+    # ------------------------------------------------------	    
+	    <record id="crm_claim_stage_act" model="ir.actions.act_window">
+	        <field name="name">Claim Stages</field>
+	        <field name="res_model">crm.case.stage</field>
+	        <field name="view_type">form</field>
+	        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+	       <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+	      <field name="context">{'object_id':'crm.claim'}</field>  
+	    </record>
+	  <menuitem action="crm_claim_stage_act" id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage"/>
+	    
+	<!-- Claims	-->
     <record model="ir.ui.view" id="crm_case_claims_tree_view">
         <field name="name">CRM - Claims Tree</field>
         <field name="model">crm.claim</field>
@@ -44,7 +38,7 @@
                 <field name="partner_id"/>
                 <field name="date" string="Date"/>
                 <field name="categ_id" string="Type" select="1"/>
-                <field name="user_id" string="Responsible" select="2"/>
+                <field name="probability"/>
                 <field name="state"/>
             </tree>
         </field>
@@ -69,10 +63,6 @@
                         <field name="stage_id" select="1" nolabel="1"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                     </group>
-                    <group colspan="2">
-                        <field name="case_id" select="1"/>
-                        <button string="Assign" name="%(action_crm_claim_assign_wizard)d"  type="action" />
-                    </group>
                 </group>
                 <notebook>
                 <page string="Claims Info">
@@ -82,9 +72,10 @@
                     <field name="partner_mobile"/>
                     <newline/>
                     <field name="planned_cost" string="Claim Cost"/>
+                    <field name="probability"/>
                     <newline/>
                     <field name="priority"/>
-                    <field name="category2_id" string="Type of Action" select="1"/>
+                    <field name="type_id" string="Type of Action" select="1"/>
                     <field name="ref"/>
                     <field name="ref2"/>
                     <separator colspan="4" string="Claim/Action Description"/>
@@ -120,19 +111,6 @@
                         </form>
                     </field>
                 </page>
-                <page string="Events">
-                   <field name="child_ids" colspan="4" nolabel="1">
-                       <tree string="Related Cases">
-                           <field name="id"/>
-                           <field name="date"/>
-                           <field name="name"/>
-                           <field name="partner_id"/>
-                           <field name="user_id"/>
-                           <field name="section_id" widget="selection"/>
-                           <field name="state"/>
-                        </tree>
-                    </field>
-                </page>
                 <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
@@ -179,6 +157,19 @@
         </field>
     </record>
 
+	<record model="ir.ui.view" id="crm_case_graph_view_stage_cost">
+	    <field name="name">CRM -Graph</field>
+	    <field name="model">crm.claim</field>
+	    <field name="type">graph</field>
+	    <field name="arch" type="xml">
+	        <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
+	            <field name="stage_id"/>
+	            <field name="planned_cost" operator="+"/>
+	            <field name="planned_revenue" operator="+"/>
+	        </graph>
+	    </field>
+    </record>
+        
    <record id="view_crm_case_claims_filter" model="ir.ui.view">
             <field name="name">CRM - Claims Search</field>
             <field name="model">crm.claim</field>
@@ -187,17 +178,17 @@
                 <search string="Search Claims">
                    <group col="4" colspan="1">
                        <filter icon="gtk-new" string="New Claims"
-                       	domain="[('section_id.name','=','Claims'),('state','=','draft')]"
+                       	domain="[('state','=','draft')]"
                        	separator="1" help="New Claims"
                        />
                        <filter icon="gtk-execute"
                        	string="In Progress Claims"
-                       	domain="[('section_id.name','=','Claims'),('state','=','open')]"
+                       	domain="[('state','=','open')]"
                        	separator="1" help="In Progress Claims"
                        />
                        <filter icon="gtk-media-pause"
                        	string="Pending Claims"
-                       	domain="[('section_id.name','=','Claims'),('state','=','pending')]"
+                       	domain="[('state','=','pending')]"
                        	separator="1" help="All pending Claims"
                        />
                    </group>
@@ -207,6 +198,12 @@
                        <field name="partner_id" select="1"/>
                        <field name="user_id" select="1" widget="selection"/>
                    </group>
+					<field name="section_id" select="1" widget="selection" string="Section">
+							<filter icon="terp-crm"
+                               domain="[('section_id','=',context.get('section_id',False))]"
+                               help="My section"
+                           />		
+                 </field>          
                </search>
             </field>
         </record>
diff --git a/addons/crm/crm_config.py b/addons/crm/crm_config.py
deleted file mode 100644
index 92075a791e2..00000000000
--- a/addons/crm/crm_config.py
+++ /dev/null
@@ -1,190 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import tools
-from osv import fields, osv
-import os
-import pooler
-import netsvc
-from tools.translate import _
-from osv.orm import except_orm
-
-#AVAILABLE_STATES = [
-#    ('draft','Unreviewed'),
-#    ('open','Open'),
-#    ('cancel', 'Refuse Bug'),
-#    ('done', 'Done'),
-#    ('pending','Pending')
-#]
-
-class crm_case_category2(osv.osv):
-    _name = "crm.case.category2"
-    _description = "Category2 of case"
-    _rec_name = "name"
-    _columns = {
-        'name': fields.char('Case Category2 Name', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Case Section'),
-    }
-
-crm_case_category2()
-
-
-class crm_case_stage(osv.osv):
-    _name = "crm.case.stage"
-    _description = "Stage of case"
-    _rec_name = 'name'
-    _order = "sequence"
-    _columns = {
-        'name': fields.char('Stage Name', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Case Section'),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
-    }
-    _defaults = {
-        'sequence': lambda *args: 1
-    }
-crm_case_stage()
-
-
-class crm_cases(osv.osv):
-    _name = "crm.case"
-    _inherit = "crm.case"
-    _columns = {
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id)]"),
-        'category2_id': fields.many2one('crm.case.category2', 'Category Name', domain="[('section_id','=',section_id)]"),
-        'duration': fields.float('Duration'),
-        'case_id': fields.many2one('crm.case', 'Related Case'),
-        'partner_name': fields.char("Employee's Name", size=64),
-        'partner_name2': fields.char('Employee Email', size=64),
-        'partner_phone': fields.char('Phone', size=32),
-        'partner_mobile': fields.char('Mobile', size=32),
-        'child_ids': fields.one2many('crm.case', 'case_id', 'Events'),
-    }
-
-    def stage_next(self, cr, uid, ids, context={}):
-        ok = False
-        sid = self.pool.get('crm.case.stage').search(cr, uid, [], context=context)
-        s = {}
-        previous = {}
-        for stage in self.pool.get('crm.case.stage').browse(cr, uid, sid, context=context):
-            section = stage.section_id.id or False
-            s.setdefault(section, {})
-            s[section][previous.get(section, False)] = stage.id
-            previous[section] = stage.id
-
-        for case in self.browse(cr, uid, ids, context):
-            section = (case.section_id.id or False)
-            if section in s:
-                st = case.stage_id.id  or False
-                if st in s[section]:
-                    self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
-
-        return True
-
-    def onchange_case_id(self, cr, uid, ids, case_id, name, partner_id, context={}):
-        if not case_id:
-            return {}
-        case = self.browse(cr, uid, case_id, context=context)
-        value = {}
-        if not name:
-            value['name'] = case.name
-        if (not partner_id) and case.partner_id:
-            value['partner_id'] = case.partner_id.id
-            if case.partner_address_id:
-                value['partner_address_id'] = case.partner_address_id.id
-            if case.email_from:
-                value['email_from'] = case.email_from
-        return {'value': value}
-
-crm_cases()
-
-
-class crm_menu_config_wizard(osv.osv_memory):
-    _name = 'crm.menu.config_wizard'
-    _columns = {
-        'name': fields.char('Name', size=64),
-        'meeting': fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."),
-        'lead': fields.boolean('Leads', help="Allows you to track and manage leads which are pre-sales requests or contacts, the very first contact with a customer request."),
-        'opportunity': fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."),
-        'jobs': fields.boolean('Jobs Hiring Process', help="Helps you to organise the jobs hiring process: evaluation, meetings, email integration..."),
-        'document_ics': fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."),
-        'bugs': fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on software"),
-        'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."),
-        'fund': fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."),
-        'claims': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."),
-        'phonecall': fields.boolean('Phone Calls', help="Helps you to encode the result of a phone call or to plan a list of phone calls to process."),
-    }
-    _defaults = {
-        'meeting': lambda *args: True,
-        'opportunity': lambda *args: True,
-        'phonecall': lambda *args: True,
-    }
-
-    def action_create(self, cr, uid, ids, context=None):
-        module_proxy = self.pool.get('ir.module.module')
-        modid = module_proxy.search(cr, uid, [('name', '=', 'crm')])
-        moddemo = module_proxy.browse(cr, uid, modid[0]).demo
-        lst = ('data', 'menu')
-        if moddemo:
-            lst = ('data', 'menu', 'demo')
-        res = self.read(cr, uid, ids)[0]
-        idref = {}
-        for section in ['meeting', 'lead', 'opportunity', 'jobs', 'bugs', 'fund', 'helpdesk', 'claims', 'phonecall']:
-            if (not res[section]):
-                continue
-            for fname in lst:
-                file_name = 'crm_' + section + '_' + fname + '.xml'
-                try:
-                    fp = tools.file_open(os.path.join('crm', file_name))
-                except IOError, e:
-                    fp = None
-                if fp:
-                    tools.convert_xml_import(cr, 'crm', fp, idref, 'init', noupdate=True)
-        cr.commit()
-        modobj = self.pool.get('ir.module.module')
-        modids = modobj.search(cr, uid, [('name', '=', 'crm')])
-        modobj.update_translations(cr, 1, modids, None)
-
-        if res['document_ics']:
-            ids = module_proxy.search(cr, uid, [('name', '=', 'document_ics')])
-            module_proxy.button_install(cr, uid, ids, context=context)
-            cr.commit()
-            db, pool = pooler.restart_pool(cr.dbname, update_module=True)
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-         }
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-         }
-
-crm_menu_config_wizard()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/crm/crm_config_view.xml b/addons/crm/crm_config_view.xml
deleted file mode 100644
index e2d4cd916d3..00000000000
--- a/addons/crm/crm_config_view.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- graph view -->
-        <record model="ir.ui.view" id="crm_case_graph_view_stage_cost">
-            <field name="name">CRM -Graph</field>
-            <field name="model">crm.case</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
-                    <field name="stage_id"/>
-                    <field name="planned_cost" operator="+"/>
-                    <field name="planned_revenue" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <!-- calendar view -->
-        <record id="crm_case_calendar_section-view" model="ir.ui.view">
-            <field name="name">crm.case.calendar.section</field>
-            <field name="model">crm.case</field>
-            <field name="type">calendar</field>
-            <field name="arch" type="xml">
-                <calendar color="section_id" date_start="date" date_stop="date_deadline" day_length="12" string="Cases">
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="state"/>
-                </calendar>
-            </field>
-        </record>
-
-    # ------------------------------------------------------ 
-    # Stage
-    # ------------------------------------------------------ 
-    <record model="ir.ui.view" id="crm_case_stage_tree">
-        <field name="name">crm.case.stage.tree</field>
-        <field name="model">crm.case.stage</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Stages">
-                <field name="sequence"/>
-                <field name="name"/>
-                <field name="section_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="crm_case_stage_form">
-        <field name="name">crm.case.stage.form</field>
-        <field name="model">crm.case.stage</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Stage">
-            	<field name="name" select="1"/>
-                <field name="section_id" select="1" widget="selection"/>
-                <field name="sequence"/>
-            </form>
-        </field>
-    </record>
-    <record id="crm_case_stage_act" model="ir.actions.act_window">
-        <field name="name">Stages</field>
-        <field name="res_model">crm.case.stage</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm_case_stage_tree"/>
-    </record>
-    <menuitem action="crm_case_stage_act" id="menu_crm_case_stage_act" parent="crm.next_id_51"/>    
-     
-    
-        
-    </data>
-</openerp>
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 74c985bc367..8bc30fbd26e 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -35,6 +35,10 @@
     </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"/>
diff --git a/addons/crm/crm_fund_data.xml b/addons/crm/crm_fund_data.xml
index 159d202ac2a..1c566279b90 100644
--- a/addons/crm/crm_fund_data.xml
+++ b/addons/crm/crm_fund_data.xml
@@ -1,53 +1,57 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    <record model="crm.case.section" id="section_support4">
-        <field name="name">Fund Raising</field>
-        <field name="code">funds</field>
-    </record>
 
-        <!--    CASE CATEGORY(categ_id)        -->
+        <!--    FUNDRAISING CATEGORY(categ_id)        -->
         
     <record model="crm.case.categ" id="categ_fund1">
         <field name="name">Social Rehabilitation And Rural Upliftment</field>
-        <field name="section_id" ref="section_support4"/>
+        <field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
     </record>
     
     <record model="crm.case.categ" id="categ_fund2">
         <field name="name">Learning And Education</field>
-        <field name="section_id" ref="section_support4"/>
+        <field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>      
     </record>    
     
     <record model="crm.case.categ" id="categ_fund3">
         <field name="name">Healthcare</field>
-        <field name="section_id" ref="section_support4"/>
+        <field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>         
     </record>        
     
     <record model="crm.case.categ" id="categ_fund4">
         <field name="name">Arts And Culture</field>
-        <field name="section_id" ref="section_support4"/>
+        <field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>         
     </record>    
 
-        <!--    CASE CATEGORY2(category2_id)        -->
+        <!--    CASE Resource(type_id)        -->
         
-    <record model="crm.case.category2" id="categ2_fund1">
+    <record model="crm.case.resource.type" id="type_fund1">
         <field name="name">Cash</field>
-        <field name="section_id" ref="section_support4"/>
+        <field name="section_id" ref="section_sales_department"/>
+       	<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>  
     </record>
     
-    <record model="crm.case.category2" id="categ2_fund2">
+    <record model="crm.case.resource.type" id="type_fund2">
         <field name="name">Cheque</field>
-        <field name="section_id" ref="section_support4"/>
+        <field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>          
     </record>        
 
-    <record model="crm.case.category2" id="categ2_fund3">
+    <record model="crm.case.resource.type" id="type_fund3">
         <field name="name">Credit Card</field>
-        <field name="section_id" ref="section_support4"/>
+        <field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>          
     </record>
     
-    <record model="crm.case.category2" id="categ2_fund4">
+    <record model="crm.case.resource.type" id="type_fund4">
         <field name="name">Demand Draft</field>
-        <field name="section_id" ref="section_support4"/>
+        <field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>          
     </record>    
 
 </data>
diff --git a/addons/crm/crm_fund_demo.xml b/addons/crm/crm_fund_demo.xml
index b4af9776cb8..23ea6835df1 100644
--- a/addons/crm/crm_fund_demo.xml
+++ b/addons/crm/crm_fund_demo.xml
@@ -5,14 +5,14 @@
             <field eval="50" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund3"/>
+            <field name="type_id" ref="type_fund3"/>
             <field eval="3.0" name="duration"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="250000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
             <field name="categ_id" ref="categ_fund1"/>
             <field eval="&quot;Helping Street Children&quot;" name="name"/>
@@ -24,13 +24,13 @@
             <field eval="80" name="probability"/>
             <field name="partner_address_id" ref="base.main_address"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund4"/>
+            <field name="type_id" ref="type_fund4"/>
             <field name="partner_id" ref="base.main_partner"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="2000000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-05 12:35:50')" name="date"/>
             <field eval="8.0" name="duration"/>
             <field name="categ_id" ref="categ_fund1"/>
@@ -41,14 +41,14 @@
         <record id="crm_case_donatingbookstoschoollibraries0" model="crm.fundraising">
             <field name="partner_address_id" ref="base.res_partner_address_zen"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund1"/>
+            <field name="type_id" ref="type_fund1"/>
             <field eval="5.0" name="duration"/>
             <field name="partner_id" ref="base.res_partner_3"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="500000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-07 13:50:50')" name="date"/>
             <field name="categ_id" ref="categ_fund2"/>
             <field eval="&quot;Donating books to school libraries&quot;" name="name"/>
@@ -58,14 +58,14 @@
         <record id="crm_case_renovatinggovernmentschools0" model="crm.fundraising">
             <field name="partner_address_id" ref="base.res_partner_address_7"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund2"/>
+            <field name="type_id" ref="type_fund2"/>
             <field eval="3.0" name="duration"/>
             <field name="partner_id" ref="base.res_partner_4"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="1000000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-12 15:10:50')" name="date"/>
             <field name="categ_id" ref="categ_fund2"/>
             <field eval="4.3" name="duration"/>
@@ -76,13 +76,13 @@
         <record id="crm_case_donatingambulancestohospitals0" model="crm.fundraising">
             <field name="partner_address_id" ref="base.res_partner_address_13"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund4"/>
+            <field name="type_id" ref="type_fund4"/>
             <field name="partner_id" ref="base.res_partner_14"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="5000000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-17 19:00:15')" name="date"/>
             <field eval="3" name="duration"/>
             <field name="categ_id" ref="categ_fund3"/>
@@ -93,13 +93,13 @@
         <record id="crm_case_donatinghospitalequipments0" model="crm.fundraising">
             <field name="partner_address_id" ref="base.res_partner_address_2"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund3"/>
+            <field name="type_id" ref="type_fund3"/>
             <field name="partner_id" ref="base.res_partner_10"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="10000000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-27 09:00:15')" name="date"/>
             <field eval="12" name="duration"/>
             <field name="categ_id" ref="categ_fund3"/>
@@ -111,14 +111,14 @@
         <record id="crm_case_encouragingarts0" model="crm.fundraising">
             <field name="partner_address_id" ref="base.res_partner_address_14"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund2"/>
+            <field name="type_id" ref="type_fund2"/>
             <field eval="7.0" name="duration"/>
             <field name="partner_id" ref="base.res_partner_15"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="10000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-01 10:00:15')" name="date"/>
             <field name="categ_id" ref="categ_fund4"/>
             <field eval="&quot;Encouraging arts&quot;" name="name"/>
@@ -129,14 +129,14 @@
             <field eval="10" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="categ2_fund1"/>
+            <field name="type_id" ref="type_fund1"/>
             <field eval="6.0" name="duration"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="800000.0" name="planned_cost"/>
-            <field name="section_id" ref="section_support4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field eval="time.strftime('%Y-%m-24 22:00:15')" name="date"/>
             <field name="categ_id" ref="categ_fund4"/>
             <field eval="&quot;Promoting cultural programs and preserving dying art forms&quot;" name="name"/>
diff --git a/addons/crm/crm_fund_menu.xml b/addons/crm/crm_fund_menu.xml
index 2e74a12d669..57353e2c6ac 100644
--- a/addons/crm/crm_fund_menu.xml
+++ b/addons/crm/crm_fund_menu.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">    
+<data noupdate="1">
     <!-- MENU -->
+    <menuitem id="base.menu_fundrising" name="Fund Raising" parent="base.menu_base_partner" sequence="7"/>
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
-        <field name="name">All Funds</field>
+        <field name="name">Funds</field>
         <field name="res_model">crm.fundraising</field>
         <field name="view_mode">tree,form,graph</field>
-        <field name="view_id" ref="crm.crm_case_tree_view_fund"/>        
+        <field name="view_id" ref="crm.crm_case_tree_view_fund"/>
         <field name="context" eval="{'default_state':'open'}"/>
-        <field name="search_view_id" ref="crm.view_crm_case_fund_filter"/>        
+        <field name="search_view_id" ref="crm.view_crm_case_fund_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
         <field name="sequence" eval="1"/>
@@ -28,8 +29,7 @@
         <field name="view_id" ref="crm.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
     </record>
-
-    <menuitem name="Fund Raising" id="menu_crm_case_fund_raise" parent="crm.menu_crm" action="crm_case_category_act_fund_all1"/>
+    <menuitem name="Fund Raising" id="menu_crm_case_fund_raise" parent="base.menu_fundrising" action="crm_case_category_act_fund_all1"  sequence="1"/>
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index f5b5278123e..4fec4afb976 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -2,6 +2,31 @@
 <openerp>
 <data>
 
+	# ------------------------------------------------------
+    # Fund Raising Categories
+    # ------------------------------------------------------
+    <record id="crm_fund_categ_action" model="ir.actions.act_window">
+        <field name="name">Fundraising 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.fundraising')]</field> 
+		<field name="context">{'object_id':'crm.fundraising'}</field>  		       
+    </record>
+   <menuitem action="crm_fund_categ_action" id="menu_crm_case_fundraising-act" parent="crm.menu_crm_case_categ"/>
+    # ------------------------------------------------------
+    # Fund Stage
+    # ------------------------------------------------------
+	    <record id="crm_fundraising_stage_act" model="ir.actions.act_window">
+	        <field name="name">Fundraising Stages</field>
+	        <field name="res_model">crm.case.stage</field>
+	        <field name="view_type">form</field>
+	        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+   			<field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
+   			<field name="context">{'object_id':'crm.fundraising'}</field>  		        
+	    </record>
+	  <menuitem action="crm_fundraising_stage_act" id="menu_crm_fundraising_stage_act" parent="crm.menu_crm_case_stage"/>
+	    
     # ------------------------------------------------------
     # Fund Raising
     # ------------------------------------------------------
@@ -14,7 +39,7 @@
                 <field name="id"/>
                 <field name="name" string="Funds"/>
                 <field name="categ_id"/>
-                <field name="category2_id" string="Payment Mode"/>
+                <field name="type_id" string="Payment Mode"/>
                 <field name="planned_cost" string="Amount"/>
                 <field name="probability"/>
                 <field name="user_id"/>
@@ -41,7 +66,7 @@
                     <newline/>
                     <field name="date" string="Next Meeting"/>
                     <field name="duration"/>
-                    <field name="category2_id" select="1" string="Payment Mode"/>
+                    <field name="type_id" select="1" string="Payment Mode"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Funds">
@@ -169,6 +194,12 @@
                        </field>
                        <field name="name" select='1'/>
                        <field name="user_id" select="1" widget="selection"/>
+					   <field name="section_id" select="1" widget="selection" string="Section">
+							<filter icon="terp-crm"
+                               domain="[('section_id','=',context.get('section_id',False))]"
+                               help="My section"
+                           />	
+                       </field>		
                    </group>
                </search>
             </field>
diff --git a/addons/crm/crm_fundraising.py b/addons/crm/crm_fundraising.py
index 8d1dc6fa3b0..046065e61f2 100644
--- a/addons/crm/crm_fundraising.py
+++ b/addons/crm/crm_fundraising.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -32,73 +32,46 @@ import tools
 from osv import fields,osv,orm
 from osv.orm import except_orm
 
+import crm
+
+
+
 class crm_fundraising(osv.osv):
     _name = "crm.fundraising"
     _description = "Fund Raising Cases"
     _order = "id desc"
-    _inherits = {'crm.case':"inherit_case_id"}  
+    _inherit ='crm.case'
     _columns = {        
-           'inherit_case_id': fields.many2one('crm.case','Case',ondelete='cascade'),
+            'date_closed': fields.datetime('Closed', readonly=True),
+            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),            
+            'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]"),
+            'planned_revenue': fields.float('Planned Revenue'),
+            'planned_cost': fields.float('Planned Costs'),
+            'probability': fields.float('Probability (%)'),     
+            'partner_name': fields.char("Employee's Name", size=64),
+            'partner_name2': fields.char('Employee Email', size=64),
+            'partner_phone': fields.char('Phone', size=32),
+            'partner_mobile': fields.char('Mobile', size=32), 
+            'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id)]"),
+            'type_id': fields.many2one('crm.case.resource.type', 'Fundraising Type', domain="[('section_id','=',section_id)]"),
+            'duration': fields.float('Duration'),
+            'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
+            'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
+            'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+            'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                       "the partner mentality in relation to our services.The scale has" \
+                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
         }
-    def _map_ids(self, method, cr, uid, ids, *args, **argv):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids            
-        case_data = self.browse(cr, uid, select)
-        new_ids = []
-        for case in case_data:
-            if case.inherit_case_id:
-                new_ids.append(case.inherit_case_id.id)
-        res = getattr(self.pool.get('crm.case'),method)(cr, uid, new_ids, *args, **argv)
-        if isinstance(ids, (str, int, long)) and isinstance(res, list):
-            return res and res[0] or False
-        return res
+   
+    _defaults = {
+                 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+    }
+    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
+        if not categ:
+            return {'value':{}}
+        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
+        return {'value':{'probability':cat}}    
+    
 
-
-    def onchange_case_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_case_id',cr,uid,ids,*args,**argv)
-    def onchange_partner_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_id',cr,uid,ids,*args,**argv)
-    def onchange_partner_address_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_address_id',cr,uid,ids,*args,**argv)
-    def onchange_categ_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_categ_id',cr,uid,ids,*args,**argv)
-    def case_close(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_close',cr,uid,ids,*args,**argv)    
-    def case_open(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_open',cr,uid,ids,*args,**argv)
-    def case_cancel(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_cancel',cr,uid,ids,*args,**argv)
-    def case_reset(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_reset',cr,uid,ids,*args,**argv)    
-    def case_escalate(self,cr, uid, ids, *args, **argv):    
-        return self._map_ids('case_escalate',cr,uid,ids,*args,**argv)    
-    def case_pending(self,cr, uid, ids, *args, **argv):    
-        return self._map_ids('case_pending',cr,uid,ids,*args,**argv)  
-
-    def msg_new(self, cr, uid, msg):        
-        mailgate_obj = self.pool.get('mail.gateway')
-        msg_body = mailgate_obj.msg_body_get(msg)
-        data = {
-            'name': msg['Subject'],            
-            'email_from': msg['From'],
-            'email_cc': msg['Cc'],            
-            'user_id': False,
-            'description': msg_body['body'],
-            'history_line': [(0, 0, {'description': msg_body['body'], 'email': msg['From'] })],
-        }
-        res = mailgate_obj.partner_get(cr, uid, msg['From'])
-        if res:
-            data.update(res)
-        res = self.create(cr, uid, data)        
-        return res
-
-    def msg_update(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_update',cr, uid, ids, *args, **argv)
-    def emails_get(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('emails_get',cr, uid, ids, *args, **argv)
-    def msg_send(self, cr, uid, ids, *args, **argv):        
-        return self._map_ids('msg_send',cr, uid, ids, *args, **argv) 
-      
 crm_fundraising()    
diff --git a/addons/crm/crm_helpdesk.py b/addons/crm/crm_helpdesk.py
index 4cf4b951e53..ca4bf47006b 100644
--- a/addons/crm/crm_helpdesk.py
+++ b/addons/crm/crm_helpdesk.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -32,111 +32,38 @@ import tools
 from osv import fields,osv,orm
 from osv.orm import except_orm
 
+import crm
+
+
+
 class crm_helpdesk(osv.osv):
     _name = "crm.helpdesk"
     _description = "Helpdesk Cases"
     _order = "id desc"
-    _inherits = {'crm.case':"inherit_case_id"}
+    _inherit = 'crm.case'
     _columns = {
-           'inherit_case_id':fields.many2one('crm.case','Case'),
+            'date_closed': fields.datetime('Closed', readonly=True),
+            'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
+            'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
+            'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                            " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+            'planned_revenue': fields.float('Planned Revenue'),
+            'planned_cost': fields.float('Planned Costs'),
+            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+            'probability': fields.float('Probability (%)'),
+            'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                   "the partner mentality in relation to our services.The scale has" \
+                                                                   "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
+            'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.helpdesk')]"),
+            'duration': fields.float('Duration'),
     }
-
-    def _map_ids(self, method, cr, uid, ids, *args, **argv):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        case_data = self.browse(cr, uid, select)
-        new_ids = []
-        for case in case_data:
-            if case.inherit_case_id:
-                new_ids.append(case.inherit_case_id.id)
-        res = getattr(self.pool.get('crm.case'),method)(cr, uid, new_ids, *args, **argv)
-        if isinstance(ids, (str, int, long)) and isinstance(res, list):
-            return res and res[0] or False
-        return res
-
-
-    def onchange_case_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_case_id',cr,uid,ids,*args,**argv)
-    def onchange_partner_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_id',cr,uid,ids,*args,**argv)
-    def onchange_partner_address_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_address_id',cr,uid,ids,*args,**argv)
-    def onchange_categ_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_categ_id',cr,uid,ids,*args,**argv)
-    def case_close(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_close',cr,uid,ids,*args,**argv)
-    def case_open(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_open',cr,uid,ids,*args,**argv)
-    def case_cancel(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_cancel',cr,uid,ids,*args,**argv)
-    def case_reset(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_reset',cr,uid,ids,*args,**argv)
-
-    def msg_new(self, cr, uid, msg):
-        mailgate_obj = self.pool.get('mail.gateway')
-        msg_body = mailgate_obj.msg_body_get(msg)
-        data = {
-            'name': msg['Subject'],
-            'email_from': msg['From'],
-            'email_cc': msg['Cc'],
-            'user_id': False,
-            'description': msg_body['body'],
-            'history_line': [(0, 0, {'description': msg_body['body'], 'email': msg['From'] })],
-        }
-        res = mailgate_obj.partner_get(cr, uid, msg['From'])
-        if res:
-            data.update(res)
-        res = self.create(cr, uid, data)
-        return res
-
-    def msg_update(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_update',cr, uid, ids, *args, **argv)
-    def emails_get(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('emails_get',cr, uid, ids, *args, **argv)
-    def msg_send(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_send',cr, uid, ids, *args, **argv)
-
+    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
+        if not categ:
+            return {'value':{}}
+        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
+        return {'value':{'probability':cat}}    
+        
 crm_helpdesk()
 
-class crm_helpdesk_assign_wizard(osv.osv_memory):
-    _name = 'crm.helpdesk.assign_wizard'
-
-    _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Section', required=False),
-        'user_id': fields.many2one('res.users', 'Responsible'),
-    }
-
-    def _get_default_section(self, cr, uid, context):
-        case_id = context.get('active_id',False)
-        if not case_id:
-            return False
-        case_obj = self.pool.get('crm.helpdesk')
-        case = case_obj.read(cr, uid, case_id, ['state','section_id'])
-        if case['state'] in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        return case['section_id']
 
 
-    _defaults = {
-        'section_id': _get_default_section
-    }
-    def action_create(self, cr, uid, ids, context=None):
-        case_obj = self.pool.get('crm.helpdesk')
-        case_id = context.get('active_id',[])
-        res = self.read(cr, uid, ids)[0]
-        case = case_obj.read(cr, uid, case_id, ['state'])
-        if case['state'] in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        new_case_id = case_obj.copy(cr, uid, case_id, default=
-                                            {
-                                                'section_id':res.get('section_id',False),
-                                                'user_id':res.get('user_id',False)
-                                            }, context=context)
-        case_obj.write(cr, uid, case_id, {'case_id':new_case_id}, context=context)
-        case_obj.case_close(cr, uid, [case_id])
-        return {}
-
-crm_helpdesk_assign_wizard()
-
diff --git a/addons/crm/crm_helpdesk_data.xml b/addons/crm/crm_helpdesk_data.xml
index 50d350e0641..bc3adea8b38 100644
--- a/addons/crm/crm_helpdesk_data.xml
+++ b/addons/crm/crm_helpdesk_data.xml
@@ -4,10 +4,6 @@
     <!--
     Case Sections
     -->
-    <record model="crm.case.section" id="section_support_help">
-        <field name="name">HelpDesk</field>
-        <field name="code">HD</field>
-    </record>
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_helpdesk_menu.xml b/addons/crm/crm_helpdesk_menu.xml
index 7ab35e6b8cf..270237aa698 100644
--- a/addons/crm/crm_helpdesk_menu.xml
+++ b/addons/crm/crm_helpdesk_menu.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-    <menuitem id="menu_aftersale" name="After-Sale Services" parent="crm.menu_crm"/>
+    <menuitem id="base.menu_aftersale" name="After-Sale Services" parent="base.menu_base_partner" sequence="6"/>
 
     ######################## Help Desk (menu) ###########################
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act111">
-        <field name="name">All Helpdesk Requests</field>
-        <field name="res_model">crm.case</field>
+        <field name="name">Helpdesk Requests</field>
+        <field name="res_model">crm.helpdesk</field>
         <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
-        <field name="domain" eval="'[(\'section_id\',\'=\','+str(ref('section_support_help'))+')]'"/>
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>        
         <field name="context" eval="{'default_state':'open'}"/>
-        <field name="search_view_id" ref="crm.view_crm_case_filter"/>        
+        <field name="search_view_id" ref="crm.view_crm_case_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
         <field name="sequence" eval="1"/>
@@ -31,8 +30,8 @@
         <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
     </record>
-    <menuitem name="Helpdesk and Support" id="menu_help_support_main" parent="menu_aftersale" action="crm_case_helpdesk_act111"/>    
-    
+    <menuitem name="Helpdesk and Support" id="menu_help_support_main" parent="base.menu_aftersale" action="crm_case_helpdesk_act111"/>    
+
 </data>
 </openerp>
-        
+
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index bfec512ad0d..112440cef68 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -2,41 +2,26 @@
 <openerp>
 <data>
 
+	# ------------------------------------------------------
+    # Helpdesk Support Categories
+    # ------------------------------------------------------
+    <record id="crm_helpdesk_categ_action" model="ir.actions.act_window">
+        <field name="name">Helpdesk 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.helpdesk')]</field>	
+		<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"/>
     # ------------------------------------------------------
     # Helpdesk Support
     # ------------------------------------------------------
 
-    <record model="ir.ui.view" id="crm_helpdesk_assign_wizard_form">
-        <field name="name">crm.helpdesk.assign_wizard.form</field>
-        <field name="model">crm.helpdesk.assign_wizard</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="To Assign">
-                <group col="2">            	
-                    <field name="section_id" select="1" widget="selection"/>
-                    <field name="user_id"/>
-                </group>
-                <newline/>                    
-                <separator colspan="4"/>                             
-                <group col="2" colspan="2">
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="gtk-execute" name="action_create" string="Assign" type="object"/>
-                </group>
-            </form>
-        </field>
-    </record>
-    <record id="action_crm_helpdesk_assign_wizard" model="ir.actions.act_window">
-        <field name="name">To Assign</field>
-        <field name="res_model">crm.opportunity.assign_wizard</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm_helpdesk_assign_wizard_form"/>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
 
     <record model="ir.ui.view" id="crm_case_form_view_helpdesk">
         <field name="name">CRM - Helpdesk Support Form</field>
-        <field name="model">crm.case</field>
+        <field name="model">crm.helpdesk</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Helpdesk Support">
@@ -46,10 +31,6 @@
                     <field name="date" select="1"/>
                     <field name="date_deadline" select="2"/>
                     <field name="priority"/>
-                    <group colspan="2">
-                        <field name="case_id" select="1"/>
-                        <button string="Assign" name="%(action_crm_helpdesk_assign_wizard)d"  type="action" />
-                    </group>
                 </group>
                 <notebook colspan="4">
                     <page string="General">
@@ -104,19 +85,6 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Events">
-                       <field name="child_ids" colspan="4" nolabel="1">
-                           <tree string="Related Cases">
-                               <field name="id"/>
-                               <field name="date"/>
-                               <field name="name"/>
-                               <field name="partner_id"/>
-                               <field name="user_id"/>
-                               <field name="section_id" widget="selection"/>
-                               <field name="state"/>
-                           </tree>
-                        </field>
-                    </page>
                     <page string="Emails">
                        <group colspan="4">
                            <field colspan="4" name="email_cc" string="CC"/>
@@ -150,7 +118,7 @@
     </record>
     <record model="ir.ui.view" id="crm_case_tree_view_helpdesk">
         <field name="name">CRM - Helpdesk Support Tree</field>
-        <field name="model">crm.case</field>
+        <field name="model">crm.helpdesk</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Helpdesk Support Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
@@ -174,7 +142,7 @@
 
     <record model="ir.ui.view" id="crm_case_helpdesk_calendar_view">
         <field name="name">CRM - Helpdesk Support Calendar</field>
-        <field name="model">crm.case</field>
+        <field name="model">crm.helpdesk</field>
         <field name="type">calendar</field>
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
diff --git a/addons/crm/crm_job.py b/addons/crm/crm_job.py
deleted file mode 100644
index 7f41c6228c6..00000000000
--- a/addons/crm/crm_job.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-import re
-import os
-
-import mx.DateTime
-import base64
-
-from tools.translate import _
-
-import tools
-from osv import fields,osv,orm
-from osv.orm import except_orm
-
-class crm_job(osv.osv):
-    _name = "crm.job"
-    _description = "Job Cases"
-    _order = "id desc"
-    _inherits = {'crm.case':"inherit_case_id"}    
-    _columns = {        
-        'inherit_case_id': fields.many2one('crm.case','Case',ondelete='cascade'),
-    }
-    def _map_ids(self, method, cr, uid, ids, *args, **argv):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids            
-        case_data = self.browse(cr, uid, select)
-        new_ids = []
-        for case in case_data:
-            if case.inherit_case_id:
-                new_ids.append(case.inherit_case_id.id)
-        res = getattr(self.pool.get('crm.case'),method)(cr, uid, new_ids, *args, **argv)
-        if isinstance(ids, (str, int, long)) and isinstance(res, list):
-            return res and res[0] or False
-        return res
-
-
-    def onchange_case_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_case_id',cr,uid,ids,*args,**argv)
-    def stage_next(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('stage_next',cr,uid,ids,*args,**argv)
-    def onchange_partner_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_id',cr,uid,ids,*args,**argv)
-    def onchange_partner_address_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_address_id',cr,uid,ids,*args,**argv)
-    def onchange_categ_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_categ_id',cr,uid,ids,*args,**argv)
-    def case_close(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_close',cr,uid,ids,*args,**argv)    
-    def case_open(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_open',cr,uid,ids,*args,**argv)
-    def case_cancel(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_cancel',cr,uid,ids,*args,**argv)
-    def case_reset(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_reset',cr,uid,ids,*args,**argv)   
-
-    def msg_new(self, cr, uid, msg):        
-        mailgate_obj = self.pool.get('mail.gateway')
-        msg_body = mailgate_obj.msg_body_get(msg)
-        data = {
-            'name': msg['Subject'],            
-            'email_from': msg['From'],
-            'email_cc': msg['Cc'],            
-            'user_id': False,
-            'description': msg_body['body'],
-            'history_line': [(0, 0, {'description': msg_body['body'], 'email': msg['From'] })],
-        }
-        res = mailgate_obj.partner_get(cr, uid, msg['From'])
-        if res:
-            data.update(res)
-        res = self.create(cr, uid, data)        
-        return res
-
-    def msg_update(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_update',cr, uid, ids, *args, **argv)
-    def emails_get(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('emails_get',cr, uid, ids, *args, **argv)
-    def msg_send(self, cr, uid, ids, *args, **argv):        
-        return self._map_ids('msg_send',cr, uid, ids, *args, **argv) 
-crm_job()
diff --git a/addons/crm/crm_jobs_data.xml b/addons/crm/crm_jobs_data.xml
deleted file mode 100644
index 8bee7e2d89d..00000000000
--- a/addons/crm/crm_jobs_data.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data noupdate="1">
-    <record model="crm.case.section" id="section_support0">
-        <field name="name">Jobs</field>
-        <field name="code">jobs</field>
-    </record>
-
-        <!--    CASE CATEGORY(categ_id)        -->
-        
-    <record model="crm.case.categ" id="categ_job1">
-        <field name="name">Salesman</field>
-        <field name="section_id" ref="section_support0"/>
-    </record>
-    
-    <record model="crm.case.categ" id="categ_job2">
-        <field name="name">Junior Developer</field>
-        <field name="section_id" ref="section_support0"/>
-    </record>    
-        
-        <!--    CATEGORY2(category2_id)        -->
-        
-    <record model="crm.case.category2" id="category_job1">
-        <field name="name">Graduate</field>
-        <field name="section_id" ref="section_support0"/>
-    </record>        
-    <record model="crm.case.category2" id="category_job2">
-        <field name="name">Licenced</field>
-        <field name="section_id" ref="section_support0"/>
-    </record>
-    <record model="crm.case.category2" id="category_job3">
-        <field name="name"> > Bac +5</field>
-        <field name="section_id" ref="section_support0"/>
-    </record>
-    
-         <!--    STAGE(stage_id)    -->
-         
-    <record model="crm.case.stage" id="stage_job1">
-        <field name="name">Initial Jobs Demand</field>
-        <field name="section_id" ref="section_support0"/>
-    </record>
-    <record model="crm.case.stage" id="stage_job2">
-        <field name="name">First Interview</field>
-        <field name="section_id" ref="section_support0"/>
-    </record>
-    <record model="crm.case.stage" id="stage_job3">
-        <field name="name">Second Interview</field>
-        <field name="section_id" ref="section_support0"/>
-    </record>
-    <record model="crm.case.stage" id="stage_job4">
-        <field name="name">Contract Proposed</field>
-        <field name="section_id" ref="section_support0"/>
-    </record>
-    <record model="crm.case.stage" id="stage_job5">
-        <field name="name">Contract Signed</field>
-        <field name="section_id" ref="section_support0"/>
-    </record>
-    <record model="crm.case.stage" id="stage_job6">
-        <field name="name">Refused by Employee</field>
-        <field name="section_id" ref="section_support0"/>
-    </record>
-    <record model="crm.case.stage" id="stage_job7">
-        <field name="name">Refused by Company</field>
-        <field name="section_id" ref="section_support0"/>
-    </record>
-</data>
-</openerp>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index e6b087d60cb..8fd0f81f6a4 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -32,75 +32,46 @@ import tools
 from osv import fields,osv,orm
 from osv.orm import except_orm
 
+import crm
+
+
+class crm_opportunity(osv.osv):
+    _name = "crm.opportunity"
+    _description = "Opportunity Cases"
+crm_opportunity()
+    
 class crm_lead(osv.osv):
     _name = "crm.lead"
     _description = "Leads Cases"
     _order = "id desc"
-    _inherits = {'crm.case':"inherit_case_id"}    
-    _columns = {        
-           'inherit_case_id':fields.many2one('crm.case','Case'),
+    _inherit = 'crm.case'    
+    _columns = {
+            'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
+            'type_id': fields.many2one('crm.case.resource.type', 'Lead Type Name', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
+            'partner_name': fields.char("Employee's Name", size=64),
+            'partner_name2': fields.char('Employee Email', size=64),
+            'partner_phone': fields.char('Phone', size=32),
+            'partner_mobile': fields.char('Mobile', size=32),
+            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+            'probability': fields.float('Probability (%)'),
+            'date_closed': fields.datetime('Closed', readonly=True),
+            'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
+            'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
+            'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                            " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+            'planned_revenue': fields.float('Planned Revenue'),
+            'planned_cost': fields.float('Planned Costs'),
+            'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
+            'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                       "the partner mentality in relation to our services.The scale has" \
+                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
+                                                                       
+             'opportunity_id': fields.many2one ('crm.opportunity', 'Opportunity'),
     }
-    
-    def _map_ids(self, method, cr, uid, ids, *args, **argv):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids            
-        case_data = self.browse(cr, uid, select)
-        new_ids = []
-        for case in case_data:
-            if case.inherit_case_id:
-                new_ids.append(case.inherit_case_id.id)
-        res = getattr(self.pool.get('crm.case'),method)(cr, uid, new_ids, *args, **argv)
-        if isinstance(ids, (str, int, long)) and isinstance(res, list):
-            return res and res[0] or False
-        return res
-
-
-    def onchange_case_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_case_id',cr,uid,ids,*args,**argv)
-    def stage_next(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('stage_next',cr,uid,ids,*args,**argv)
-    def onchange_partner_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_id',cr,uid,ids,*args,**argv)
-    def onchange_partner_address_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_address_id',cr,uid,ids,*args,**argv)
-    def onchange_categ_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_categ_id',cr,uid,ids,*args,**argv)
-    def case_close(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_close',cr,uid,ids,*args,**argv)    
-    def case_open(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_open',cr,uid,ids,*args,**argv)
-    def case_cancel(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_cancel',cr,uid,ids,*args,**argv)
-    def case_reset(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_reset',cr,uid,ids,*args,**argv)
-    def case_escalate(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_escalate',cr,uid,ids,*args,**argv)
-    
-
-    def msg_new(self, cr, uid, msg):        
-        mailgate_obj = self.pool.get('mail.gateway')
-        msg_body = mailgate_obj.msg_body_get(msg)
-        data = {
-            'name': msg['Subject'],            
-            'email_from': msg['From'],
-            'email_cc': msg['Cc'],            
-            'user_id': False,
-            'description': msg_body['body'],
-            'history_line': [(0, 0, {'description': msg_body['body'], 'email': msg['From'] })],
-        }
-        res = mailgate_obj.partner_get(cr, uid, msg['From'])
-        if res:
-            data.update(res)
-        res = self.create(cr, uid, data)        
-        return res
-
-    def msg_update(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_update',cr, uid, ids, *args, **argv)
-    def emails_get(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('emails_get',cr, uid, ids, *args, **argv)
-    def msg_send(self, cr, uid, ids, *args, **argv):        
-        return self._map_ids('msg_send',cr, uid, ids, *args, **argv)
+    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
+        if not categ:
+            return {'value':{}}
+        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
+        return {'value':{'probability':cat}}        
 
 crm_lead()
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index a6702c40146..6f142391d28 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -1,100 +1,115 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-<!--        CASE SECTION        -->
-    <record model="crm.case.section" id="section_support2">
-        <field name="name">Leads</field>
-        <field name="code">leads</field>
-    </record>
 
-<!--        CASE CATEGORY(categ_id)        -->
     <record model="crm.case.categ" id="categ_lead1">
         <field name="name">Existing Customer</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>         
     </record>
     <record model="crm.case.categ" id="categ_lead2">
         <field name="name">Self Generated</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
     </record>
     <record model="crm.case.categ" id="categ_lead3">
         <field name="name">Employee</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>   
     </record>
     <record model="crm.case.categ" id="categ_lead4">
         <field name="name">Partner</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
     </record>
     <record model="crm.case.categ" id="categ_lead6">
         <field name="name">Website</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
     </record>
     <record model="crm.case.categ" id="categ_lead7">
         <field name="name">Word of mouth</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>   
     </record>
     <record model="crm.case.categ" id="categ_lead8">
         <field name="name">Other</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
     </record>
 
 <!--        CASE STATUS(stage_id)        -->
     <record model="crm.case.stage" id="stage_lead1">
         <field name="name">New</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
     </record>
     <record model="crm.case.stage" id="stage_lead2">
         <field name="name">Assigned</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
     </record>
     <record model="crm.case.stage" id="stage_lead3">
         <field name="name">In Process</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>   
     </record>
     <record model="crm.case.stage" id="stage_lead4">
         <field name="name">Converted</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>   
     </record>
     <record model="crm.case.stage" id="stage_lead5">
         <field name="name">Recycled</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>   
     </record>
     <record model="crm.case.stage" id="stage_lead6">
         <field name="name">Dead</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
     </record>
 
 <!--        CASE CATEGORY2(category2_id)        -->
-    <record model="crm.case.category2" id="category_lead1">
+    <record model="crm.case.resource.type" id="type_lead1">
         <field name="name">Telesales</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
     </record>
-    <record model="crm.case.category2" id="category_lead2">
+    <record model="crm.case.resource.type" id="type_lead2">
         <field name="name">Mail</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
     </record>
-    <record model="crm.case.category2" id="category_lead3">
+    <record model="crm.case.resource.type" id="type_lead3">
         <field name="name">Email</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
     </record>
-    <record model="crm.case.category2" id="category_lead4">
+    <record model="crm.case.resource.type" id="type_lead4">
         <field name="name">Print</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>   	        
     </record>
-    <record model="crm.case.category2" id="category_lead5">
+    <record model="crm.case.resource.type" id="type_lead5">
         <field name="name">Web</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>           
     </record>
-    <record model="crm.case.category2" id="category_lead6">
+    <record model="crm.case.resource.type" id="type_lead6">
         <field name="name">Radio</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>               
     </record>
-    <record model="crm.case.category2" id="category_lead7">
+    <record model="crm.case.resource.type" id="type_lead7">
         <field name="name">Television</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>               
     </record>
-    <record model="crm.case.category2" id="category_lead8">
+    <record model="crm.case.resource.type" id="type_lead8">
         <field name="name">Newsletter</field>
-        <field name="section_id" ref="section_support2"/>
+        <field name="section_id" ref="section_sales_department"/>
+   		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>               
     </record>
 
 </data>
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 7bffe5e7f82..affdd2c437a 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -7,12 +7,12 @@
 
     <!--For Leads-->
         <record id="crm_case_itisatelesalescampaign0" model="crm.lead">
-            <field name="category2_id" ref="crm.category_lead1"/>
+            <field name="type_id" ref="crm.type_lead1"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Exhibition ERP 2009&quot;" name="name"/>
             <field eval="&quot;open&quot;" name="state"/>
-            <field name="section_id" ref="crm.section_support2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="&quot;Michel Lafont&quot;" name="partner_name2"/>
             <field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/>
             <field eval="1" name="active"/>
@@ -22,12 +22,12 @@
             <field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
         </record>
         <record id="crm_case_electonicgoodsdealer0" model="crm.lead">
-            <field name="category2_id" ref="crm.category_lead7"/>
+            <field name="type_id" ref="crm.type_lead7"/>
             <field eval="&quot;4&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Exhibition ERP 2009&quot;" name="name"/>
             <field eval="&quot;open&quot;" name="state"/>
-            <field name="section_id" ref="crm.section_support2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="&quot;Luc Latour&quot;" name="partner_name2"/>
             <field eval="&quot;(392) 895-7917&quot;" name="partner_mobile"/>
             <field eval="1" name="active"/>
@@ -37,12 +37,12 @@
             <field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/>
         </record>
         <record id="crm_case_developingwebapplications0" model="crm.lead">
-            <field name="category2_id" ref="crm.category_lead5"/>
+            <field name="type_id" ref="crm.type_lead5"/>
             <field eval="&quot;2&quot;" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;Exhibition ERP 2009&quot;" name="name"/>
             <field eval="&quot;done&quot;" name="state"/>
-            <field name="section_id" ref="crm.section_support2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="&quot;Mike Gardner&quot;" name="partner_name2"/>
             <field eval="&quot;(820) 167-3208&quot;" name="partner_mobile"/>
             <field eval="1" name="active"/>
@@ -53,12 +53,12 @@
             <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
         </record>
         <record id="crm_case_qrecorp0" model="crm.lead">
-            <field name="category2_id" ref="crm.category_lead8"/>
+            <field name="type_id" ref="crm.type_lead8"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Exhibition ERP 2009&quot;" name="name"/>
             <field eval="&quot;draft&quot;" name="state"/>
-            <field name="section_id" ref="crm.section_support2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="&quot;(077) 582-4035&quot;" name="partner_mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_lead1"/>
@@ -67,12 +67,12 @@
             <field eval="&quot;(514) 698-4118&quot;" name="partner_phone"/>
         </record>
         <record id="crm_case_itdeveloper0" model="crm.lead">
-            <field name="category2_id" ref="crm.category_lead4"/>
+            <field name="type_id" ref="crm.type_lead4"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Carrie Helle&quot;" name="name"/>
             <field eval="&quot;pending&quot;" name="state"/>
-            <field name="section_id" ref="crm.section_support2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="&quot;Sam Stone&quot;" name="partner_name2"/>
             <field eval="&quot;(333) 715-1450&quot;" name="partner_mobile"/>
             <field eval="1" name="active"/>
@@ -84,13 +84,13 @@
         <record id="crm_case_mgroperations0" model="crm.lead">
             <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="crm.category_lead3"/>
+            <field name="type_id" ref="crm.type_lead3"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Tina Pinero&quot;" name="name"/>
             <field eval="&quot;cancel&quot;" name="state"/>
-            <field name="section_id" ref="crm.section_support2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="&quot;Benoit Mortier&quot;" name="partner_name2"/>
             <field eval="&quot;(468) 017-2684&quot;" name="partner_mobile"/>
             <field name="categ_id" ref="crm.categ_lead8"/>
@@ -101,12 +101,12 @@
         </record>
         <record id="crm_case_vpoperations0" model="crm.lead">
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="crm.category_lead8"/>
+            <field name="type_id" ref="crm.type_lead8"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Wendi Baltz&quot;" name="name"/>
             <field eval="&quot;done&quot;" name="state"/>
-            <field name="section_id" ref="crm.section_support2"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="&quot;Will Smith&quot;" name="partner_name2"/>
             <field eval="&quot;(463) 014-1208&quot;" name="partner_mobile"/>
             <field name="categ_id" ref="crm.categ_lead4"/>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index f528d6f2904..933a9d69a0e 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    <menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>
+<!--    <menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>-->
 
 <!--        MENU        -->
 
@@ -9,7 +9,7 @@
         <field name="name">All Leads</field>
         <field name="res_model">crm.lead</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>        
+        <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
     </record>
@@ -25,29 +25,30 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
-    <menuitem parent="menu_presale" name="Leads" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads_all"/>
+    <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
+	<menuitem parent="base.menu_sales" name="Leads" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads_all" sequence="1"/>
 
 <!--        REPORTS        -->
-	
-	<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>
 
-    <menuitem name="Leads"  id="menu_action_report_crm_case_lead" parent="next_id_64"/>    
+	<!--<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>
+
+    <menuitem name="Leads"  id="menu_action_report_crm_case_lead" parent="next_id_64"/>
+
+    <record model="ir.actions.act_window" id="action_report_crm_case_lead_user">
+        <field name="res_model">report.crm.case.user</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="context" eval="{'default_state':'open'}"/>
+    </record>
+    <menuitem name="Cases by Leads and User" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_user" id="menu_action_report_crm_case_lead_user"/>
 
-<!--    <record model="ir.actions.act_window" id="action_report_crm_case_lead_user">-->
-<!--        <field name="res_model">report.crm.case.user</field>-->
-<!--        <field name="view_type">form</field>-->
-<!--        <field name="view_mode">graph,tree</field>-->
-<!--        <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support2)+')]'"/>-->
-<!--        <field name="context" eval="{'default_state':'open'}"/>-->
-<!--    </record>-->
-<!--    <menuitem name="Cases by Leads and User" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_user" id="menu_action_report_crm_case_lead_user"/>-->
-<!--    -->
 
 
     <record model="ir.actions.act_window" id="action_report_crm_case_lead_categ">
         <field name="res_model">report.crm.case.section.categ2</field>
         <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>        
+        <field name="view_mode">graph,tree</field>
         <field name="context" eval="{'default_state':'open'}"/>
     </record>
     <menuitem parent="menu_action_report_crm_case_lead" name="Cases by Leads and Type" action="action_report_crm_case_lead_categ" id="menu_action_report_crm_case_lead_categ"/>
@@ -55,7 +56,7 @@
     <record model="ir.actions.act_window" id="action_report_crm_case_lead_stage">
         <field name="res_model">report.crm.case.section.stage</field>
         <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>        
+        <field name="view_mode">graph,tree</field>
         <field name="context" eval="{'default_state':'open'}"/>
     </record>
     <menuitem name="Cases by Leads and Stage" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_stage" id="menu_action_report_crm_case_lead_stage"/>
@@ -63,7 +64,7 @@
     <record model="ir.actions.act_window" id="action_report_crm_case_lead_categ_stage">
         <field name="res_model">report.crm.case.section.categ.stage</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree</field>        
+        <field name="view_mode">tree</field>
         <field name="context" eval="{'default_state':'open'}"/>
     </record>
     <menuitem name="Cases by Section, Category and Stage" parent="menu_action_report_crm_case_lead"  action="action_report_crm_case_lead_categ_stage" id="menu_action_report_crm_case_lead_categ_stage"/>
@@ -71,11 +72,11 @@
     <record model="ir.actions.act_window" id="action_report_crm_case_lead_categ_categ2">
         <field name="res_model">report.crm.case.section.categ.categ2</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree</field>        
+        <field name="view_mode">tree</field>
         <field name="context" eval="{'default_state':'open'}"/>
     </record>
     <menuitem name="Cases by Section, Category and Type" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_categ_categ2" id="menu_action_report_crm_case_lead_categ_categ2"/>
 
 
-</data>
+--></data>
 </openerp>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3c18752aed3..537fc25cea5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -2,6 +2,32 @@
 <openerp>
 <data>
 
+	# ------------------------------------------------------
+    # Leads Categories
+    # ------------------------------------------------------
+
+    <record id="crm_lead_categ_action" model="ir.actions.act_window">
+        <field name="name">Lead 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_lead_categ_action" id="menu_crm_case_lead-act" parent="crm.menu_crm_case_categ"/>
+		# ------------------------------------------------------ 
+	    # Stage
+	    # ------------------------------------------------------ 
+	    <record id="crm_lead_stage_act" model="ir.actions.act_window">
+	        <field name="name">Lead Stages</field>
+	        <field name="res_model">crm.case.stage</field>
+	        <field name="view_type">form</field>
+		    <field name="view_id" ref="crm.crm_case_stage_tree"/>
+			<field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
+			<field name="context">{'object_id':'crm.lead'}</field> 
+	    </record>
+	  <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" parent="crm.menu_crm_case_stage"/>
     # ------------------------------------------------------
     # Leads
     # ------------------------------------------------------   
@@ -23,8 +49,11 @@
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                     </group>
                     <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source"/>
-                    <field name="category2_id" string="Campaign Type" select="1"/>
-                    <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"/>
+                    <field name="type_id" string="Campaign Type" select="1"/>
+                </group>
+                <group colspan="2" col="4">
+	                <field name="opportunity_id" string="Opportunity Case"/>
+	                <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" icon="gtk-index" type="action"  attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Leads">
@@ -34,14 +63,15 @@
                     <field name="partner_phone"/>
                     <field name="partner_mobile"/>
                     <field name="email_from" string="Lead Email"/>
-                    <newline/>                     
-                     <group colspan="2" col="3">
-                         <field name="partner_id" colspan="1"/>
-                          <button string="Convert to Partner"
-                              icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
-                              type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
-                          />
-                     </group>
+                    <newline/>
+                    <label string="Partner:" align="1.0"/>                     
+                    <group colspan="1" col="2">
+                        <field name="partner_id" nolabel="1" colspan="1"/>
+                        <button string="Convert to Partner"
+                            icon="terp-partner" name="%(wizard_crm_lead_partner_create)d"
+                            type="action" attrs="{'invisible':[('partner_id','!=',False)]}"
+                        />
+                    </group>
                     <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
 
                     <field name="priority" string="Priority"/>
@@ -60,50 +90,6 @@
                         <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
                     </group>
                  </page>
-
-                 <page string="History">
-                    <field name="id" select="1"/>
-                    <field name="active" select="2"/>
-                    <newline/>
-                    <field name="planned_revenue"/>
-                    <field name="planned_cost"/>
-                    <field name="probability"/>
-                    <newline/>
-                    <field name="canal_id"/>
-                    <field name="som"/>
-                    <separator colspan="4" string="Dates"/>
-                    <field name="create_date"/>
-                    <field name="date_closed"/>
-                    <field name="date_action_last"/>
-                    <field name="date"/>
-                    <separator colspan="4" string="References"/>
-                    <field name="ref" colspan="4"/>
-                    <field name="ref2" colspan="4"/>
-
-                    <field name="log_ids" nolabel="1" colspan="4">
-                        <form string="Actions">
-                            <separator string="Action Information" colspan="4"/>
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                            <field name="som"/>
-                            <field name="canal_id"/>
-                        </form>
-                    </field>
-                 </page>
-                 <page string="Events" groups="base.group_extended">
-                   <field name="child_ids" colspan="4" nolabel="1">
-                       <tree string="Related Cases">
-                           <field name="id"/>
-                           <field name="date"/>
-                           <field name="name"/>
-                           <field name="partner_id"/>
-                           <field name="user_id"/>
-                           <field name="section_id" widget="selection"/>
-                           <field name="state"/>
-                       </tree>
-                    </field>
-                 </page>
                  <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
@@ -140,14 +126,14 @@
         <field name="model">crm.lead</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Leads Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+            <tree string="Leads Tree"  colors="red:state=='open';black:state in ('draft', 'pending');grey: state in ('cancel','done')">
                 <field name="id"/>
                 <field name="name" string="Lead Subject"/>
                 <field name="partner_phone"/>
                 <field name="partner_name2" string="Contact Name"/>
                 <field name="stage_id"/>
                 <field name="categ_id" string="Lead Source"/>
-                <field name="category2_id" string="Campaign Type"/>
+                <field name="type_id" string="Campaign Type"/>
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
@@ -190,7 +176,7 @@
                 />
                </group>
                <separator orientation="vertical"/>
-               <group col="4" colspan="2">
+               <group col="6" colspan="2">
                    <field name="name" select="1"/>
                    <field name="user_id" select="1" widget="selection">
                            <filter icon="terp-partner"
@@ -206,6 +192,12 @@
                        <filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Leads"/>
                        <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Leads"/>
                    </field>
+					<field name="section_id" select="1" widget="selection" string="Section">
+ 						<filter icon="terp-crm"
+                               domain="[('section_id','=',context.get('section_id',False))]"
+                               help="My section"
+                           />					
+					</field>
                </group>
            </search>
         </field>
diff --git a/addons/crm/crm_mailgate.py b/addons/crm/crm_mailgate.py
index 5c8712a77d5..2da93ee3347 100644
--- a/addons/crm/crm_mailgate.py
+++ b/addons/crm/crm_mailgate.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -44,20 +44,21 @@ class crm_cases(osv.osv):
             'email_from': msg['From'],
             'email_cc': msg['Cc'],            
             'user_id': False,
-            'description': msg_body['body'],
-            'history_line': [(0, 0, {'description': msg_body['body'], 'email': msg['From'] })],
+            'description': msg_body['body'],            
         }
         res = mailgate_obj.partner_get(cr, uid, msg['From'])
         if res:
             data.update(res)
-        return self.create(cr, uid, data)       
+        res = self.create(cr, uid, data)
+        cases = self.browse(cr, uid, [res])       
+        self.__history(cr, uid, cases, _('Receive'), history=True, email=msg['From'])
+        return res
     
     def msg_update(self, cr, uid, ids, msg, data={}, default_act='pending'):         
         mailgate_obj = self.pool.get('mail.gateway')
         msg_actions, body_data = mailgate_obj.msg_act_get(msg)           
         data.update({
-            'description': body_data,
-            'history_line': [(0, 0, {'description': body_data, 'email': msg['From']})],
+            'description': body_data,            
         })
         act = 'case_'+default_act
         if 'state' in msg_actions:
@@ -77,7 +78,9 @@ class crm_cases(osv.osv):
         if 'partner' in msg_actions:
             data['email_from'] = msg_actions['partner'][:128]
 
-        res = self.write(cr, uid, ids, data)        
+        res = self.write(cr, uid, ids, data)
+        cases = self.browse(cr, uid, [res])       
+        self.__history(cr, uid, cases, _('Receive'), history=True, email=msg['From'])        
         getattr(self,act)(cr, uid, ids)
         return res
 
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 9c3c3b354a5..ac7cc8c48c7 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -19,520 +19,25 @@
 #
 ##############################################################################
 
-from caldav import common
 from osv import fields, osv
-import datetime
-import base64
-import re
-import time
-import tools
-from tools.translate import _
-from dateutil import parser
+import crm
 
 class crm_meeting(osv.osv):
     _name = 'crm.meeting'
     _description = "Meeting Cases"
     _order = "id desc"
-    _inherits = {'crm.case': "inherit_case_id"}
-    __attribute__ = {
-        'class': {'field': 'class', 'type': 'selection'},
-        'created': {'field': 'create_date', 'type': 'datetime'}, # keep none for now
-        'description': {'field': 'description', 'type': 'text'},
-        'dtstart': {'field': 'date', 'type': 'datetime'},
-        'location': {'field': 'location', 'type': 'text'},
-        #'organizer': {'field': 'partner_id', 'sub-field': 'name', 'type': 'many2one'},
-        'priority': {'field': 'priority', 'type': 'int'},
-        'dtstamp' : {'field': 'date', 'type': 'datetime'},
-        'seq': None,
-        'status': {'field': 'state', 'type': 'selection', 'mapping': {'tentative': 'draft', \
-                                                  'confirmed': 'open' , 'cancelled': 'cancel'}},
-        'summary': {'field': 'name', 'type': 'text'},
-        'transp': {'field': 'transparent', 'type': 'text'},
-        'uid': {'field': 'id', 'type': 'text'},
-        'url': {'field': 'caldav_url', 'type': 'text'},
-        'recurid': None,
-#        'attach': {'field': 'attachment_ids', 'sub-field': 'datas', 'type': 'list'},
-        'attendee': {'field': 'attendees', 'type': 'text'},
-#        'categories': {'field': 'categ_id', 'sub-field': 'name'},
-        'categories': {'field': 'categ_id', 'type': 'many2one', 'object': 'crm.case.categ'},
-        'comment': None,
-        'contact': None,
-        'exdate' : {'field': 'exdate', 'type': 'datetime'},
-        'exrule' : {'field': 'exrule', 'type': 'text'},
-        'rstatus': None,
-        'related': None,
-        'resources': None,
-        'rdate': None,
-        'rrule': {'field': 'rrule', 'type': 'text'},
-        'x-openobject-model': {'value': _name, 'type': 'text'},
-#        'duration': {'field': 'duration'},
-        'dtend': {'field': 'date_deadline', 'type': 'datetime'},
-        'valarm': {'field': 'alarms', 'type': 'text'},
-
-    }
-
-    def _get_data(self, cr, uid, ids, name, arg, context):
-        result = {}
-        attendee_obj = self.pool.get('calendar.attendee')
-        alarm_obj = self.pool.get('calendar.alarm')
-        model_obj = self.pool.get('ir.model')
-        model_id = model_obj.search(cr, uid, [('model','=',self._name)])[0]
-        for meeting_id in ids:
-            result[meeting_id] = {}
-            if "attendees" in name:
-                attendee_ids = attendee_obj.search(cr, uid, [('ref','=','%s,%d'%(self._name, meeting_id))])
-                result[meeting_id]["attendees"] = attendee_obj.export_cal(cr, uid, attendee_ids)
-            if "alarms" in name:
-                alarm_ids = alarm_obj.search(cr, uid, [('model_id','=',model_id), ('res_id','=',meeting_id)])
-                result[meeting_id]["alarms"] = alarm_obj.export_cal(cr, uid, alarm_ids)
-        return result
-
-    def _set_data(self, cr, uid, meeting_id, name, value, arg, context):
-        if not value:
-            return
-        attendee_obj = self.pool.get('calendar.attendee')
-        model_obj = self.pool.get('ir.model')
-        alarm_obj = self.pool.get('calendar.alarm')
-        eventdata = self.read(cr, uid, meeting_id, [name], context=context)
-        if name == "attendees":
-            attendee_ids = attendee_obj.import_cal(cr, uid, eventdata['attendees'])
-            vals = {
-                'ref':'%s,%d'%('crm.meeting', meeting_id)
-            }
-            attendee_obj.write(cr, uid, attendee_ids, vals)
-        if name == "alarms":
-            model_id = model_obj.search(cr, uid, [('model','=',self._name)])[0]
-            alarm_ids = alarm_obj.import_cal(cr, uid, eventdata['alarms'])
-            vals = {
-                'res_id' : meeting.id,
-                'model_id' : model_id,
-            }
-            alarm_obj.write(cr, uid, alarm_ids, vals)
-            alarm = alarm_obj.browse(cr, uid, alarm_ids)[0]
-            self.write(cr, uid, [meeting_id], {'alarm_id':alarm.alarm_id})
-        return True
+    _inherit = ["crm.case", "calendar.event"]
 
     _columns = {
-        'inherit_case_id': fields.many2one('crm.case', 'Case', ondelete='cascade'),
-        'class': fields.selection([('public', 'Public'), ('private', 'Private'), \
-                 ('confidential', 'Confidential')], 'Privacy'),
-        'location': fields.char('Location', size=264, help="Gives Location of Meeting"),
-        'freebusy': fields.text('FreeBusy'),
-        'show_as': fields.selection([('free', 'Free'), \
-                                  ('busy', 'Busy')],
-                                   'show_as'),
-        'caldav_url': fields.char('Caldav URL', size=264),
-        'exdate': fields.text('Exception Date/Times', help="This property defines the list\
-                 of date/time exceptions for arecurring calendar component."),
-        'exrule': fields.char('Exception Rule', size=352, help="defines a rule or repeating pattern\
-                                 for anexception to a recurrence set"),
-        'rrule': fields.char('Recurrent Rule', size=352, invisible="True"),
-        'rrule_type' : fields.selection([('none', 'None'), ('daily', 'Daily'), \
-                 ('weekly', 'Weekly'), ('monthly', 'Monthly'), ('yearly', 'Yearly'), ('custom','Custom')], 'Recurrency'),
-        'attendees': fields.function(_get_data, method=True,\
-                fnct_inv=_set_data, string='Attendees', type="text", multi='attendees'),
-        'alarms': fields.function(_get_data, method=True,\
-                fnct_inv=_set_data, string='Attendees', type="text", multi='alarms'),
-        'alarm_id': fields.many2one('res.alarm', 'Alarm'),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+        'categ_id': fields.many2one('crm.case.categ', 'Category', \
+                            domain="[('section_id','=',section_id),\
+                            ('object_id.model', '=', 'crm.meeting')]", \
+            help='Category related to the section.Subdivide the CRM cases \
+independently or section-wise.'), 
+        'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel', 'event_id', 'attendee_id', 'Attendees'),
     }
 
-    _defaults = {
-         'class': lambda *a: 'public',
-         'show_as' : lambda *a : 'busy',
-    }
-
-    def do_alarm_create(self, cr, uid, ids, context={}):
-        alarm_obj = self.pool.get('calendar.alarm')
-        model_obj = self.pool.get('ir.model')
-        attendee_obj = self.pool.get('calendar.attendee')
-        model_id = model_obj.search(cr, uid, [('model','=',self._name)])[0]
-
-        for meeting in self.browse(cr, uid, ids):
-            self.do_alarm_unlink(cr, uid, [meeting.id])
-            attendee_ids = attendee_obj.search(cr, uid, [('ref','=','%s,%d'%(self._name, meeting.id))])
-            basic_alarm = meeting.alarm_id
-            if basic_alarm:
-                vals = {
-                    'action': 'display',
-                    'description': meeting.description,
-                    'name': meeting.name,
-                    'attendee_ids': [(6,0, attendee_ids)],
-                    'trigger_related': basic_alarm.trigger_related,
-                    'trigger_duration': basic_alarm.trigger_duration,
-                    'trigger_occurs': basic_alarm.trigger_occurs,
-                    'trigger_interval': basic_alarm.trigger_interval,
-                    'duration': basic_alarm.duration,
-                    'repeat': basic_alarm.repeat,
-                    'state' : 'run',
-                    'event_date' : meeting.date,
-                    'event_end_date' : meeting.date_deadline,
-                    'res_id' : meeting.id,
-                    'model_id' : model_id,
-                    'user_id' : uid
-                 }
-                alarm_id = alarm_obj.create(cr, uid, vals)
-        cr.commit()
-        return True
-
-    def do_alarm_unlink(self, cr, uid, ids, context={}):
-        alarm_obj = self.pool.get('calendar.alarm')
-        model_obj = self.pool.get('ir.model')
-        model_id = model_obj.search(cr, uid, [('model','=',self._name)])[0]
-        for meeting in self.browse(cr, uid, ids):
-            alarm_ids = alarm_obj.search(cr, uid, [('model_id','=',model_id), ('res_id','=',meeting.id)])
-            if alarm_ids and len(alarm_ids):
-                alarm_obj.unlink(cr, uid, alarm_ids)
-        cr.commit()
-        return True
-
-    def on_change_duration(self, cr, uid, id, date, duration):
-        if not date:
-            return {}
-        start_date = datetime.datetime.strptime(date, "%Y-%m-%d %H:%M:%S")
-        if duration >= 0 :
-            end = start_date + datetime.timedelta(hours=duration)
-        if duration < 0:
-            raise osv.except_osv(_('Warning !'),
-                    _('You can not set negative Duration.'))
-        res = {'value' : {'date_deadline' : end.strftime('%Y-%m-%d %H:%M:%S')}}
-        return res
-
-    def export_cal(self, cr, uid, ids, context={}):
-        crm_data = self.read(cr, uid, ids)
-        event_obj = self.pool.get('basic.calendar.event')
-        event_obj.__attribute__.update(self.__attribute__)
-
-        ical = event_obj.export_ical(cr, uid, crm_data, {'model': self._name})
-        cal_val = ical.serialize()
-        cal_val = cal_val.replace('"', '').strip()
-        return cal_val
-
-    def import_cal(self, cr, uid, data, context={}):
-        file_content = base64.decodestring(data)
-        event_obj = self.pool.get('basic.calendar.event')
-        event_obj.__attribute__.update(self.__attribute__)
-
-        vals = event_obj.import_ical(cr, uid, file_content)
-        ids = []
-        for val in vals:
-            is_exists = common.uid2openobjectid(cr, val['id'], self._name)
-            if val.has_key('create_date'): val.pop('create_date')
-            val['caldav_url'] = context.get('url') or ''
-            val.pop('id')
-            if is_exists:
-                self.write(cr, uid, [is_exists], val)
-                ids.append(is_exists)
-            else:
-                case_id = self.create(cr, uid, val)
-                ids.append(case_id)
-        return ids
-
-    def get_recurrent_ids(self, cr, uid, ids, base_start_date, base_until_date, limit=100):
-        if not limit:
-            limit = 100
-        if ids and (base_start_date or base_until_date):
-            cr.execute("select m.id, m.rrule, c.date, m.exdate from crm_meeting m\
-                         join crm_case c on (c.id=m.inherit_case_id) \
-                         where m.id in ("+ ','.join(map(lambda x: str(x), ids))+")")
-            result = []
-            count = 0
-            for data in cr.dictfetchall():
-                start_date = base_start_date and datetime.datetime.strptime(base_start_date, "%Y-%m-%d") or False
-                until_date = base_until_date and datetime.datetime.strptime(base_until_date, "%Y-%m-%d") or False
-                if count > limit:
-                    break
-                event_date = datetime.datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
-                if start_date and start_date <= event_date:
-                    start_date = event_date
-                if not data['rrule']:
-                    if start_date and event_date < start_date:
-                        continue
-                    if until_date and event_date > until_date:
-                        continue
-                    idval = common.real_id2caldav_id(data['id'], data['date'])
-                    result.append(idval)
-                    count += 1
-                else:
-                    exdate = data['exdate'] and data['exdate'].split(',') or []
-                    event_obj = self.pool.get('basic.calendar.event')
-                    rrule_str = data['rrule']
-                    new_rrule_str = []
-                    rrule_until_date = False
-                    is_until = False
-                    for rule in rrule_str.split(';'):
-                        name, value = rule.split('=')
-                        if name == "UNTIL":
-                            is_until = True
-                            value = parser.parse(value)
-                            rrule_until_date = parser.parse(value.strftime("%Y-%m-%d"))
-                            if until_date and until_date >= rrule_until_date:
-                                until_date = rrule_until_date
-                            if until_date:
-                                value = until_date.strftime("%Y%m%d%H%M%S")
-                        new_rule = '%s=%s' % (name, value)
-                        new_rrule_str.append(new_rule)
-                    if not is_until and until_date:
-                        value = until_date.strftime("%Y%m%d%H%M%S")
-                        name = "UNTIL"
-                        new_rule = '%s=%s' % (name, value)
-                        new_rrule_str.append(new_rule)
-                    new_rrule_str = ';'.join(new_rrule_str)
-                    start_date = datetime.datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
-                    rdates = event_obj.get_recurrent_dates(str(new_rrule_str), exdate, start_date)
-                    for rdate in rdates:
-                        r_date = datetime.datetime.strptime(rdate, "%Y-%m-%d %H:%M:%S")
-                        if start_date and r_date < start_date:
-                            continue
-                        if until_date and r_date > until_date:
-                            continue
-                        idval = common.real_id2caldav_id(data['id'], rdate)
-                        result.append(idval)
-                        count += 1
-            ids = result
-        return ids
-
-    def search(self, cr, uid, args, offset=0, limit=100, order=None,
-            context=None, count=False):
-        args_without_date = []
-        start_date = False
-        until_date = False
-        for arg in args:
-            if arg[0] not in ('date', unicode('date')):
-                args_without_date.append(arg)
-            else:
-                if arg[1] in ('>', '>='):
-                    start_date = arg[2]
-                elif arg[1] in ('<', '<='):
-                    until_date = arg[2]
-        res = super(crm_meeting, self).search(cr, uid, args_without_date, offset,
-                limit, order, context, count)
-        if not isinstance(res,list):
-            res= [res]
-        return self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit)
-
-
-    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        new_ids = []
-        for id in select:
-            id = common.caldav_id2real_id(id)
-            if not id in new_ids:
-                new_ids.append(id)
-        if 'case_id' in vals:
-            vals['case_id'] = common.caldav_id2real_id(vals['case_id'])
-        res = super(crm_meeting, self).write(cr, uid, new_ids, vals, context=context)
-        self.do_alarm_create(cr, uid, new_ids)
-        return res
-
-    def browse(self, cr, uid, ids, context=None, list_class=None, fields_process={}):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        select = map(lambda x: common.caldav_id2real_id(x), select)
-        res = super(crm_meeting, self).browse(cr, uid, select, context, list_class, fields_process)
-        if isinstance(ids, (str, int, long)):
-            return res and res[0] or False
-        return res
-
-    def read(self, cr, uid, ids, fields=None, context={}, load='_classic_read'):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        select = map(lambda x: (x, common.caldav_id2real_id(x)), select)
-        result = []
-        if fields and 'date' not in fields:
-            fields.append('date')
-        for caldav_id, real_id in select:
-            res = super(crm_meeting, self).read(cr, uid, real_id, fields=fields, context=context, \
-                                              load=load)
-            ls = common.caldav_id2real_id(caldav_id, with_date=True)
-            if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
-                res['date'] = ls[1]
-            res['id'] = caldav_id
-
-            result.append(res)
-        if isinstance(ids, (str, int, long)):
-            return result and result[0] or False
-        return result
-
-    def copy(self, cr, uid, id, default=None, context={}):
-        res = super(crm_meeting, self).copy(cr, uid, common.caldav_id2real_id(id), \
-                                                          default, context)
-        self.do_alarm_create(cr, uid, [res])
-        return res
-
-    def unlink(self, cr, uid, ids, context=None):
-        res = False
-        for id in ids:
-            ls = common.caldav_id2real_id(id)
-            if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
-                date_new = ls[1]
-                for record in self.read(cr, uid, [common.caldav_id2real_id(id)], \
-                                            ['date', 'rrule', 'exdate']):
-                    if record['rrule']:
-                        exdate = (record['exdate'] and (record['exdate'] + ',')  or '') + \
-                                    ''.join((re.compile('\d')).findall(date_new)) + 'Z'
-                        if record['date'] == date_new:
-                            res = self.write(cr, uid, [common.caldav_id2real_id(id)], {'exdate': exdate})
-                    else:
-                        ids = map(lambda x: common.caldav_id2real_id(x), ids)
-                        res = super(crm_meeting, self).unlink(cr, uid, common.caldav_id2real_id(ids))
-                        self.do_alarm_unlink(cr, uid, ids)
-            else:
-                res = super(crm_meeting, self).unlink(cr, uid, ids)
-                self.do_alarm_unlink(cr, uid, ids)
-        return res
-
-    def create(self, cr, uid, vals, context={}):
-        if 'case_id' in vals:
-            vals['case_id'] = common.caldav_id2real_id(vals['case_id'])
-        res = super(crm_meeting, self).create(cr, uid, vals, context)
-        self.do_alarm_create(cr, uid, [res])
-        return res
-
-
-    def _map_ids(self, method, cr, uid, ids, *args, **argv):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        case_data = self.browse(cr, uid, select)
-        new_ids = []
-        for case in case_data:
-            if case.inherit_case_id:
-                new_ids.append(case.inherit_case_id.id)
-        res = getattr(self.pool.get('crm.case'), method)(cr, uid, new_ids, *args, **argv)
-        if isinstance(ids, (str, int, long)) and isinstance(res, list):
-            return res and res[0] or False
-        return res
-
-    def onchange_rrule_type(self, cr, uid, ids, type, *args, **argv):
-        if type == 'none':
-            return {'value': {'rrule': ''}}
-        if type == 'custom':
-            return {}
-        rrule = self.pool.get('caldav.set.rrule')
-        rrulestr = rrule.compute_rule_string(cr, uid, {'freq': type.upper(),\
-                 'interval': 1})
-        return {'value': {'rrule': rrulestr}}
-
-
-    def onchange_case_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_case_id', cr, uid, ids, *args, **argv)
-    def onchange_partner_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_id', cr, uid, ids, *args, **argv)
-    def onchange_partner_address_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_address_id', cr, uid, ids, *args, **argv)
-    def onchange_categ_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_categ_id', cr, uid, ids, *args, **argv)
-    def case_close(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('case_close', cr, uid, ids, *args, **argv)
-    def case_open(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('case_open', cr, uid, ids, *args, **argv)
-    def case_cancel(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('case_cancel', cr, uid, ids, *args, **argv)
-    def case_reset(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('case_reset', cr, uid, ids, *args, **argv)
-
-    def msg_new(self, cr, uid, msg):
-        mailgate_obj = self.pool.get('mail.gateway')
-        msg_body = mailgate_obj.msg_body_get(msg)
-        data = {
-            'name': msg['Subject'],
-            'email_from': msg['From'],
-            'email_cc': msg['Cc'],
-            'user_id': False,
-            'description': msg_body['body'],
-            'history_line': [(0, 0, {'description': msg_body['body'], 'email': msg['From'] })],
-        }
-        res = mailgate_obj.partner_get(cr, uid, msg['From'])
-        if res:
-            data.update(res)
-        res = self.create(cr, uid, data)
-        return res
-
-    def msg_update(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_update', cr, uid, ids, *args, **argv)
-    def emails_get(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('emails_get', cr, uid, ids, *args, **argv)
-    def msg_send(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_send', cr, uid, ids, *args, **argv)
-
 crm_meeting()
 
-
-class crm_meeting_generic_wizard(osv.osv_memory):
-    _name = 'crm.meeting.generic_wizard'
-
-    _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Section', required=False),
-        'user_id': fields.many2one('res.users', 'Responsible'),
-    }
-
-    def _get_default_section(self, cr, uid, context):
-        case_id = context.get('active_id', False)
-        if not case_id:
-            return False
-        case_obj = self.pool.get('crm.meeting')
-        case = case_obj.read(cr, uid, case_id, ['state', 'section_id'])
-        if case['state'] in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        return case['section_id']
-
-
-    _defaults = {
-        'section_id': _get_default_section
-    }
-    def action_create(self, cr, uid, ids, context=None):
-        case_obj = self.pool.get('crm.meeting')
-        case_id = context.get('active_id', [])
-        res = self.read(cr, uid, ids)[0]
-        case = case_obj.browse(cr, uid, case_id)
-        if case.state in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        new_case_id = case_obj.copy(cr, uid, case_id, default=
-                                            {
-                                                'section_id': res.get('section_id', False),
-                                                'user_id': res.get('user_id', False),
-                                                'case_id': case.inherit_case_id.id
-                                            }, context=context)
-        case_obj.case_close(cr, uid, [case_id])
-        data_obj = self.pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-        search_view = data_obj.read(cr, uid, result, ['res_id'])
-        new_case = case_obj.read(cr, uid, new_case_id, ['id'])
-        value = {
-            'name': _('Meetings'),
-            'view_type': 'form',
-            'view_mode': 'calendar, tree, form',
-            'res_model': 'crm.meeting',
-            'type': 'ir.actions.act_window',
-            'search_view_id': search_view['res_id']
-        }
-        return value
-
-crm_meeting_generic_wizard()
-
-class res_users(osv.osv):
-    _inherit = 'res.users'
-    def _get_user_avail(self, cr, uid, ids, context=None):
-        current_datetime = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-        res = super(res_users, self)._get_user_avail(cr, uid, ids, context)
-        cr.execute("SELECT crm_case.user_id, 'busy' as status \
-                    FROM crm_meeting meeting, crm_case \
-                    WHERE meeting.inherit_case_id = crm_case.id \
-                    and crm_case.date <= %s and crm_case.date_deadline >= %s and crm_case.user_id = ANY(%s) and meeting.show_as = %s",
-                                (current_datetime, current_datetime , ids, 'busy'))
-        result = cr.dictfetchall()
-        for user_data in result:
-            user_id = user_data['user_id']
-            status = user_data['status']
-            res.update({user_id:status})
-        return res
-res_users()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index 127aa1710ad..e13346aed8a 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -1,68 +1,62 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+	<data noupdate="1">
 
-    <record model="crm.case.section" id="section_support1">
-        <field name="name">Meetings</field>
-        <field name="code">Mtngs</field>        
-    </record>
         <!--    CASE CATEGORY(categ_id)        -->
 
-    <record model="crm.case.categ" id="categ_meet1">
-        <field name="name">Customer Meeting</field>
-        <field name="section_id" ref="section_support1"/>
-    </record>
-    <record model="crm.case.categ" id="categ_meet2">
-        <field name="name">Internal Meeting</field>
-        <field name="section_id" ref="section_support1"/>
-    </record>
-    <record model="crm.case.categ" id="categ_meet3">
-        <field name="name">Phone Call</field>
-        <field name="section_id" ref="section_support1"/>
-    </record>
+	    <record model="crm.case.categ" id="categ_meet1">
+	        <field name="name">Customer Meeting</field>
+	        <field name="section_id" ref="section_sales_department"/>
+			<field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
+	    </record>
 
-        <!--    CASE CATEGORY2(category2_id)    -->
+	    <record model="crm.case.categ" id="categ_meet2">
+	        <field name="name">Internal Meeting</field>
+	        <field name="section_id" ref="section_sales_department"/>
+			<field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
+	    </record>
 
-    <record model="crm.case.category2" id="category_meet1">
-        <field name="name">Office</field>
-        <field name="section_id" ref="section_support1"/>
-    </record>
-    <record model="crm.case.category2" id="category_meet2">
-        <field name="name">Home</field>
-        <field name="section_id" ref="section_support1"/>
-    </record>
-    <record model="crm.case.category2" id="category_meet3">
-        <field name="name">Customer Office</field>
-        <field name="section_id" ref="section_support1"/>
-    </record>
+	    <record model="crm.case.categ" id="categ_meet3">
+	        <field name="name">Phone Call</field>
+	        <field name="section_id" ref="section_sales_department"/>
+	        <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
+	    </record>
 
-         <!--    CASE STAGE(stage_id)    -->
+	    <record model="res.request.link" id="request_link_meeting">
+	        <field name="name">Case Meeting</field>
+	        <field name="object">crm.meeting</field>
+	    </record>
 
-    <record model="crm.case.stage" id="stage_meet1">
-        <field name="name">Fixed</field>
-        <field name="section_id" ref="section_support1"/>
-    </record>
-    <record model="crm.case.stage" id="stage_meet2">
-        <field name="name">Not fixed</field>
-        <field name="section_id" ref="section_support1"/>
-    </record>
-    <record model="crm.case.stage" id="stage_meet3">
-        <field name="name">Invalid</field>
-        <field name="section_id" ref="section_support1"/>
-    </record>
-    <record model="crm.case.stage" id="stage_meet4">
-        <field name="name">Awaiting Response</field>
-        <field name="section_id" ref="section_support1"/>
-    </record>
-    <record model="crm.case.stage" id="stage_meet5">
-        <field name="name">Future</field>
-        <field name="section_id" ref="section_support1"/>
-    </record>   
+		<record model="basic.calendar.lines" id="caldav.calendar_lines_event">
+			<field name="name">vevent</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','crm.meeting')]" />
+		</record>
+		
 
-    <record model="res.request.link" id="request_link_meeting">
-        <field name="name">Case Meeting</field>
-        <field name="object">crm.meeting</field>
-    </record>
+<!--		Event Attribute mapping-->
 
-</data>
+		<record model="basic.calendar.fields" id="caldav.map_event_4">
+			<field name="name" ref="base_calendar.field_event_attendee" />
+			<field name="type_id" ref="caldav.calendar_lines_event" />
+			<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','crm.meeting')]" />
+			<field name="fn">field</field>
+		</record>
+
+
+		<record model="basic.calendar.fields" id="caldav.map_event_8">
+			<field name="name" ref="base_calendar.field_event_priority"/>
+		    <field name="type_id" ref="caldav.calendar_lines_event" />
+			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','crm.meeting')]" />
+		    <field name="fn">field</field>
+		</record>
+		
+		<record model="basic.calendar.fields" id="caldav.map_event_11">
+			<field name="name" ref="base_calendar.field_event_status"/>
+		    <field name="type_id" ref="caldav.calendar_lines_event" />
+			<field name="field_id" search="[('name','=','state'),('model_id.model','=','crm.meeting')]" />
+		    <field name="fn">field</field>
+		</record>
+
+	</data>
 </openerp>
diff --git a/addons/crm/crm_meeting_demo.xml b/addons/crm/crm_meeting_demo.xml
index b572f749f2e..4eefc6c1042 100644
--- a/addons/crm/crm_meeting_demo.xml
+++ b/addons/crm/crm_meeting_demo.xml
@@ -14,10 +14,9 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support1"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
 			<field name="categ_id" ref="crm.categ_meet2"/>
-			<field name="stage_id" ref="crm.stage_meet2"/>
 			<field eval="&quot;Follow-up on proposal&quot;" name="name"/>
 			<field eval="time.strftime('%Y-%m-10')" name="date_deadline"/>
 			<field eval="6.3" name="duration"/>
@@ -26,16 +25,14 @@
 		<record id="crm_case_initialdiscussion0" model="crm.meeting">
 			<field name="partner_address_id" ref="base.res_partner_address_2"/>
 			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm.category_meet1"/>
 			<field eval="7.0" name="duration"/>
 			<field name="partner_id" ref="base.res_partner_10"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;draft&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support1"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/>
 			<field name="categ_id" ref="crm.categ_meet3"/>
-			<field name="stage_id" ref="crm.stage_meet4"/>
 			<field eval="&quot;Initial discussion&quot;" name="name"/>
 			<field eval="time.strftime('%Y-%m-12')" name="date_deadline"/>
 			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
@@ -44,17 +41,15 @@
 		<record id="crm_case_discusspricing0" model="crm.meeting">
 			<field name="partner_address_id" ref="base.res_partner_address_zen"/>
 			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm.category_meet3"/>
 			<field eval="3.0" name="duration"/>
 			<field name="partner_id" ref="base.res_partner_3"/>
 			<field eval="&quot;1&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
 			<field eval="&quot;done&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support1"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
 			<field name="categ_id" ref="crm.categ_meet1"/>
-			<field name="stage_id" ref="crm.stage_meet1"/>
 			<field eval="&quot;Discuss pricing&quot;" name="name"/>
 			<field eval="time.strftime('%Y-%m-20')" name="date_deadline"/>
 		</record>
@@ -62,16 +57,14 @@
 		<record id="crm_case_reviewneeds0" model="crm.meeting">
 			<field name="partner_address_id" ref="base.res_partner_address_15"/>
 			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm.category_meet2"/>
 			<field eval="6.0" name="duration"/>
 			<field name="partner_id" ref="base.res_partner_11"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_demo"/>
 			<field eval="&quot;draft&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support1"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
 			<field name="categ_id" ref="crm.categ_meet3"/>
-			<field name="stage_id" ref="crm.stage_meet5"/>
 			<field eval="&quot;Review needs&quot;" name="name"/>
 			<field eval="time.strftime('%Y-%m-25')" name="date_deadline"/>
 		</record>
@@ -79,16 +72,14 @@
 		<record id="crm_case_changesindesigning0" model="crm.meeting">
 			<field name="partner_address_id" ref="base.res_partner_address_1"/>
 			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm.category_meet1"/>
 			<field eval="05" name="duration"/>
 			<field name="partner_id" ref="base.res_partner_9"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_demo"/>
 			<field eval="&quot;pending&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support1"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/>
 			<field name="categ_id" ref="crm.categ_meet2"/>
-			<field name="stage_id" ref="crm.stage_meet2"/>
 			<field eval="&quot;Changes in Designing&quot;" name="name"/>
 			<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
 			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
@@ -97,15 +88,13 @@
 		<record id="crm_case_updatethedata0" model="crm.meeting">
 			<field name="partner_address_id" ref="base.res_partner_address_7"/>
 			<field eval="1" name="active"/>
-			<field name="category2_id" ref="crm.category_meet2"/>
 			<field name="partner_id" ref="base.res_partner_4"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;done&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support1"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/>
 			<field name="categ_id" ref="crm.categ_meet2"/>
-			<field name="stage_id" ref="crm.stage_meet1"/>
 			<field eval="&quot;Update the data&quot;" name="name"/>
 			<field eval="13.3" name="duration"/>
 			<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 794d4fc8b1d..678bc72a27d 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -12,7 +12,7 @@
     />
 
 
-    <record model="ir.actions.act_window" id="crm_case_categ_meet_create_partner">        
+    <record model="ir.actions.act_window" id="crm_case_categ_meet_create_partner">
         <field name="context" eval="{'default_state':'open'}"/>
     </record>
 
@@ -42,18 +42,24 @@
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
 
-    <act_window
+<!--	Available alarms-->
+
+	<menuitem name="Available alarms" id="menu_crm_meeting_avail_alarm"
+		action="caldav.action_res_alarm_view"
+		parent="menu_crm_configuration" />
+		
+	<act_window
         id="crm_case_categ_meet_case"
         name="Schedule a Meeting"
         res_model="crm.meeting"
         src_model="crm.case"
         view_mode="calendar,tree,form,gantt"
         context="{'default_case_id': active_id, 'default_duration': 4.0}"
-        />	
+        />
 
-    <record model="ir.actions.act_window" id="crm_case_categ_meet_case">        
+    <record model="ir.actions.act_window" id="crm_case_categ_meet_case">
         <field name="context" eval="{'default_state':'open'}"/>
-    </record>    
+    </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_case">
         <field name="sequence" eval="1"/>
@@ -85,7 +91,7 @@
         <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
         <field name="context" eval="{'default_state':'open'}"/>
-        <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
+        <field name="search_view_id" ref="view_crm_case_meetings_filter"/>        
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
         <field name="sequence" eval="1"/>
@@ -98,7 +104,7 @@
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_tree_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet"/>
-    </record>    
+    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_form__meet">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
@@ -111,16 +117,13 @@
         <field name="view_id" ref="crm_case_gantt_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet"/>
     </record>
-    <menuitem parent="crm.menu_crm" name="Calendar" id="menu_crm_case_category_act_meetings"/>
-	
-	<menuitem parent="crm.menu_crm_case_category_act_meetings"
-	 	name="My Invitations" id="menu_crm_meetings_invitation"
-	 			action="caldav.action_view_attendee_form" />
+<!--    <menuitem parent="crm.menu_crm" name="Calendar" id="menu_crm_case_category_act_meetings"/>-->
 
-    <!-- 
-        ALL MEETINGS 
+    <!--
+        ALL MEETINGS
     -->
-    <menuitem name="All Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_crm_case_category_act_meetings"/>
+    <menuitem name="Meetings" id="menu_meeting_sale" parent="base.menu_base_partner" sequence="3"/>
+    <menuitem name="Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_meeting_sale" sequence="1"/>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
         <field name="name">Next Meetings</field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 4ecc55b444e..58a6fa4246a 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -1,106 +1,110 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+	# ------------------------------------------------------
+    # Meetings Categories
+    # ------------------------------------------------------
+
+    <record id="crm_meeting_categ_action" model="ir.actions.act_window">
+        <field name="name">Meeting 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.meeting')]</field>
+		<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"/>    
+
     # ------------------------------------------------------
     # Meetings
     # ------------------------------------------------------
 
-    <record model="ir.ui.view" id="crm_meeting_generic_wizard">
-        <field name="name">crm.meeting.generic_wizard.form</field>
-        <field name="model">crm.meeting.generic_wizard</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Generic Wizard">
-                <group col="2">            	
-                    <field name="section_id" select="1" widget="selection"/>
-                    <field name="user_id"/>
-                </group>
-                <newline/>                    
-                <separator colspan="4"/>                             
-                <group col="2" colspan="2">
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="gtk-execute" name="action_create" string="Assign" type="object"/>
-                </group>
-            </form>
-        </field>
-    </record>
-    <record id="crm_meeting_generic_wizard_act" model="ir.actions.act_window">
-        <field name="name">Meeting Generic Wizard</field>
-        <field name="res_model">crm.meeting.generic_wizard</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm_meeting_generic_wizard"/>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>	
-        
     <record model="ir.ui.view" id="crm_case_form_view_meet">
         <field name="name">CRM - Meetings Form</field>
         <field name="model">crm.meeting</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Meetings Form">
-                <field name="name" select="1" string="Title"/>
-                <group col="3" colspan="2">
-                    <field name="section_id" widget="selection"
-                    	string="Calendar"/>
-                    <button string="Invite Attendees"
-                				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
-                				icon="terp-partner" type="action"
-                				context="{'model' : 'crm.meeting'}" /> 
-                </group>
-                <field name="location" />
-                <field name="categ_id" select="2" on_change="onchange_categ_id(categ_id)"/>                
-                <field name="date" string="Start Date" required="1"/>                    
-                <field name="date_deadline" string="End Date" required="1"/>
-                <notebook colspan="4">
-	                <page string="Meeting">                                              
-                        <field name="alarm_id" colspan="1" string="Alarm"/>
-                        <group colspan="2" col="3">
+            	<group col="4" colspan="6">
+            		<field name="name" select="1" string="Summary"
+            			colspan="3" />
+            		<field name="section_id" widget="selection"
+            			colspan="1" />
+            	</group>
+            	<group col="6" colspan="6">
+            		<field name="date" string="Start Date" required="1" />
+            		<field name="duration" widget="float_time" />
+            		<field name="date_deadline" string="End Date" required="1" />
+            		<field name="location" />
+            		<field name="categ_id"/>
+            		<group colspan="2" col="3" attrs="{'readonly':[('recurrent_uid','!=',False)]}">
                             <field name="rrule_type" string="Recurrency"
                             	on_change="onchange_rrule_type(rrule_type)"
                             	colspan="1" />
                             <button string="Custom"
-            					name="%(caldav.action_view_caldav_set_rrule_wizard)d"
+            					name="%(caldav.action_calendar_custom_rrule_wizard)d"
             					icon="gtk-save-as" type="action" context="{'model' : 'crm.meeting'}" 
-                                attrs="{'readonly':[('rrule_type','!=','custom')]}"
+                                attrs="{'readonly': [('rrule_type','!=','custom')]}"
                                 />
                         </group>
-                        <separator string="Description" colspan="4"/>
-	                    <field name="description" nolabel="1" colspan="4"/>
-                        <field name="show_as" string="Show as"/> 
-                        <field name="class" string="Mark as"/> 
-                        <separator string="" colspan="4"/>                       	                                   
-	                    <group col="8" colspan="4">
-	                        <field name="state" select="2"/>
-	                        <button name="case_open" string="Confirm Meeting" states="draft,cancel,pending" type="object" icon="terp-crm"/>
-	                        <button name="case_cancel" string="Cancel Meeting" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-	                        <button name="case_reset" string="Reset to Unconfirmed" states="done,open,cancel" type="object" icon="gtk-convert"/>
-	                    </group>
-	                </page>                    
-
-                    <page string="Partner Info">
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
-	                    <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
-	                    <field name="email_from"/>	                    
-                    </page>
-                    <page string="Other Info">
-                        <field name="user_id" select="2" string="Responsible" required="1"/>
-                        <group colspan="2">
-                            <field name="case_id" on_change="onchange_case_id(case_id, name, partner_id)"/>
-                            <button string="Assign" name="%(crm_meeting_generic_wizard_act)d"  type="action" />
-                        </group>
-                        <separator string="Attendees" colspan="4"/>
-	                    <field name="attendees" nolabel="1" colspan="4"/>   
-                        <field name="rrule" string="Recurrent Rules" colspan="4"/>
-        			    <field name="exrule" string="Exception Rules" colspan="4"/>   
-                        <separator string="Exception Dates" colspan="4"/>     					
-    					<field name="exdate" nolabel="1" colspan="4" />  
-                                  		    
+            	</group>
+            	<notebook colspan="4">
+            		<page string="Description">
+            			<separator string="Description" colspan="4" />
+            			<field name="description" nolabel="1" colspan="4" />
             		</page>
-                </notebook>
+            		<page string="Attendee Detail">
+            			<button string="Invite People"
+            				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
+            				icon="terp-partner" type="action"
+            				context="{'model' : 'crm.meeting'}" colspan="2"/>
+            			<field name="attendee_ids" colspan="4"
+            				nolabel="1" widget="one2many" mode="tree,form">
+            				<tree string="Atendee details" editable="top">
+            					<field name="email" />
+            					<field name="role" select="1" />
+            					<field name="state" />
+            				</tree>
+            				<form string="Atendee details">
+            					<notebook colspan="4">
+            						<page string="Details">
+            							<field name="email" />
+            							<field name="rsvp" select="1" />
+            							<field name="cutype" select="1" />
+            							<field name="role" select="1" />
+            							<separator colspan="4" string="" />
+            							<field name="state" />
+            						</page>
+            						<page string="Other">
+            							<field name="user_id"/>
+            							<field name="partner_address_id" select="1" />
+            							<newline />
+            						</page>
+            					</notebook>
+            				</form>
+            			</field>
+            		</page>
+            		<page string="Other Information">
+            			<field name="priority"/>
+            			<field name="show_as"/>
+            			<field name="alarm_id" string="Reminder" widget="selection" />            			
+            			<field name="class"/>
+            			<field name="user_id"/>
+            			<field name="recurrent_id" invisible="1" />
+            			<field name="recurrent_uid" invisible="1" />
+            			<field name="rrule" invisible="1" />
+            		</page>
+            	</notebook>
+            	<group col="3" colspan="4" attrs="{'invisible':[('rrule_type','in', ('none', False))]}">
+            		<label string="" />
+            		<button string="Modify this Occurrence"
+            			name="%(base_calendar.wizard_edit_this_event)d" icon="gtk-save"
+            			type="action" context="{'model' : 'crm.meeting', 'date': date, 'date_deadline': date_deadline}" />
+            	</group>
             </form>
         </field>
     </record>
+
     <record model="ir.ui.view" id="crm_case_tree_view_meet">
         <field name="name">CRM - Meetings Tree</field>
         <field name="model">crm.meeting</field>
@@ -113,7 +117,6 @@
                 <field name="section_id" widget="selection"/>
                 <field name="priority"/>
                 <field name="categ_id"/>
-                <field name="category2_id" string="Type"/>
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_open" string="Confirm Meeting" states="draft,cancel,pending" type="object" icon="terp-crm"/>
@@ -155,17 +158,20 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             	<search string="Search Meetings">
-               		<group col="10" colspan="4">
+               		<group col="12" colspan="4">
                			<filter icon="terp-crm" string="My Meetings" domain="[('user_id','=',uid)]" help="My Meetings"/>
 	               		<filter icon="terp-crm" string="Draft" domain="[('state','=','draft')]" help="Draft Meetings"/>
 	                    <filter icon="terp-crm" string="Confirmed" domain="[('state','=','done')]" help="Confirmed Meetings"/>
 	               		<separator orientation="vertical"/>
 	               		<field name="name" select="1" string="Subject"/>
 	               		<field name="partner_id" select="1"/>
-	               		<field name="user_id" select="1" widget="selection">
-                        	<filter icon="terp-crm" domain="[('user_id','=',uid)]" help="My Meetings"/>
-                        	<filter icon="terp-crm" domain="[('user_id','child_of',[uid])]" help="My Departments Meetings"/>
-                        </field>
+	               		<field name="section_id" select="1" widget="selection">
+							<filter icon="terp-crm"
+                               domain="[('section_id','=',context.get('section_id',False))]"
+                               help="My section"
+                           />	
+						 </field>   
+	               		<field name="user_id" select="1" widget="selection"/>
 	               	</group>
                 </search>
         	</field>
diff --git a/addons/crm/crm_meeting_wizard.xml b/addons/crm/crm_meeting_wizard.xml
index 0be9650a456..4f6f2e9b0a9 100644
--- a/addons/crm/crm_meeting_wizard.xml
+++ b/addons/crm/crm_meeting_wizard.xml
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data>
-		<wizard string="Import ICS File" model="crm.meeting"
-			name="caldav.crm.import" id="wizard_crm_cal_import" multi="True"
-		/>
-		
-		<wizard string="Subscribe to a Remote calendar" model="crm.meeting"
-			name="caldav.crm.subscribe" id="wizard_crm_cal_subscribe" multi="True"
-		/>
-		
-		<wizard string="Export ICS File" model="crm.meeting" name="caldav.crm.export"
-			id="wizard_crm_cal_export" multi="True"
-		/>
-		
-		<wizard string="Set RRULE" model="crm.meeting"
-			name="caldav.set.rrule" id="wizard_crm_set_rrule" menu="False"
-		/>
+		<wizard string="Import .ics File" model="crm.meeting"
+			name="calendar.event.import" id="base_calendar.wizard_cal_event_import" multi="True" />
+
+		<wizard string="Subscribe to a Remote calendar"
+			model="crm.meeting" name="calendar.event.subscribe"
+			id="base_calendar.wizard_cal_event_subscribe" multi="True" />
+
+		<wizard string="Export .ics File" model="crm.meeting"
+			name="calendar.event.export" id="base_calendar.wizard_cal_event_export" multi="True" />
+
+		<wizard string="Edit this event" model="crm.meeting"
+			name="calendar.event.edit.this" id="base_calendar.wizard_edit_this_event"
+			menu="False" />
 	</data>
 </openerp>
diff --git a/addons/crm/crm_operators.py b/addons/crm/crm_operators.py
index db7a4f6a0a8..ac918de7c00 100644
--- a/addons/crm/crm_operators.py
+++ b/addons/crm/crm_operators.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index fbcd8efd92a..35a85cad6ee 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -32,129 +32,37 @@ import tools
 from osv import fields,osv,orm
 from osv.orm import except_orm
 
+import crm
+
 
 class crm_opportunity(osv.osv):
     _name = "crm.opportunity"
     _description = "Opportunity Cases"
     _order = "id desc"
-    _inherits = {'crm.case':"inherit_case_id"}  
+    _inherit = 'crm.case'  
     _columns = {        
-        'inherit_case_id': fields.many2one('crm.case','Case',ondelete='cascade'),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
+        'type_id': fields.many2one('crm.case.resource.type', 'Resource Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'probability': fields.float('Probability (%)'),
+        'planned_revenue': fields.float('Planned Revenue'),
+        'planned_cost': fields.float('Planned Costs'),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                   "the partner mentality in relation to our services.The scale has" \
+                                                                   "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
+        'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
+        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),
     }
-    def _map_ids(self, method, cr, uid, ids, *args, **argv):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids            
-        case_data = self.browse(cr, uid, select)
-        new_ids = []
-        for case in case_data:
-            if case.inherit_case_id:
-                new_ids.append(case.inherit_case_id.id)
-        res = getattr(self.pool.get('crm.case'),method)(cr, uid, new_ids, *args, **argv)
-        if isinstance(ids, (str, int, long)) and isinstance(res, list):
-            return res and res[0] or False
-        return res
+    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
+        if not categ:
+            return {'value':{}}
+        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
+        return {'value':{'probability':cat}}        
 
-
-    def onchange_case_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_case_id',cr,uid,ids,*args,**argv)
-    def stage_next(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('stage_next',cr,uid,ids,*args,**argv)
-    def onchange_partner_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_id',cr,uid,ids,*args,**argv)
-    def onchange_partner_address_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_address_id',cr,uid,ids,*args,**argv)
-    def onchange_categ_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_categ_id',cr,uid,ids,*args,**argv)
-    def case_close(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_close',cr,uid,ids,*args,**argv)    
-    def case_open(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_open',cr,uid,ids,*args,**argv)
-    def case_cancel(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_cancel',cr,uid,ids,*args,**argv)
-    def case_reset(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_reset',cr,uid,ids,*args,**argv)    
-    def case_escalate(self,cr, uid, ids, *args, **argv):    
-        return self._map_ids('case_escalate',cr,uid,ids,*args,**argv)    
-    def case_pending(self,cr, uid, ids, *args, **argv):    
-        return self._map_ids('case_pending',cr,uid,ids,*args,**argv)
-
-    def msg_new(self, cr, uid, msg):        
-        mailgate_obj = self.pool.get('mail.gateway')
-        msg_body = mailgate_obj.msg_body_get(msg)
-        data = {
-            'name': msg['Subject'],            
-            'email_from': msg['From'],
-            'email_cc': msg['Cc'],            
-            'user_id': False,
-            'description': msg_body['body'],
-            'history_line': [(0, 0, {'description': msg_body['body'], 'email': msg['From'] })],
-        }
-        res = mailgate_obj.partner_get(cr, uid, msg['From'])
-        if res:
-            data.update(res)
-        res = self.create(cr, uid, data)        
-        return res
-
-    def msg_update(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_update',cr, uid, ids, *args, **argv)
-    def emails_get(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('emails_get',cr, uid, ids, *args, **argv)
-    def msg_send(self, cr, uid, ids, *args, **argv):        
-        return self._map_ids('msg_send',cr, uid, ids, *args, **argv) 
 crm_opportunity()
 
-
-class crm_opportunity_assign_wizard(osv.osv_memory):
-    _name = 'crm.opportunity.assign_wizard'
-
-    _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Section'),
-        'user_id': fields.many2one('res.users', 'Responsible'),
-    }
-
-    def _get_default_section(self, cr, uid, context):
-        case_id = context.get('active_id',False)
-        if not case_id:
-            return False
-        case_obj = self.pool.get('crm.opportunity')
-        case = case_obj.read(cr, uid, case_id, ['state','section_id'])
-        if case['state'] in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        return case['section_id']
-
-
-    _defaults = {
-        'section_id': _get_default_section
-    }
-    def action_create(self, cr, uid, ids, context=None):
-        case_obj = self.pool.get('crm.opportunity')
-        case_id = context.get('active_id',[])
-        res = self.read(cr, uid, ids)[0]
-        case = case_obj.browse(cr, uid, case_id)
-        if case.state in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        new_case_id = case_obj.copy(cr, uid, case_id, default=
-                                            {
-                                                'section_id':res.get('section_id',False),
-                                                'user_id':res.get('user_id',False),
-                                                'case_id' : case.inherit_case_id.id
-                                            }, context=context)            
-        case_obj.case_close(cr, uid, [case_id])
-
-        data_obj = self.pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-        search_view = data_obj.read(cr, uid, result, ['res_id'])
-        value = {            
-            'name': _('Opportunity'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.opportunity',
-            'res_id': int(new_case_id),            
-            'type': 'ir.actions.act_window', 
-            'search_view_id': search_view['res_id']            
-        }
-        return value
-
-crm_opportunity_assign_wizard()
diff --git a/addons/crm/crm_opportunity_data.xml b/addons/crm/crm_opportunity_data.xml
index 44c45e0cc16..b3780990a13 100644
--- a/addons/crm/crm_opportunity_data.xml
+++ b/addons/crm/crm_opportunity_data.xml
@@ -1,82 +1,94 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    <record model="crm.case.section" id="section_support3">
-        <field name="name">Opportunities</field>
-        <field name="code">oppor</field>
-    </record>
-
     <record model="crm.case.categ" id="categ_oppor1">
         <field name="name">Existing Customer</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+      	<field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>              
     </record>
     <record model="crm.case.categ" id="categ_oppor2">
         <field name="name">Self Generated</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>                      
     </record>    
     <record model="crm.case.categ" id="categ_oppor3">
         <field name="name">Employee</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>                      
     </record>
     <record model="crm.case.categ" id="categ_oppor4">
         <field name="name">Partner</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>              
     </record>
     <record model="crm.case.categ" id="categ_oppor5">
         <field name="name">Campaign</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>              
     </record>    
     <record model="crm.case.categ" id="categ_oppor6">
         <field name="name">Website</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>              
     </record>    
     <record model="crm.case.categ" id="categ_oppor7">
         <field name="name">Word of mouth</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>                      
     </record>    
     <record model="crm.case.categ" id="categ_oppor8">
         <field name="name">Other</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>                      
     </record>    
 
 <!--        CASE STATUS(stage_id)        -->
     <record model="crm.case.stage" id="stage_oppor1">
         <field name="name">Prospecting</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>            
     </record>
     <record model="crm.case.stage" id="stage_oppor2">
         <field name="name">Needs Analysis</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>    
     </record>
     <record model="crm.case.stage" id="stage_oppor3">
         <field name="name">Value Proposition</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>         
     </record>
     <record model="crm.case.stage" id="stage_oppor4">
         <field name="name">Proposal/Price Quote</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>         
     </record>
     <record model="crm.case.stage" id="stage_oppor5">
         <field name="name">Negotiation/Review</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>         
     </record>
     <record model="crm.case.stage" id="stage_oppor6">
         <field name="name">Closed Won</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>         
     </record>
     <record model="crm.case.stage" id="stage_oppor7">
         <field name="name">Closed Lost</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+         <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/> 
     </record>
 
-<!--        CASE CATEGORY2(category2_id)        -->
-    <record model="crm.case.category2" id="category_oppor1">
+<!--        Case Resource(type_id)        -->
+    <record model="crm.case.resource.type" id="type_oppor1">
         <field name="name">Existing Business</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/> 
     </record>    
-    <record model="crm.case.category2" id="category_oppor2">
+    <record model="crm.case.resource.type" id="type_oppor2">
         <field name="name">New Business</field>
-        <field name="section_id" ref="section_support3"/>
+        <field name="section_id" ref="section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>         
     </record>
 
 </data>
diff --git a/addons/crm/crm_opportunity_demo.xml b/addons/crm/crm_opportunity_demo.xml
index 3935296640f..08976720a0f 100644
--- a/addons/crm/crm_opportunity_demo.xml
+++ b/addons/crm/crm_opportunity_demo.xml
@@ -12,14 +12,14 @@
             <field name="partner_address_id" ref="base.res_partner_address_zen"/>
             <field eval="1" name="active"/>
             <field eval="17.0" name="duration"/>
-            <field name="category2_id" ref="crm.category_oppor1"/>
+            <field name="type_id" ref="crm.type_oppor1"/>
             <field name="partner_id" ref="base.res_partner_3"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="75000.0" name="planned_cost"/>
             <field eval="85000.0" name="planned_revenue"/>
-            <field name="section_id" ref="crm.section_support3"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-07 10:05:15')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_oppor3"/>
@@ -28,7 +28,7 @@
         <record id="crm_case_rdroundfundingunits0" model="crm.opportunity">
             <field name="partner_address_id" ref="base.res_partner_address_15"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="crm.category_oppor2"/>
+            <field name="type_id" ref="crm.type_oppor2"/>
             <field name="partner_id" ref="base.res_partner_11"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
@@ -37,7 +37,7 @@
             <field eval="45000.0" name="planned_revenue"/>
             <field eval="50" name="probability"/>
             <field eval="8.0" name="duration"/>
-            <field name="section_id" ref="crm.section_support3"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-05 12:25:15')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
             <field name="stage_id" ref="crm.stage_oppor1"/>
@@ -47,7 +47,7 @@
             <field eval="10" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_3"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="crm.category_oppor1"/>
+            <field name="type_id" ref="crm.type_oppor1"/>
             <field name="partner_id" ref="base.res_partner_8"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
@@ -56,7 +56,7 @@
             <field eval="55000.0" name="planned_revenue"/>
             <field eval="70" name="probability"/>
             <field eval="10.0" name="duration"/>
-            <field name="section_id" ref="crm.section_support3"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-14 13:55:10')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor7"/>
             <field name="stage_id" ref="crm.stage_oppor5"/>
@@ -67,7 +67,7 @@
             <field eval="40" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field eval="1" name="active"/>
-            <field name="category2_id" ref="crm.category_oppor1"/>
+            <field name="type_id" ref="crm.type_oppor1"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
@@ -75,7 +75,7 @@
             <field eval="50000.0" name="planned_cost"/>
             <field eval="45000.0" name="planned_revenue"/>
             <field eval="24.0" name="duration"/>
-            <field name="section_id" ref="crm.section_support3"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-23 16:32:23')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
             <field name="stage_id" ref="crm.stage_oppor4"/>
@@ -93,7 +93,7 @@
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="25000.0" name="planned_cost"/>
             <field eval="42000.0" name="planned_revenue"/>
-            <field name="section_id" ref="crm.section_support3"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-25 16:05:15')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor2"/>
             <field name="stage_id" ref="crm.stage_oppor6"/>
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 8f64a729107..2f49532ea6c 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    <menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>
+<!--    <menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>-->
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
           <field name="name">All Opportunities</field>
           <field name="res_model">crm.opportunity</field>
           <field name="view_mode">tree,form,graph</field>
-          <field name="view_id" ref="crm_case_tree_view_oppor"/>          
+          <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="context" eval="{'default_state':'open'}"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
      </record>
@@ -29,30 +29,30 @@
           <field name="view_id" ref="crm_case_graph_view_opportunity"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
      </record>
-     <menuitem name="Opportunities" id="menu_crm_case_opp" parent="menu_presale" action="crm_case_category_act_oppor11"/>
+     <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>   
+     <menuitem name="Opportunities" id="menu_crm_case_opp" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="2"/><!--
 
+          MENU
 
-<!--          MENU          -->
+          REPORTS
+     <record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">
+          <field name="res_model">report.crm.case.user</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">graph,tree</field>
+          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
+          <field name="context" eval="{'default_state':'open'}"/>
+     </record>
 
-<!--          REPORTS               -->
-<!--     <record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">-->
-<!--          <field name="res_model">report.crm.case.user</field>-->
-<!--          <field name="view_type">form</field>-->
-<!--          <field name="view_mode">graph,tree</field>-->
-<!--          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>-->
-<!--          <field name="context" eval="{'default_state':'open'}"/>-->
-<!--     </record>-->
-<!--     -->
 	<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>
-    
+
      <menuitem name="Opportunity" parent="next_id_64" id="menu_action_report_crm_case_oppor"/>
-  
-<!--     <menuitem name="Cases by Opportunities and User" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_user" id="menu_action_report_crm_case_oppor_user"/>-->
+
+     <menuitem name="Cases by Opportunities and User" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_user" id="menu_action_report_crm_case_oppor_user"/>
 
      <record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ">
           <field name="res_model">report.crm.case.section.categ2</field>
           <field name="view_type">form</field>
-          <field name="view_mode">graph,tree</field>          
+          <field name="view_mode">graph,tree</field>
           <field name="context" eval="{'default_state':'open'}"/>
      </record>
      <menuitem name="Cases by Opportunities and Type"  parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ" id="menu_action_report_crm_case_oppor_categ"/>
@@ -60,7 +60,7 @@
      <record model="ir.actions.act_window" id="action_report_crm_case_oppor_stage">
           <field name="res_model">report.crm.case.section.stage</field>
           <field name="view_type">form</field>
-          <field name="view_mode">graph,tree</field>          
+          <field name="view_mode">graph,tree</field>
           <field name="context" eval="{'default_state':'open'}"/>
      </record>
      <menuitem name="Cases by Opportunities and Stage" parent="menu_action_report_crm_case_oppor"  action="action_report_crm_case_oppor_stage" id="menu_action_report_crm_case_oppor_stage"/>
@@ -68,7 +68,7 @@
      <record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ_stage">
           <field name="res_model">report.crm.case.section.categ.stage</field>
           <field name="view_type">form</field>
-          <field name="view_mode">tree</field>          
+          <field name="view_mode">tree</field>
           <field name="context" eval="{'default_state':'open'}"/>
      </record>
      <menuitem name="Cases by Opportunities, Category and Stage" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_stage" id="menu_action_report_crm_case_oppor_categ_stage"/>
@@ -76,11 +76,11 @@
      <record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ_categ2">
           <field name="res_model">report.crm.case.section.categ.categ2</field>
           <field name="view_type">form</field>
-          <field name="view_mode">tree</field>          
+          <field name="view_mode">tree</field>
           <field name="context" eval="{'default_state':'open'}"/>
      </record>
      <menuitem name="Cases by Opportunities, Category and Type" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_categ2" id="menu_action_report_crm_case_oppor_categ_categ2"/>
 
 
-</data>
+--></data>
 </openerp>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 1a4fa729899..d8fcf059254 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -2,37 +2,35 @@
 <openerp>
 <data>
 
+	# ------------------------------------------------------
+    # Opportunity Categories
+    # ------------------------------------------------------
+
+    <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.opportunity')]</field>
+		<field name="context">{'object_id':'crm.opportunity'}</field>                
+    </record>
+     <menuitem action="crm_opportunity_categ_action" id="menu_crm_case_opportunity-act" parent="crm.menu_crm_case_categ"/>
+		# ------------------------------------------------------ 
+	    # Stage
+	    # ------------------------------------------------------ 
+	    <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
+	        <field name="name">Opportunity Stages</field>
+	        <field name="res_model">crm.case.stage</field>
+	        <field name="view_type">form</field>
+ 			<field name="view_id" ref="crm.crm_case_stage_tree"/>
+			<field name="domain">[('object_id.model', '=', 'crm.opportunity')]</field>
+			 <field name="context">{'object_id':'crm.opportunity'}</field>
+	    </record>
+	  <menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" parent="crm.menu_crm_case_stage"/>
     # ------------------------------------------------------
     # Opportunities
     # ------------------------------------------------------   
 
-    <record model="ir.ui.view" id="crm_opportunity_assign_wizard_form">
-        <field name="name">crm.opportunity.assign_wizard.form</field>
-        <field name="model">crm.opportunity.assign_wizard</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="To Assign">
-                <group col="2">            	
-                    <field name="section_id" select="1" widget="selection"/>
-                    <field name="user_id"/>
-                </group>
-                <newline/>                    
-                <separator colspan="4"/>                             
-                <group col="2" colspan="2">
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="gtk-execute" name="action_create" string="Assign" type="object"/>
-                </group>
-            </form>
-        </field>
-    </record>
-    <record id="action_crm_opportunity_assign_wizard" model="ir.actions.act_window">
-        <field name="name">To Assign</field>
-        <field name="res_model">crm.opportunity.assign_wizard</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm_opportunity_assign_wizard_form"/>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
 
 
     <record model="ir.ui.view" id="crm_case_form_view_oppor">
@@ -45,8 +43,8 @@
                     <field name="name" select="1" string="Opportunity" colspan="2"/>
                     <field name="section_id" colspan="1" widget="selection"/>
                     <field name="user_id" select="2" string="Responsible"/>
-                    <button string="Schedule a Phone Call"
-                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action" />
+					<button string="Schedule a Meeting"
+                        name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
                         <newline/>
                         <label string="Sales Stage: " align="1.0"/>
                         <group colspan="1" col="2">
@@ -55,9 +53,10 @@
                         </group>
                     <field name="date" string="Deadline"/>
                     <group colspan="2">
-                        <field name="case_id" select="1"/>
-                        <button string="Assign" name="%(action_crm_opportunity_assign_wizard)d"  type="action" />
+                        <field name="phonecall_id" select="1"/>
                     </group>
+					 <button string="Schedule a Phone Call"
+                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  attrs="{'invisible':[('phonecall_id','!=',False)]}" />                        
                 </group>
                 <notebook colspan="4">
                 <page string="Description">
@@ -66,7 +65,7 @@
                     <field name="email_from" colspan="2"/>
                     <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Source"/>
                     <field name="priority" string="Priority"/>
-                    <field name="category2_id" select="1" string="Category"/>
+                    <field name="type_id" select="1" string="Type"/>
                     <separator colspan="4" string="Estimates"/>
                     <field name="planned_revenue"/>
                     <field name="planned_cost"/>
@@ -111,19 +110,6 @@
                         </form>
                     </field>
                 </page>
-                 <page string="Events">
-                   <field name="child_ids" colspan="4" nolabel="1">
-                       <tree string="Related Cases">
-                           <field name="id"/>
-                           <field name="date"/>
-                           <field name="name"/>
-                           <field name="partner_id"/>
-                           <field name="user_id"/>
-                           <field name="section_id" widget="selection"/>
-                           <field name="state"/>
-                       </tree>
-                    </field>
-                 </page>
                  <page string="Emails">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
@@ -215,16 +201,16 @@
                    		domain="[('user_id','=',uid)]"
                    		help="My Opportunities" default="1"
                    	/>
-                   	<filter icon="terp-crm"
-                   		domain="[('user_id','child_of',[uid])]"
-                   		help="My department's Opportunities"
-                   	/>
                    </field>
                    <field name="partner_id" select="1"/>
                    <field name="state" select="1">
                        <filter icon="gtk-index" domain="[('state','in',('open','draft'))]" help="Current "/>
                    </field>
-				<field name="section_id" select="1" widget="selection" string="Section"/>
+					<field name="section_id" select="1" widget="selection" string="Section">
+						<filter icon="terp-crm"
+                               domain="[('section_id','=',context.get('section_id',False))]"
+                               help="My section"/>		
+			   		</field>     
                </group>
            </search>
         </field>
diff --git a/addons/crm/crm_opportunity_wizard.xml b/addons/crm/crm_opportunity_wizard.xml
index d8b880e798d..5ba7ed0601f 100644
--- a/addons/crm/crm_opportunity_wizard.xml
+++ b/addons/crm/crm_opportunity_wizard.xml
@@ -16,9 +16,15 @@
             name="crm.case.opportunity.partner_opportunity"
             menu="False"
             string="Create Opportunity"/>
-
-        
-            
+	  
+	  <wizard
+            id="wizard_crm_opportunity_meeting_set"
+            keyword="client_action_multi"
+            model="crm.opportunity"
+			name="crm.opportunity.meeting_set"
+			menu="False"
+            string="Schedule Meeting"/>	
+	
 	   <wizard
           id="wizard_partner_create_opportunity1"
             keyword="client_action_relate"
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index c2bbf77e19f..4c548af86e1 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-from caldav import common
 from dateutil.rrule import *
 from osv import fields, osv
 import  datetime
@@ -30,127 +29,35 @@ import tools
 
 from tools.translate import _
 
+import crm
+
+
 class crm_phonecall(osv.osv):
     _name = "crm.phonecall"
     _description = "Phonecall Cases"
     _order = "id desc"
-    _inherits = {'crm.case':"inherit_case_id"}
+    _inherit = 'crm.case'
     _columns = {
-        'inherit_case_id': fields.many2one('crm.case','Case',ondelete='cascade'),
+        'duration': fields.float('Duration'),
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.phonecall')]"),
+        'partner_phone': fields.char('Phone', size=32),
+        'partner_mobile': fields.char('Mobile', size=32),
+        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                   "the partner mentality in relation to our services.The scale has" \
+                                                                   "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'probability': fields.float('Probability (%)'),
+        'planned_revenue': fields.float('Planned Revenue'),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),        
     }
-
-    def _map_ids(self, method, cr, uid, ids, *args, **argv):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        case_data = self.browse(cr, uid, select)
-        new_ids = []
-        for case in case_data:
-            if case.inherit_case_id:
-                new_ids.append(case.inherit_case_id.id)
-        res = getattr(self.pool.get('crm.case'),method)(cr, uid, new_ids, *args, **argv)
-        if isinstance(ids, (str, int, long)) and isinstance(res, list):
-            return res and res[0] or False
-        return res
-
-
-    def onchange_case_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_case_id',cr,uid,ids,*args,**argv)
-    def onchange_partner_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_id',cr,uid,ids,*args,**argv)
-    def onchange_partner_address_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_address_id',cr,uid,ids,*args,**argv)
-    def onchange_categ_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_categ_id',cr,uid,ids,*args,**argv)
-    def case_close(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_close',cr,uid,ids,*args,**argv)
-    def case_open(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_open',cr,uid,ids,*args,**argv)
-    def case_cancel(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_cancel',cr,uid,ids,*args,**argv)
-    def case_reset(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_reset',cr,uid,ids,*args,**argv)
-    def case_escalate(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_escalate',cr,uid,ids,*args,**argv)
-    def case_pending(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_pending',cr,uid,ids,*args,**argv)
-
-    def msg_new(self, cr, uid, msg):
-        mailgate_obj = self.pool.get('mail.gateway')
-        msg_body = mailgate_obj.msg_body_get(msg)
-        data = {
-            'name': msg['Subject'],
-            'email_from': msg['From'],
-            'email_cc': msg['Cc'],
-            'user_id': False,
-            'description': msg_body['body'],
-            'history_line': [(0, 0, {'description': msg_body['body'], 'email': msg['From'] })],
-        }
-        res = mailgate_obj.partner_get(cr, uid, msg['From'])
-        if res:
-            data.update(res)
-        res = self.create(cr, uid, data)
-        return res
-
-    def msg_update(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_update',cr, uid, ids, *args, **argv)
-    def emails_get(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('emails_get',cr, uid, ids, *args, **argv)
-    def msg_send(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_send',cr, uid, ids, *args, **argv)
+    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
+        if not categ:
+            return {'value':{}}
+        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
+        return {'value':{'probability':cat}}
 
 crm_phonecall()
 
-
-class crm_phonecall_assign_wizard(osv.osv_memory):
-    _name = 'crm.phonecall.assign_wizard'
-
-    _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Section', required=False),
-        'user_id': fields.many2one('res.users', 'Responsible'),
-    }
-
-    def _get_default_section(self, cr, uid, context):
-        case_id = context.get('active_id',False)
-        if not case_id:
-            return False
-        case_obj = self.pool.get('crm.phonecall')
-        case = case_obj.read(cr, uid, case_id, ['state','section_id'])
-        if case['state'] in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        return case['section_id']
-
-
-    _defaults = {
-        'section_id': _get_default_section
-    }
-    def action_create(self, cr, uid, ids, context=None):
-        case_obj = self.pool.get('crm.phonecall')
-        case_id = context.get('active_id',[])
-        res = self.read(cr, uid, ids)[0]
-        case = case_obj.browse(cr, uid, case_id)
-        if case.state in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        new_case_id = case_obj.copy(cr, uid, case_id, default=
-                                            {
-                                                'section_id':res.get('section_id',False),
-                                                'user_id':res.get('user_id',False),
-                                                'case_id' : case.inherit_case_id.id
-                                            }, context=context)
-        case_obj.case_close(cr, uid, [case_id])
-        data_obj = self.pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
-        search_view = data_obj.read(cr, uid, result, ['res_id'])
-        value = {
-            'name': _('Phone Calls'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.phonecall',
-            'res_id': int(new_case_id),
-            'type': 'ir.actions.act_window',
-            'search_view_id': search_view['res_id']
-        }
-        return value
-
-crm_phonecall_assign_wizard()
diff --git a/addons/crm/crm_phonecall_data.xml b/addons/crm/crm_phonecall_data.xml
index d59a0cb52d9..49d02f8848e 100644
--- a/addons/crm/crm_phonecall_data.xml
+++ b/addons/crm/crm_phonecall_data.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<record model="crm.case.section" id="section_support_phone">
-		<field name="name">Phone Calls</field>
-		<field name="code">Phone</field>
-	</record>
+->
 	
 	<!--
-	Case Categories
+	Phonecall Categories
 	-->
 	<record model="crm.case.categ" id="categ_phone1">
 		<field name="name">Inbound</field>
-		<field name="section_id" ref="section_support_phone"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
+		
 	</record>
 	<record model="crm.case.categ" id="categ_phone2">
 		<field name="name">Outbound</field>
-		<field name="section_id" ref="section_support_phone"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>		
 	</record>
 	
 	<!--
@@ -23,15 +23,18 @@
 	-->
 	<record model="crm.case.stage" id="stage_phone1">
 		<field name="name">Planned</field>
-		<field name="section_id" ref="section_support_phone"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>		
 	</record>	
 	<record model="crm.case.stage" id="stage_phone2">
 		<field name="name">Held</field>
-		<field name="section_id" ref="section_support_phone"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>		
 	</record>	
 	<record model="crm.case.stage" id="stage_phone3">
 		<field name="name">Not Held</field>
-		<field name="section_id" ref="section_support_phone"/>
+		<field name="section_id" ref="section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
 	</record>
 </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index d2af4cd0d40..571848c54c7 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -12,7 +12,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Left the message&quot;" name="name"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_phone"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone1"/>
@@ -27,7 +27,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Get More information on the proposed deal&quot;" name="name"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_phone"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(392) 895-7917&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone1"/>
@@ -42,7 +42,7 @@
 			<field name="user_id" ref="base.user_demo"/>
 			<field eval="&quot;Bad time, will call back&quot;" name="name"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_phone"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(820) 167-3208&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone1"/>
@@ -57,7 +57,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Discuss Review Process&quot;" name="name"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_phone"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(077) 582-4035&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone2"/>
@@ -72,7 +72,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;More information on the proposed deal&quot;" name="name"/>
 			<field eval="&quot;pending&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_phone"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(333) 715-1450&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
 			<field name="categ_id" ref="crm.categ_phone2"/>
@@ -87,7 +87,7 @@
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Bad time&quot;" name="name"/>
 			<field eval="&quot;open&quot;" name="state"/>
-			<field name="section_id" ref="crm.section_support_phone"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(468) 017-2684&quot;" name="partner_mobile"/>
 			<field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
 			<field name="categ_id" ref="crm.categ_phone2"/>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 30265a6338a..25f6ee0c1be 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    
+
     <act_window
         id="crm_case_categ_phone_create_partner"
         name="Schedule Phone Call"
@@ -11,14 +11,14 @@
         context="{'default_partner_id': active_id, 'default_duration': 1.0}"
         />
 
-    
+
     ######################## PHONE CALLS (menu) ###########################
     <record model="ir.actions.act_window" id="crm_case_categ_phone0">
         <field name="name">Phone Calls</field>
         <field name="res_model">crm.phonecall</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="crm_case_phone_tree_view"/>        
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone0">
@@ -26,7 +26,7 @@
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone0"/>
-    </record>    
+    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
@@ -39,8 +39,8 @@
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone0"/>
     </record>
-    <menuitem name="Phone Calls" id="menu_crm_case_phone"  parent="crm.menu_crm" action="crm_case_categ_phone0"/>
-    
+    <menuitem name="Phone Calls" id="menu_crm_case_phone"  parent="base.menu_base_partner" sequence="5"/>
+
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
         <field name="name">Inbound</field>
@@ -57,7 +57,7 @@
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_phone_incomming_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
-    </record>    
+    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
@@ -86,7 +86,7 @@
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
-    </record>    
+    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
@@ -98,7 +98,7 @@
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
-    </record>    
+    </record>
 
     <menuitem name="Outbound" id="menu_crm_case_phone_outbound"  parent="crm.menu_crm_case_phone" action="crm_case_categ_phone_outgoing0"/>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index fd99cd207a9..606b8d81b8e 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -1,37 +1,38 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+    
+    # ------------------------------------------------------
+    # Phonecall Categories
+    # ------------------------------------------------------
+   
+    <record id="crm_phonecall_categ_action" model="ir.actions.act_window">
+        <field name="name">Phonecall 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.phonecall')]</field> 
+		<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"/>
+    # ------------------------------------------------------
+    # Fund Stage
+    # ------------------------------------------------------
+	    <record id="crm_phonecall_stage_act" model="ir.actions.act_window">
+	        <field name="name">Phonecall Stages</field>
+	        <field name="res_model">crm.case.stage</field>
+	        <field name="view_type">form</field>
+ 			<field name="view_id" ref="crm.crm_case_stage_tree"/>
+			<field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>	
+			<field name="context">{'object_id':'crm.phonecall'}</field>
+	    </record>
+	  <menuitem action="crm_phonecall_stage_act" id="menu_crm_phonecall_stage_act" parent="crm.menu_crm_case_stage"/>
+	        
     # ------------------------------------------------------
     # Phone Calls
     # ------------------------------------------------------
 
-    <record model="ir.ui.view" id="crm_phonecall_assign_wizard_form">
-        <field name="name">crm.phonecall.assign_wizard.form</field>
-        <field name="model">crm.phonecall.assign_wizard</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="To Assign">
-                <group col="2">            	
-                    <field name="section_id" select="1" widget="selection"/>
-                    <field name="user_id"/>
-                </group>
-                <newline/>                    
-                <separator colspan="4"/>                             
-                <group col="2" colspan="2">
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="gtk-execute" name="action_create" string="Assign" type="object"/>
-                </group>
-            </form>
-        </field>
-    </record>
-    <record id="action_crm_phonecall_assign_wizard" model="ir.actions.act_window">
-        <field name="name">To Assign</field>
-        <field name="res_model">crm.phonecall.assign_wizard</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm_phonecall_assign_wizard_form"/>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
 
     <record model="ir.ui.view" id="crm_case_phone_tree_view">
         <field name="name">CRM - Phone Calls Tree</field>
@@ -43,12 +44,10 @@
                 <field name="name" string="Call Summary"/>
                 <field name="partner_id" string="Partner"/>
                 <field name="partner_address_id" string="Contact"/>
-                <field name="case_id"/>
-                <button string="Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d"  type="action"/>
+                <field name="opportunity_id"/>
+                <button string="Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d"  type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />                       
                 <button string="Meeting"
                         name="%(wizard_crm_phonecall_meeting_set)d"  type="action" />
-                <button string="Assign" name="%(action_crm_phonecall_assign_wizard)d"  type="action" />
-
             </tree>
         </field>
     </record>
@@ -63,12 +62,12 @@
                 <field name="name" string="Call Summary"/>
                 <field name="partner_id" string="Partner"/>
                 <field name="partner_address_id" string="Contact"/>
-                <field name="case_id"/>
-                <button string="Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d"  type="action"/>
+                <group col="2">    
+                <field name="opportunity_id"/>
+                <button string="Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d"  type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />            
                 <button string="Meeting"
                         name="%(wizard_crm_phonecall_meeting_set)d"  type="action" />
-                <button string="Assign" name="%(action_crm_phonecall_assign_wizard)d"  type="action" />
-
+                </group>        
             </tree>
         </field>
     </record>
@@ -83,16 +82,16 @@
                     <field name="name" string="Subject"/>
                     <field name="section_id" colspan="1" widget="selection"/>
                     <field name="user_id" string="Assigned to" select="2"/>
-                    <button string="Convert to Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d" icon="gtk-index" type="action"/>
+                    <button string="Convert to Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d" icon="gtk-index" type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />   
                     <newline/>
                     <field name="date" string="Planned Date"/>
                     <field name="duration"/>
                     <group colspan="2">
-                        <field name="case_id" on_change="onchange_case_id(case_id, name, partner_id)"
+                        <field name="opportunity_id" on_change="onchange_case_id(case_id, name, partner_id)"
                         context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
                                'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
                                'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}"/>
-                       <button string="Assign" name="%(action_crm_phonecall_assign_wizard)d"  type="action" />
+                       
                     </group>
                     <button string="Schedule a Meeting"
                         name="%(wizard_crm_phonecall_meeting_set)d" icon="gtk-redo" type="action" />
@@ -103,7 +102,7 @@
                     <field name="active" string="Reminder"/>                    
                     <group colspan="2" col="3">
                         <field name="partner_id" string="Partner"/>
-                        <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_phonecall_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"/>
+                        <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_phonecall_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"  />   
                     </group>
                     <field name="partner_address_id" string="Contact"/>
                     <field name="partner_phone"/>
@@ -172,7 +171,7 @@
                    />
                </group>
                <separator orientation="vertical"/>
-               <group col="4" colspan="2">
+               <group col="6" colspan="2">
              		<field name="name" select='1' string="Subject"/>
                		<field name="user_id" select="1" widget="selection">
 	                   	<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Phonecalls" default="1"/>
@@ -181,6 +180,11 @@
                    <field name="state" select="1">
                        <filter icon="gtk-index" domain="[('state','in',('open','draft' ))]" help="Current "/>
                    </field>
+					<field name="section_id" select="1" widget="selection" string="Section">
+						<filter icon="terp-crm"
+                               domain="[('section_id','=',context.get('section_id',False))]"
+                               help="My section"/>		
+			   		</field>     				
                    </group>
            </search>
         </field>
diff --git a/addons/crm/crm_report.py b/addons/crm/crm_report.py
deleted file mode 100644
index 991403ca090..00000000000
--- a/addons/crm/crm_report.py
+++ /dev/null
@@ -1,187 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import fields,osv
-
-import tools.sql
-
-AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    ('pending','Pending')
-]
-
-class report_crm_case_section_categ2(osv.osv):
-    _name = "report.crm.case.section.categ2"
-    _description = "Cases by section and category2"
-    _auto = False
-    _columns = {
-        'name': fields.date('Month', readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
-        'category2_id':fields.many2one('crm.case.category2', 'Type', readonly=True),
-        'stage_id':fields.many2one('crm.case.stage', 'Stage', readonly=True),
-        'amount_revenue': fields.float('Est.Revenue', readonly=True),
-        'nbr': fields.integer('# of Cases', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),        
-        'delay_close': fields.char('Delay Close', size=20, readonly=True),
-                }
-    _order = 'category2_id, section_id'
-    
-    def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, "report_crm_case_section_categ2")
-        cr.execute("""
-              create view report_crm_case_section_categ2 as (
-                select
-                    min(c.id) as id,
-                    to_char(c.create_date,'YYYY-MM')||'-01' as name,
-                    c.user_id,
-                    c.state,
-                    c.category2_id,
-                    c.stage_id,
-                    c.section_id,
-                    count(*) as nbr,
-                    sum(planned_revenue) as amount_revenue,
-                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
-                from
-                    crm_case c
-                where c.category2_id is not null
-                group by to_char(c.create_date,'YYYY-MM'), c.user_id, c.state, c.stage_id, c.category2_id, c.section_id)""")
-
-report_crm_case_section_categ2()
-
-class report_crm_case_section_stage(osv.osv):
-    _name = "report.crm.case.section.stage"
-    _description = "Cases by section and stage"
-    _auto = False
-    _columns = {
-        'name': fields.date('Month', readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
-        'categ_id':fields.many2one('crm.case.categ', 'Category', readonly=True),
-        'stage_id':fields.many2one('crm.case.stage', 'Stage', readonly=True),
-        'amount_revenue': fields.float('Est.Revenue', readonly=True),
-        'nbr': fields.integer('# of Cases', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),        
-        'delay_close': fields.char('Delay Close', size=20, readonly=True),
-                }
-    _order = 'stage_id, section_id'
-    
-    def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, "report_crm_case_section_stage")
-        cr.execute("""
-              create view report_crm_case_section_stage as (
-                select
-                    min(c.id) as id,
-                    to_char(c.create_date,'YYYY-MM')||'-01' as name,
-                    c.user_id,
-                    c.state,
-                    c.stage_id,
-                    c.section_id,
-                    count(*) as nbr,
-                    sum(planned_revenue) as amount_revenue,
-                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
-                from
-                    crm_case c
-                where c.stage_id is not null
-                group by to_char(c.create_date,'YYYY-MM'), c.user_id, c.state, c.stage_id, c.section_id)""")
-
-report_crm_case_section_stage()
-
-class report_crm_case_section_categ_stage(osv.osv):
-    _name = "report.crm.case.section.categ.stage"
-    _description = "Cases by section, Category and stage"
-    _auto = False
-    _columns = {
-        'name': fields.date('Month', readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'categ_id':fields.many2one('crm.case.categ', 'Category', readonly=True),
-        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
-        'stage_id':fields.many2one('crm.case.stage', 'Stage', readonly=True),
-        'nbr': fields.integer('# of Cases', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),        
-        'delay_close': fields.char('Delay Close', size=20, readonly=True),
-                }
-    _order = 'stage_id, section_id, categ_id'
-    
-    def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, "report_crm_case_section_categ_stage")
-        cr.execute("""
-              create view report_crm_case_section_categ_stage as (
-                select
-                    min(c.id) as id,
-                    to_char(c.create_date,'YYYY-MM')||'-01' as name,
-                    c.user_id,
-                    c.categ_id,
-                    c.state,
-                    c.stage_id,
-                    c.section_id,
-                    count(*) as nbr,
-                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
-                from
-                    crm_case c
-                where c.categ_id is not null AND c.stage_id is not null
-                group by to_char(c.create_date,'YYYY-MM'), c.user_id, c.categ_id, c.state, c.stage_id, c.section_id)""")
-
-report_crm_case_section_categ_stage()
-
-class report_crm_case_section_categ_categ2(osv.osv):
-    _name = "report.crm.case.section.categ.categ2"
-    _description = "Cases by section, Category and Category2"
-    _auto = False
-    _columns = {
-        'name': fields.date('Month', readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'categ_id':fields.many2one('crm.case.categ', 'Category', readonly=True),
-        'category2_id':fields.many2one('crm.case.category2', 'Type', readonly=True),
-        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
-        'stage_id':fields.many2one('crm.case.stage', 'Stage', readonly=True),
-        'nbr': fields.integer('# of Cases', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),        
-        'delay_close': fields.char('Delay Close', size=20, readonly=True),
-                }
-    _order = 'section_id, categ_id, category2_id'
-    
-    def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, "report_crm_case_section_categ_categ2")
-        cr.execute("""
-              create view report_crm_case_section_categ_categ2 as (
-                select
-                    min(c.id) as id,
-                    to_char(c.create_date, 'YYYY-MM')||'-01' as name,
-                    c.user_id,
-                    c.categ_id,
-                    c.category2_id,
-                    c.state,
-                    c.stage_id,
-                    c.section_id,
-                    count(*) as nbr,
-                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
-                from
-                    crm_case c
-                where c.categ_id is not null AND c.category2_id is not null
-                group by to_char(c.create_date,'YYYY-MM'), c.user_id, c.categ_id, c.category2_id, c.state, c.stage_id, c.section_id)""")
-
-report_crm_case_section_categ_categ2()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 96b5119c1b6..df76994d9b3 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -4,8 +4,8 @@
     #
     # Cases by section and category2 of case
     #
-		<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm"
-			sequence="50"/>
+<!--		<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm"-->
+<!--			sequence="50"/>-->
 
     <record model="ir.ui.view" id="view_crm_case_section_categ_tree">
         <field name="name">CRM Report - Sections and Type(Tree)</field>
@@ -57,7 +57,7 @@
             </graph>
         </field>
     </record>
-    
+
     <record id="view_crm_case_section_categ_filter" model="ir.ui.view">
             <field name="name">CRM Report - Sections and Type(Select)</field>
             <field name="model">report.crm.case.section.categ2</field>
@@ -83,7 +83,7 @@
         <field name="view_mode">graph,tree</field>
         <field name="search_view_id" ref="view_crm_case_section_categ_filter"/>
     </record>
-    <menuitem parent="next_id_64" name="Cases by Section and Type" action="action_report_crm_case_section_categ_tree" id="menu_crm_case_section_categ_tree"/>
+<!--    <menuitem parent="next_id_64" name="Cases by Section and Type" action="action_report_crm_case_section_categ_tree" id="menu_crm_case_section_categ_tree"/>-->
 
     #
     # Cases by section and stage
@@ -161,7 +161,7 @@
         <field name="view_mode">graph,tree</field>
         <field name="search_view_id" ref="view_crm_case_section_stage_filter"/>
     </record>
-    <menuitem parent="next_id_64" name="Cases by Section and Stage" action="action_report_crm_case_section_stage_tree" id="menu_crm_case_section_stage_tree"/>
+<!--    <menuitem parent="next_id_64" name="Cases by Section and Stage" action="action_report_crm_case_section_stage_tree" id="menu_crm_case_section_stage_tree"/>-->
 
     #
     # Cases by section, category and stage
@@ -240,7 +240,7 @@
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_crm_case_section_categ_stage_filter"/>
     </record>
-    <menuitem parent="next_id_64" name="Cases by Section, Category and Stage" action="action_report_crm_case_section_categ_stage_tree" id="menu_crm_case_section_categ_stage_tree"/>
+<!--    <menuitem parent="next_id_64" name="Cases by Section, Category and Stage" action="action_report_crm_case_section_categ_stage_tree" id="menu_crm_case_section_categ_stage_tree"/>-->
 
     #
     # Cases by section, category and category2
@@ -321,6 +321,6 @@
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_crm_case_section_categ_categ2_filter"/>
     </record>
-    <menuitem parent="next_id_64" name="Cases by Section, Category and Type" action="action_report_crm_case_section_categ_categ2_tree" id="menu_crm_case_section_categ_categ2_tree"/>
+<!--    <menuitem parent="next_id_64" name="Cases by Section, Category and Type" action="action_report_crm_case_section_categ_categ2_tree" id="menu_crm_case_section_categ_categ2_tree"/>-->
 </data>
 </openerp>
diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py
index ef181f70221..2f0e2a1c650 100644
--- a/addons/crm/crm_segmentation.py
+++ b/addons/crm/crm_segmentation.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -41,7 +41,7 @@ class crm_segmentation(osv.osv):
         'segmentation_line': fields.one2many('crm.segmentation.line', 'segmentation_id', 'Criteria', required=True),
         'som_interval': fields.integer('Days per Periode', help="A period is the average number of days between two cycle of sale or purchase for this segmentation. It's mainly used to detect if a partner has not purchased or buy for a too long time, so we suppose that his state of mind has decreased because he probably bought goods to another supplier. Use this functionality for recurring businesses."),
         'som_interval_max': fields.integer('Max Interval', help="The computation is made on all events that occured during this interval, the past X periods."),
-        'som_interval_decrease': fields.float('Decrease (0>1)', help="If the partner has not purchased (or buied) during a period, decrease the state of mind by this factor. It\'s a multiplication"),
+        'som_interval_decrease': fields.float('Decrease (0>1)', help="If the partner has not purchased (or bought) during a period, decrease the state of mind by this factor. It\'s a multiplication"),
         'som_interval_default': fields.float('Default (0=None)', help="Default state of mind for period preceeding the 'Max Interval' computation. This is the starting state of mind by default if the partner has no event."),
         'sales_purchase_active': fields.boolean('Use The Sales Purchase Rules', help='Check if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored')
     }
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b7a900234e2..02a2984a0a2 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -1,28 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/>
-        <menuitem id="menu_crm_configuration" name="Configuration" parent="crm.menu_crm" sequence="0"/>
+<!--        <menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/>-->
+        <menuitem id="menu_crm_configuration" name="Cases" parent="base.menu_base_config" sequence="0"/>
 
         <wizard id="wizard_crm_send_mail" model="crm.case.history" name="crm.send.mail" string="Send Mail" menu="False"/>
         <wizard id="wizard_crm_new_send_mail" model="crm.case" name="crm.new.send.mail" string="Send New Mail" menu="False"/>
 
-        <record id="res_partner_events-wopartner-view" model="ir.ui.view">
-            <field name="name">res.partner.events.form</field>
-            <field name="model">res.partner.events</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Partner Events">
-                    <separator string="General Description"/>
-                    <field name="date" select="1"/>
-                    <field name="name" select="1"/>
-                    <field name="som" select="2"/>
-                    <field name="type" select="2"/>
-                    <field name="partner_type" select="2"/>
-                </tree>
-            </field>
-        </record>
-
         <!-- Case Sections -->
         <record id="crm_case_section_view_form" model="ir.ui.view">
             <field name="name">crm.case.section.form</field>
@@ -63,19 +47,42 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
-        <menuitem id="next_id_51" name="Cases" parent="crm.menu_crm_configuration"/>
-        <menuitem action="crm_case_section_act" id="menu_crm_case_section_act" parent="next_id_51"/>
-
-        <menuitem id="next_id_52" name="All Cases" parent="crm.menu_crm" sequence="1"/>
-        <record id="crm_case_section_act_tree" model="ir.actions.act_window">
-            <field name="name">Cases by section</field>
-            <field name="res_model">crm.case.section</field>
-            <field name="domain">[('parent_id','=',False)]</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="crm_case_section_view_tree"/>
-        </record>
-        <menuitem action="crm_case_section_act_tree" id="menu_crm_case_section_act_tree" parent="next_id_52"/>
 
+		# ------------------------------------------------------ 
+	    # Stage
+	    # ------------------------------------------------------ 
+	    <record model="ir.ui.view" id="crm_case_stage_tree">
+	        <field name="name">crm.case.stage.tree</field>
+	        <field name="model">crm.case.stage</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Stages">
+	                <field name="sequence"/>
+	                <field name="name"/>
+	                <field name="section_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    <record model="ir.ui.view" id="crm_case_stage_form">
+	        <field name="name">crm.case.stage.form</field>
+	        <field name="model">crm.case.stage</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Stage">
+	            	<field name="name" select="1"/>
+	                <field name="section_id" select="1" widget="selection"/>
+	                <field name="object_id" invisible="1" />
+	                <field name="sequence"/>
+	            </form>
+	        </field>
+	    </record>
+	    <record id="crm_case_stage_act" model="ir.actions.act_window">
+	        <field name="name">Stages</field>
+	        <field name="res_model">crm.case.stage</field>
+	        <field name="view_type">form</field>
+	        <field name="view_id" ref="crm_case_stage_tree"/>
+	    </record>
+		<menuitem  id="menu_crm_case_stage" name="Stages" parent="crm.menu_crm_configuration"/>
         <!-- Case Categories -->
         <record id="crm_case_categ-view" model="ir.ui.view">
             <field name="name">crm.case.categ.form</field>
@@ -85,6 +92,7 @@
                 <form string="Case Category">
                     <field name="name" select="1"/>
                     <field name="section_id" select="1" widget="selection"/>
+					<field name="object_id"  invisible="1" />                    
                     <field name="probability"/>
                 </form>
             </field>
@@ -108,7 +116,21 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
         </record>
-        <menuitem action="crm_case_categ-act" id="menu_crm_case_categ-act" parent="crm.next_id_51"/>
+		<menuitem id="menu_crm_case_categ"   name="Categories"  parent="crm.menu_crm_configuration"/>
+        
+        <menuitem action="crm_case_section_act" id="menu_crm_case_section_act" parent="crm.menu_crm_configuration"/>
+
+<!--        <menuitem id="next_id_52" name="All Cases" parent="crm.menu_crm" sequence="1"/>-->
+        <record id="crm_case_section_act_tree" model="ir.actions.act_window">
+            <field name="name">Cases by section</field>
+            <field name="res_model">crm.case.section</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="crm_case_section_view_tree"/>
+        </record>
+<!--        <menuitem action="crm_case_section_act_tree" id="menu_crm_case_section_act_tree" parent="next_id_52"/>-->
+
+
 
         <!-- Case rules -->
         <record id="crm_case_rule-view" model="ir.ui.view">
@@ -128,7 +150,7 @@
                             <separator colspan="4" string="Conditions on Case Fields"/>
                             <field name="regex_name" string="Regex on Case Name" colspan="2"/>
                             <field name="trg_section_id" select="1" widget="selection"/>
-                            <field name="trg_categ_id"/>
+                            <!--<field name="trg_categ_id"/>-->
                             <field name="trg_user_id" select="2"/>
                             <separator colspan="4" string="Conditions on Case Partner"/>
                             <field name="trg_partner_id"/>
@@ -208,7 +230,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_rule_tree-view"/>
         </record>
-        <menuitem action="crm_case_rule-act" id="menu_crm_case_rule-act" parent="crm.next_id_51"/>
+        <menuitem action="crm_case_rule-act" id="menu_crm_case_rule-act" parent="crm.menu_crm_configuration"/>
 
        <record id="view_crm_email_add_cc_wizard" model="ir.ui.view">
             <field name="name">Add CC</field>
@@ -241,6 +263,8 @@
             <field name="target">new</field>
         </record>
 
+
+
         <!-- Cases -->
         <record id="crm_case_log_tree-view" model="ir.ui.view">
             <field name="name">crm.case.log.tree</field>
@@ -301,9 +325,6 @@
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
-                    <field name="priority"/>
-                    <field name="planned_revenue" sum="Planned revenue"/>
-                    <field name="planned_cost" sum="Planned costs"/>
                     <field name="state"/>
                     <button name="case_close" states="open,draft,pending" string="Close" type="object" icon="gtk-close"/>
                     <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward"/>
@@ -326,20 +347,18 @@
                     <field colspan="2" name="section_id" widget="selection"/>
                     <field name="date" select="1"/>
                     <field name="date_deadline" select="2"/>
-                    <field name="priority"/>
                     <newline />
                     <notebook colspan="4">
                         <page string="General">
-                            <group col="8" colspan="4">
-                                <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
-                                <field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
-                                <newline/>
-                                <field colspan="3" name="email_from" select="2"/>
-                                <button name="remind_partner" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
-                                <field name="user_id" select="1"/>
-                                <button name="remind_user" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
-                            </group>
-
+                        	<group col="8" colspan="4">
+	                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
+	                            <field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
+	                            <newline/>
+	                            <field colspan="3" name="email_from" select="2"/>
+	                            <button name="remind_partner" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
+	                            <field name="user_id" select="1"/>
+	                            <button name="remind_user" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
+							</group>
                             <separator colspan="4" string="Description"/>
                             <field name="description" colspan="4" nolabel="1"/>
                             <separator colspan="4"/>
@@ -356,20 +375,10 @@
                         <page string="History">
                             <field name="id" select="1"/>
                             <field name="active" select="2"/>
-                            <field name="categ_id" on_change="onchange_categ_id(categ_id)" select="2"/>
-                            <field name="som" select="2"/>
                             <separator colspan="4" string="Dates"/>
                             <field name="create_date"/>
-                            <field name="date_closed"/>
                             <field name="date_action_last"/>
                             <field name="date_action_next"/>
-                            <separator colspan="4" string="Estimates"/>
-                            <field name="planned_revenue"/>
-                            <field name="planned_cost"/>
-                            <field name="probability"/>
-                            <separator colspan="4" string="References"/>
-                            <field colspan="4" name="ref"/>
-                            <field colspan="4" name="ref2"/>
                             <field colspan="4" name="log_ids" nolabel="1">
                                 <form string="Actions">
                                     <separator colspan="4" string="Action Information"/>
@@ -433,10 +442,11 @@
                        <field name="name" select='1'/>
                        <field name="user_id" select="1" widget="selection"/>
                    </group>
+					 <field name="section_id" select="1" widget="selection" string="Section"/>
                </search>
             </field>
         </record>
-
+	
         <record id="crm_case_categ0-act" model="ir.actions.act_window">
             <field name="name">Cases</field>
             <field name="res_model">crm.case</field>
@@ -444,7 +454,7 @@
             <field name="view_id" ref="crm_case_tree-view"/>
             <field name="search_view_id" ref="view_crm_case_filter"/>
         </record>
-        <menuitem action="crm_case_categ0-act" id="menu_crm_case_categ0-act" parent="crm.next_id_52"/>
+<!--        <menuitem action="crm_case_categ0-act" id="menu_crm_case_categ0-act" parent="crm.next_id_52"/>-->
 
         <record id="crm_case_categ0-act_open" model="ir.actions.act_window">
             <field name="name">Open Cases</field>
@@ -479,7 +489,8 @@
                     <field colspan="4" name="name" select="1"/>
                     <field name="date" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="case_id" select="2"/>
+                    <field name="model_id" select="2"/>
+                    <field name="res_id" select="2"/>
                     <field name="som" select="2"/>
                     <field name="canal_id" select="2"/>
                     <field colspan="4" name="description" select="2"/>
@@ -494,9 +505,11 @@
             	<search string="Search Histories">
                		<filter icon="terp-crm" string="My Histories" domain="[('user_id','=',uid)]" help="My Histories"/>
                		<separator orientation="vertical"/>
+                     <group col="6" colspan="2">
                		<field name="date" select="1"/>
-                    <field name="user_id" select="1" widget="selection"/>
-                    <field name="case_id" select="1"/>
+                    <field name="user_id" select="1" widget="selection"/>                    
+					 <field name="section_id" select="1" widget="selection" string="Section"/>
+					</group>
                 </search>
         	</field>
     	</record>
@@ -509,7 +522,7 @@
             <field name="view_id" ref="crm_case_history_tree-view"/>
             <field name="search_view_id" ref="crm_case_history_search"/>
         </record>
-        <menuitem action="crm_case_history-act" id="menu_crm_case_history-act_main" name="Cases Histories" parent="crm.next_id_52"/>
+<!--        <menuitem action="crm_case_history-act" id="menu_crm_case_history-act_main" name="Cases Histories" parent="crm.next_id_52"/>-->
 
         <record id="crm_segmentation_line_tree-view" model="ir.ui.view">
             <field name="name">crm.segmentation.line.tree</field>
@@ -608,17 +621,17 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="next_id_53" name="Segmentations" parent="crm.menu_crm_configuration"/><menuitem action="crm_segmentation_tree-act" id="menu_crm_segmentation-act" parent="next_id_53"/>
-
-        <act_window domain="[('section_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_section_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.section" view_mode="tree,form,calendar" view_type="form"/>
-
-        <act_window domain="[('categ_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_categ_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.categ" view_mode="tree,form,calendar" view_type="form"/>
-
-        <act_window domain="[('partner_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_partner_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.partner" view_mode="tree,form,calendar" view_type="form"/>
-
-        <act_window domain="[('canal_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_partner_canal_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.partner.canal" view_mode="tree,form,calendar" view_type="form"/>
-
-        <act_window domain="[('user_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_users_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.users" view_mode="tree,form,calendar" view_type="form"/>
+        <menuitem action="crm_segmentation_tree-act" id="menu_crm_segmentation-act" parent="crm.menu_crm_configuration"/>
+<!---->
+<!--        <act_window domain="[('section_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_section_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.section" view_mode="tree,form,calendar" view_type="form"/>-->
+<!---->
+<!--        <act_window domain="[('categ_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_categ_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.categ" view_mode="tree,form,calendar" view_type="form"/>-->
+<!---->
+<!--        <act_window domain="[('partner_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_partner_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.partner" view_mode="tree,form,calendar" view_type="form"/>-->
+<!---->
+<!--        <act_window domain="[('canal_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_partner_canal_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.partner.canal" view_mode="tree,form,calendar" view_type="form"/>-->
+<!---->
+<!--        <act_window domain="[('user_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_users_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.users" view_mode="tree,form,calendar" view_type="form"/>-->
 
 
 		<record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
diff --git a/addons/crm/crm_wizard.xml b/addons/crm/crm_wizard.xml
index e55bf5579ee..abcb8520c66 100644
--- a/addons/crm/crm_wizard.xml
+++ b/addons/crm/crm_wizard.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <wizard 
-         string="History of Events"
-           name="crm.case.history.events" 
-           model="crm.case" 
-           id="wizard_case_history_event" 
-           keyword="client_action_relate"
-           
-        />        
         
     </data>
 </openerp>
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 2c0f075c95d..2440d434cc2 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -1,20 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* crm
+#	* crm
 #
 msgid ""
 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:11+0000\n"
-"PO-Revision-Date: 2010-01-05 07:51+0000\n"
-"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
-"<jesteve@zikzakmedia.com>\n"
+"POT-Creation-Date: 2010-01-05 05:59+0000\n"
+"PO-Revision-Date: 2010-01-17 17:11+0000\n"
+"Last-Translator: Jaerhigo <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: 2009-12-16 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-01-18 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -43,7 +42,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
 msgid "Cases by section and category2"
-msgstr ""
+msgstr "Casos segmentados por sección y categoría 2"
 
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
@@ -51,7 +50,10 @@ msgid "Close Lead"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "    7 Days    "
 msgstr ""
 
@@ -78,7 +80,7 @@ msgstr "Costos planeados"
 #. module: crm
 #: wizard_field:crm.job.partner_create,init,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "Requerimiento de trabajo a finalizar"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -86,7 +88,8 @@ msgid "Stage Name"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.case.history:0
+#: view:crm.case:0
+#: view:crm.case.history:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act
 #: model:ir.actions.act_window,name:crm.crm_case_section_open_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
@@ -137,12 +140,13 @@ msgid "Fixed"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/wizard/crm_job_wizard.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/wizard/crm_job_wizard.py:0
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "¡Atención!"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
@@ -175,7 +179,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,transparent:0
 msgid "TRANSPARENT"
-msgstr ""
+msgstr "Transparente"
 
 #. module: crm
 #: help:crm.case.rule,server_action_id:0
@@ -192,15 +196,18 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,partner_id:0
+#: view:crm.case:0
+#: field:crm.case,partner_id:0
 #: model:crm.case.categ,name:crm.categ_lead4
 #: model:crm.case.categ,name:crm.categ_oppor4
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,partner_id:0
-#: field:crm.case.rule,trg_partner_id:0 selection:crm.email.add.cc,name:0
+#: field:crm.case.rule,trg_partner_id:0
+#: selection:crm.email.add.cc,name:0
 #: field:crm.email.add.cc,partner_id:0
 #: wizard_field:crm.lead.opportunity_set,create_partner,partner_id:0
 #: wizard_field:crm.lead.opportunity_set,opportunity,partner_id:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: wizard_field:crm.phonecall.opportunity_set,create_partner,partner_id:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
 #: model:process.node,name:crm.process_node_partner0
@@ -208,8 +215,10 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: crm
-#: field:crm.case.categ,section_id:0 field:crm.case.category2,section_id:0
-#: view:crm.case.section:0 field:crm.case.section,name:0
+#: field:crm.case.categ,section_id:0
+#: field:crm.case.category2,section_id:0
+#: view:crm.case.section:0
+#: field:crm.case.section,name:0
 #: field:crm.case.stage,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
@@ -254,8 +263,12 @@ msgid "Special Keywords to Be Used in The Body"
 msgstr "Palabras clave especiales para ser usadas en el mensaje"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Send New Email"
 msgstr ""
 
@@ -318,8 +331,12 @@ msgid "Warning!"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Dates"
 msgstr "Fechas"
 
@@ -334,7 +351,8 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.opportunity:0
+#: view:crm.fundraising:0
+#: view:crm.opportunity:0
 msgid "Description Information"
 msgstr ""
 
@@ -355,8 +373,12 @@ msgid "Delay type"
 msgstr "Tipo de demora"
 
 #. module: crm
-#: view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "Contact"
 msgstr ""
 
@@ -446,7 +468,8 @@ msgid "Home"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,categ_id:0 field:crm.case.rule,trg_categ_id:0
+#: field:crm.case,categ_id:0
+#: field:crm.case.rule,trg_categ_id:0
 #: wizard_field:crm.job.reschedule_phone_call,init,category_id:0
 #: view:crm.opportunity:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,category_id:0
@@ -481,8 +504,12 @@ msgid "%(partner)s = Partner name"
 msgstr "%(partner)s = Nombre empresa"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Action Information"
 msgstr "Información de la acción"
 
@@ -515,7 +542,9 @@ msgid "Open Cases"
 msgstr "Casos abiertos"
 
 #. module: crm
-#: field:crm.case.log,name:0 view:crm.claim:0 view:crm.job:0
+#: field:crm.case.log,name:0
+#: view:crm.claim:0
+#: view:crm.job:0
 msgid "Status"
 msgstr "Posición"
 
@@ -543,10 +572,13 @@ msgid "Meetings Tree"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.fundraising:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 #, python-format
 msgid "Escalate"
 msgstr "Escalado"
@@ -629,7 +661,10 @@ msgid "Allows to show calendar"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "   Today   "
 msgstr ""
 
@@ -667,6 +702,8 @@ msgstr ""
 msgid ""
 "You must define a responsible user for this case in order to use this action!"
 msgstr ""
+"¡Debe definir un usuario responsable para este caso para poder utilizar esta "
+"acción!"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -689,7 +726,10 @@ msgid "Jobs - Hiring Process"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Related Cases"
 msgstr ""
 
@@ -702,8 +742,12 @@ msgid "September"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Communication history"
 msgstr "Historial de comunicación"
 
@@ -754,7 +798,8 @@ msgid "Leads Form"
 msgstr ""
 
 #. module: crm
-#: view:crm.segmentation:0 model:ir.model,name:crm.model_crm_segmentation
+#: view:crm.segmentation:0
+#: model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
 msgstr "Segmentación de empresa"
 
@@ -774,7 +819,8 @@ msgid "Existing Business"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,probability:0 field:crm.case.categ,probability:0
+#: field:crm.case,probability:0
+#: field:crm.case.categ,probability:0
 msgid "Probability (%)"
 msgstr "Probabilidad (%)"
 
@@ -793,7 +839,8 @@ msgstr ""
 "los correos electrónicos enviados por OpenERP para los casos de esta sección."
 
 #. module: crm
-#: view:crm.case.rule:0 model:ir.model,name:crm.model_crm_case_rule
+#: view:crm.case.rule:0
+#: model:ir.model,name:crm.model_crm_case_rule
 msgid "Case Rule"
 msgstr "Regla del caso"
 
@@ -801,7 +848,8 @@ msgstr "Regla del caso"
 #: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #: code:addons/crm/wizard/crm_opportunity_wizard.py:0
-#: code:addons/crm/wizard/crm_phonecall_wizard.py:0 view:crm.opportunity:0
+#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
+#: view:crm.opportunity:0
 #: view:crm.phonecall:0
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
 #, python-format
@@ -809,8 +857,12 @@ msgid "Opportunity"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Emails"
 msgstr ""
 
@@ -893,7 +945,7 @@ msgstr "Establecer grado a"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email!"
-msgstr "Email"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead6
@@ -926,7 +978,8 @@ msgid "Gives the sequence order when displaying a list of case stages."
 msgstr ""
 
 #. module: crm
-#: model:crm.case.section,name:crm.section_support3 view:crm.opportunity:0
+#: model:crm.case.section,name:crm.section_support3
+#: view:crm.opportunity:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
@@ -959,7 +1012,8 @@ msgid "Direction"
 msgstr ""
 
 #. module: crm
-#: help:crm.case,email_cc:0 help:crm.case.rule,act_email_cc:0
+#: help:crm.case,email_cc:0
+#: help:crm.case.rule,act_email_cc:0
 msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
@@ -1032,7 +1086,8 @@ msgid "Mobile"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,name:0 field:crm.segmentation.line,name:0
+#: field:crm.case.rule,name:0
+#: field:crm.segmentation.line,name:0
 msgid "Rule Name"
 msgstr "Nombre de regla"
 
@@ -1077,8 +1132,10 @@ msgid "Export ICS"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_claim.py:0 code:addons/crm/crm_helpdesk.py:0
-#: code:addons/crm/crm_meeting.py:0 code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/crm_claim.py:0
+#: code:addons/crm/crm_helpdesk.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "You can not assign Closed Case."
@@ -1093,9 +1150,11 @@ msgstr ""
 "electrónico a la empresa."
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:0 code:addons/crm/wizard/crm_job_wizard.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/wizard/crm_job_wizard.py:0
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
-#: model:crm.case.section,name:crm.section_support1 view:crm.meeting:0
+#: model:crm.case.section,name:crm.section_support1
+#: view:crm.meeting:0
 #, python-format
 msgid "Meetings"
 msgstr ""
@@ -1111,8 +1170,10 @@ msgid "Next Action"
 msgstr "Próxima acción"
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,date_deadline:0
-#: selection:crm.case.rule,trg_date_type:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: field:crm.case,date_deadline:0
+#: selection:crm.case.rule,trg_date_type:0
+#: view:crm.opportunity:0
 msgid "Deadline"
 msgstr "Fecha límite"
 
@@ -1144,8 +1205,10 @@ msgid "Category of case"
 msgstr "Categoría del caso"
 
 #. module: crm
-#: field:crm.email.add.cc,subject:0 view:crm.meeting:0
-#: wizard_field:crm.new.send.mail,init,subject:0 view:crm.phonecall:0
+#: field:crm.email.add.cc,subject:0
+#: view:crm.meeting:0
+#: wizard_field:crm.new.send.mail,init,subject:0
+#: view:crm.phonecall:0
 #: wizard_field:crm.send.mail,init,subject:0
 msgid "Subject"
 msgstr ""
@@ -1231,13 +1294,15 @@ msgid "Print"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,som:0 field:crm.case.log,som:0
+#: field:crm.case,som:0
+#: field:crm.case.log,som:0
 #: selection:crm.segmentation.line,expr_name:0
 msgid "State of Mind"
 msgstr "Grado de satisfacción"
 
 #. module: crm
-#: view:crm.claim:0 view:crm.meeting:0
+#: view:crm.claim:0
+#: view:crm.meeting:0
 #: field:report.crm.case.section.categ.categ2,category2_id:0
 #: field:report.crm.case.section.categ2,category2_id:0
 msgid "Type"
@@ -1272,7 +1337,8 @@ msgid "Creation Date"
 msgstr "Fecha creación"
 
 #. module: crm
-#: view:crm.meeting:0 view:crm.phonecall:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
 #: model:process.node,name:crm.process_node_meeting0
 msgid "Meeting"
 msgstr ""
@@ -1283,8 +1349,13 @@ msgid "%(partner_email)s = Partner email"
 msgstr "%(partner_email)s = Email empresa"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "Reset to Draft"
 msgstr "Cambiar a borrador"
 
@@ -1308,7 +1379,8 @@ msgid "Open cases"
 msgstr "Casos abiertos"
 
 #. module: crm
-#: field:crm.case,stage_id:0 view:crm.case.stage:0
+#: field:crm.case,stage_id:0
+#: view:crm.case.stage:0
 #: field:report.crm.case.section.categ.categ2,stage_id:0
 #: field:report.crm.case.section.categ.stage,stage_id:0
 #: field:report.crm.case.section.categ2,stage_id:0
@@ -1359,7 +1431,9 @@ msgid "Meeting Date"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.phonecall:0
 msgid "Convert to Partner"
 msgstr ""
 
@@ -1377,7 +1451,7 @@ msgstr "Máx ID de empresa procesado"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "You can not delete this case. You should better cancel it."
-msgstr ""
+msgstr "No puede eliminar este caso. Sería mejor que lo cancelara."
 
 #. module: crm
 #: wizard_button:caldav.crm.subscribe,init,open:0
@@ -1418,10 +1492,11 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "done"
-msgstr ""
+msgstr "realizado"
 
 #. module: crm
-#: view:crm.meeting:0 view:crm.phonecall:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
 msgid "Reminder"
 msgstr ""
 
@@ -1438,7 +1513,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "open"
-msgstr ""
+msgstr "abierto"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_attach:0
@@ -1477,7 +1552,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "draft"
-msgstr ""
+msgstr "borrador"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim5
@@ -1486,8 +1561,10 @@ msgid "Awaiting Response"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,date:0 field:crm.case.log,date:0
-#: selection:crm.case.rule,trg_date_type:0 view:crm.claim:0
+#: field:crm.case,date:0
+#: field:crm.case.log,date:0
+#: selection:crm.case.rule,trg_date_type:0
+#: view:crm.claim:0
 #: view:crm.phonecall:0
 msgid "Date"
 msgstr "Fecha"
@@ -1514,8 +1591,12 @@ msgid "Converted"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Reply to Last Email"
 msgstr ""
 
@@ -1530,8 +1611,12 @@ msgid "Gives Location of Meeting"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "History"
 msgstr "Historial"
 
@@ -1551,7 +1636,8 @@ msgid "Regular Expression on Case Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,state:0 field:report.crm.case.section.categ.categ2,state:0
+#: field:crm.case,state:0
+#: field:report.crm.case.section.categ.categ2,state:0
 #: field:report.crm.case.section.categ.stage,state:0
 #: field:report.crm.case.section.categ2,state:0
 #: field:report.crm.case.section.stage,state:0
@@ -1564,27 +1650,36 @@ msgid "Send Reminder"
 msgstr "Enviar recordatorio"
 
 #. module: crm
-#: view:crm.case:0 view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.case:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "References"
 msgstr "Referencias"
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #: wizard_button:crm.case.opportunity.partner_opportunity,init,end:0
-#: view:crm.claim:0 view:crm.claim.assign_wizard:0 view:crm.fundraising:0
+#: view:crm.claim:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.fundraising:0
 #: view:crm.helpdesk.assign_wizard:0
 #: wizard_button:crm.job.meeting_set,init,end:0
 #: wizard_button:crm.job.partner_create,init,end:0
-#: wizard_button:crm.job.reschedule_phone_call,init,end:0 view:crm.lead:0
+#: wizard_button:crm.job.reschedule_phone_call,init,end:0
+#: view:crm.lead:0
 #: wizard_button:crm.lead.opportunity_set,create_partner,end:0
 #: wizard_button:crm.lead.opportunity_set,opportunity,end:0
 #: wizard_button:crm.lead.partner_create,init,end:0
 #: view:crm.meeting.generic_wizard:0
-#: wizard_button:crm.new.send.mail,init,end:0 view:crm.opportunity:0
+#: wizard_button:crm.new.send.mail,init,end:0
+#: view:crm.opportunity:0
 #: view:crm.opportunity.assign_wizard:0
 #: wizard_button:crm.opportunity.reschedule_phone_call,init,end:0
-#: view:crm.phonecall:0 view:crm.phonecall.assign_wizard:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall.assign_wizard:0
 #: wizard_button:crm.phonecall.meeting_set,init,end:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,end:0
 #: wizard_button:crm.phonecall.opportunity_set,opportunity,end:0
@@ -1598,7 +1693,7 @@ msgstr "Cancelar"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
-msgstr ""
+msgstr "¡No se ha encontrado Email en la dirección de su compañía!"
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -1631,7 +1726,8 @@ msgid "Claim Cost"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 view:crm.opportunity:0
+#: view:crm.job:0
+#: view:crm.opportunity:0
 msgid "Schedule a Phone Call"
 msgstr ""
 
@@ -1686,8 +1782,12 @@ msgid "Sale Amount"
 msgstr "Importe de venta"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Add a CC"
 msgstr ""
 
@@ -1697,7 +1797,9 @@ msgid "="
 msgstr "="
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.job:0 field:crm.menu.config_wizard,name:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: field:crm.menu.config_wizard,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
 msgstr "Nombre"
@@ -1718,7 +1820,8 @@ msgid "Mail to watchers (CC)"
 msgstr ""
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.meeting:0
+#: view:crm.fundraising:0
+#: view:crm.meeting:0
 msgid "Next Meeting"
 msgstr ""
 
@@ -1729,6 +1832,8 @@ msgid ""
 "No E-Mail ID Found for your Company address or missing reply address in "
 "section!"
 msgstr ""
+"¡No se ha encontrado Email en la dirección de su compañía o falta dirección "
+"de respuesta en la sección!"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
@@ -1746,14 +1851,19 @@ msgid "Bug Tracking"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.case.rule:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.case:0
+#: view:crm.case.rule:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Actions"
 msgstr "Acciones"
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "High"
@@ -1851,7 +1961,8 @@ msgid "Email Fail!"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_phone1 view:crm.phonecall:0
+#: model:crm.case.categ,name:crm.categ_phone1
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
@@ -1877,7 +1988,8 @@ msgstr ""
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 #: view:report.crm.case.section.categ.stage:0
-#: view:report.crm.case.section.categ2:0 view:report.crm.case.section.stage:0
+#: view:report.crm.case.section.categ2:0
+#: view:report.crm.case.section.stage:0
 msgid "This Year"
 msgstr ""
 
@@ -1887,7 +1999,8 @@ msgid "Remind Partner"
 msgstr "Recordar empresa"
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Highest"
@@ -1968,7 +2081,8 @@ msgid "Convert To Opportunity"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_phone2 view:crm.phonecall:0
+#: model:crm.case.stage,name:crm.stage_phone2
+#: view:crm.phonecall:0
 msgid "Held"
 msgstr ""
 
@@ -2008,10 +2122,12 @@ msgstr "Estado del caso"
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Send"
-msgstr ""
+msgstr "Enviar"
 
 #. module: crm
-#: field:crm.case,priority:0 view:crm.fundraising:0 view:crm.lead:0
+#: field:crm.case,priority:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Priority"
 msgstr "Prioridad"
@@ -2040,7 +2156,9 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.claim:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.claim:0
+#: view:crm.job:0
+#: view:crm.lead:0
 msgid "Stage: "
 msgstr ""
 
@@ -2055,12 +2173,15 @@ msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/crm_claim.py:0
-#: code:addons/crm/crm_helpdesk.py:0 code:addons/crm/crm_meeting.py:0
-#: code:addons/crm/crm_opportunity.py:0 code:addons/crm/crm_phonecall.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm_claim.py:0
+#: code:addons/crm/crm_helpdesk.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2170,7 +2291,8 @@ msgid "%(case_date)s = Creation date"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_phone3 view:crm.phonecall:0
+#: model:crm.case.stage,name:crm.stage_phone3
+#: view:crm.phonecall:0
 msgid "Not Held"
 msgstr ""
 
@@ -2213,7 +2335,8 @@ msgid "Month"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.section,name:crm.section_support2 view:crm.lead:0
+#: model:crm.case.section,name:crm.section_support2
+#: view:crm.lead:0
 #: field:crm.menu.config_wizard,lead:0
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
@@ -2244,6 +2367,8 @@ msgid ""
 "No E-Mail ID Found for the Responsible Partner or missing reply address in "
 "section!"
 msgstr ""
+"¡No se ha encontrado Email en la empresa responsable o falta dirección de "
+"respuesta en la sección!"
 
 #. module: crm
 #: view:crm.job:0
@@ -2257,7 +2382,8 @@ msgstr "Registro"
 
 #. module: crm
 #: help:crm.menu.config_wizard,fund:0
-msgid "This may help associations in their fund raising process and tracking."
+msgid ""
+"This may help associations in their fund raising process and tracking."
 msgstr ""
 
 #. module: crm
@@ -2289,14 +2415,16 @@ msgid "Delay Close"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Low"
 msgstr "Bajo"
 
 #. module: crm
-#: field:crm.case,date_closed:0 selection:crm.case,state:0
+#: field:crm.case,date_closed:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
@@ -2316,7 +2444,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "cancel"
-msgstr ""
+msgstr "cancelado"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2324,7 +2452,10 @@ msgid "Internal Meeting"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,child_ids:0 view:crm.claim:0 view:crm.lead:0
+#: view:crm.case:0
+#: field:crm.case,child_ids:0
+#: view:crm.claim:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Events"
 msgstr ""
@@ -2377,7 +2508,8 @@ msgstr ""
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:0
 #: model:crm.case.section,name:crm.section_support_phone
-#: field:crm.menu.config_wizard,phonecall:0 view:crm.phonecall:0
+#: field:crm.menu.config_wizard,phonecall:0
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #, python-format
@@ -2412,7 +2544,8 @@ msgid "Cheque"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,active:0 field:crm.case.rule,active:0
+#: field:crm.case,active:0
+#: field:crm.case.rule,active:0
 #: field:crm.case.section,active:0
 msgid "Active"
 msgstr "Activo"
@@ -2452,8 +2585,10 @@ msgid "Months"
 msgstr "Meses"
 
 #. module: crm
-#: view:crm.claim.assign_wizard:0 view:crm.helpdesk.assign_wizard:0
-#: view:crm.opportunity.assign_wizard:0 view:crm.phonecall.assign_wizard:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.helpdesk.assign_wizard:0
+#: view:crm.opportunity.assign_wizard:0
+#: view:crm.phonecall.assign_wizard:0
 #: model:ir.actions.act_window,name:crm.action_crm_claim_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_helpdesk_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_opportunity_assign_wizard
@@ -2485,8 +2620,10 @@ msgstr "Acción"
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
-#: model:crm.case.section,name:crm.section_support_claims view:crm.claim:0
-#: field:crm.menu.config_wizard,claims:0 view:crm.phonecall:0
+#: model:crm.case.section,name:crm.section_support_claims
+#: view:crm.claim:0
+#: field:crm.menu.config_wizard,claims:0
+#: view:crm.phonecall:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_claims
 #, python-format
 msgid "Claims"
@@ -2524,7 +2661,8 @@ msgid "Sales"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.phonecall:0
 msgid "General"
 msgstr "General"
 
@@ -2545,8 +2683,12 @@ msgid "Other"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
+#: selection:crm.new.send.mail,init,state:0
+#: view:crm.opportunity:0
 msgid "Done"
 msgstr ""
 
@@ -2561,12 +2703,18 @@ msgid "All Opportunities"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -2604,11 +2752,17 @@ msgid "Helpdesk"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,user_id:0 field:crm.case.rule,trg_user_id:0 view:crm.claim:0
-#: field:crm.claim.assign_wizard,user_id:0 view:crm.fundraising:0
-#: field:crm.helpdesk.assign_wizard,user_id:0 view:crm.job:0
-#: view:crm.meeting:0 field:crm.meeting.generic_wizard,user_id:0
-#: view:crm.opportunity:0 field:crm.opportunity.assign_wizard,user_id:0
+#: field:crm.case,user_id:0
+#: field:crm.case.rule,trg_user_id:0
+#: view:crm.claim:0
+#: field:crm.claim.assign_wizard,user_id:0
+#: view:crm.fundraising:0
+#: field:crm.helpdesk.assign_wizard,user_id:0
+#: view:crm.job:0
+#: view:crm.meeting:0
+#: field:crm.meeting.generic_wizard,user_id:0
+#: view:crm.opportunity:0
+#: field:crm.opportunity.assign_wizard,user_id:0
 #: field:crm.phonecall.assign_wizard,user_id:0
 msgid "Responsible"
 msgstr "Responsable"
@@ -2642,6 +2796,8 @@ msgid ""
 "You can not escalate this case.\n"
 "You are already at the top level."
 msgstr ""
+"No puede intensificar este caso.\n"
+"Ya se encuentra en el nivel superior."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2687,7 +2843,8 @@ msgstr ""
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 #: view:report.crm.case.section.categ.stage:0
-#: view:report.crm.case.section.categ2:0 view:report.crm.case.section.stage:0
+#: view:report.crm.case.section.categ2:0
+#: view:report.crm.case.section.stage:0
 msgid "This Month"
 msgstr ""
 
@@ -2704,12 +2861,12 @@ msgstr ""
 #. module: crm
 #: help:crm.case,state:0
 msgid ""
-"The state is set to 'Draft', when a case is "
-"created.                                  \n"
-"If the case is in progress the state is set to "
-"'Open'.                                  \n"
-"When the case is over, the state is set to "
-"'Done'.                                  \n"
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
 
@@ -2875,7 +3032,8 @@ msgid "Provide path for Remote Calendar"
 msgstr ""
 
 #. module: crm
-#: view:crm.segmentation:0 field:crm.segmentation.line,segmentation_id:0
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
 msgid "Segmentation"
 msgstr "Segmentación"
 
@@ -2935,7 +3093,8 @@ msgstr ""
 #. module: crm
 #: wizard_button:caldav.crm.export,init,end:0
 #: wizard_button:caldav.crm.import,display,end:0
-#: wizard_button:caldav.crm.subscribe,display,end:0 view:crm.email.add.cc:0
+#: wizard_button:caldav.crm.subscribe,display,end:0
+#: view:crm.email.add.cc:0
 msgid "Ok"
 msgstr ""
 
@@ -2957,10 +3116,11 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/wizard/wizard_cal_subscribe.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_claim_assign_wizard
@@ -2974,7 +3134,8 @@ msgid "All Jobs Requests"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,state:0 selection:crm.case.rule,act_state:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
 #: selection:report.crm.case.section.categ.categ2,state:0
@@ -3042,7 +3203,8 @@ msgid "%(case_subject)s = Case subject"
 msgstr "%(case_subject)s = Asunto del caso"
 
 #. module: crm
-#: field:crm.case,section_id:0 field:crm.case.log,section_id:0
+#: field:crm.case,section_id:0
+#: field:crm.case.log,section_id:0
 #: field:crm.case.rule,trg_section_id:0
 #: field:crm.claim.assign_wizard,section_id:0
 #: field:crm.helpdesk.assign_wizard,section_id:0
@@ -3086,13 +3248,15 @@ msgstr "Su acción"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead3
-#: field:crm.case.history,email:0 field:crm.email.add.cc,email:0
+#: field:crm.case.history,email:0
+#: field:crm.email.add.cc,email:0
 #: view:crm.job:0
 msgid "Email"
 msgstr "Email"
 
 #. module: crm
-#: field:crm.case,canal_id:0 field:crm.case.log,canal_id:0
+#: field:crm.case,canal_id:0
+#: field:crm.case.log,canal_id:0
 msgid "Channel"
 msgstr "Canal"
 
@@ -3137,12 +3301,18 @@ msgid "Reporting"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0 view:crm.opportunity:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: selection:crm.new.send.mail,init,state:0
+#: view:crm.opportunity:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -3198,7 +3368,8 @@ msgid "Lead Subject"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0 view:crm.phonecall:0
+#: view:crm.lead:0
+#: view:crm.phonecall:0
 msgid "Convert to Opportunity"
 msgstr ""
 
@@ -3292,7 +3463,8 @@ msgid "All Funds"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.section,calendar:0 view:crm.meeting:0
+#: field:crm.case.section,calendar:0
+#: view:crm.meeting:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
 msgid "Calendar"
 msgstr "Calendario"
@@ -3318,7 +3490,8 @@ msgid "Sales Purchase"
 msgstr "Compra Ventas"
 
 #. module: crm
-#: view:crm.job:0 model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
+#: view:crm.job:0
+#: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
 msgid "Schedule Meeting"
 msgstr ""
@@ -3329,7 +3502,8 @@ msgid "Arts And Culture"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_phone2 view:crm.phonecall:0
+#: model:crm.case.categ,name:crm.categ_phone2
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
@@ -3359,10 +3533,12 @@ msgid "Success Probability"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.meeting:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.meeting:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -3387,7 +3563,8 @@ msgid "Set section to"
 msgstr "Establecer sección a"
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Normal"
@@ -3399,7 +3576,7 @@ msgstr "Normal"
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "You must put a Partner eMail to use this action!"
-msgstr ""
+msgstr "¡Debe indicar un Email de empresa para usar esta acción!"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -3421,7 +3598,8 @@ msgid "Change RRule"
 msgstr ""
 
 #. module: crm
-#: selection:crm.email.add.cc,name:0 field:crm.email.add.cc,user_id:0
+#: selection:crm.email.add.cc,name:0
+#: field:crm.email.add.cc,user_id:0
 #: field:report.crm.case.section.categ.categ2,user_id:0
 #: field:report.crm.case.section.categ.stage,user_id:0
 #: field:report.crm.case.section.categ2,user_id:0
@@ -3471,6 +3649,8 @@ msgstr ""
 msgid ""
 "Can not send mail with empty body,you should have description in the body"
 msgstr ""
+"No puede enviar mensajes con un texto vacío, debería incluir una descripción "
+"en el mensaje"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3501,10 +3681,15 @@ msgid "Healthcare"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.claim.assign_wizard:0
-#: view:crm.helpdesk.assign_wizard:0 view:crm.meeting:0
-#: view:crm.meeting.generic_wizard:0 view:crm.opportunity:0
-#: view:crm.opportunity.assign_wizard:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.helpdesk.assign_wizard:0
+#: view:crm.meeting:0
+#: view:crm.meeting.generic_wizard:0
+#: view:crm.opportunity:0
+#: view:crm.opportunity.assign_wizard:0
+#: view:crm.phonecall:0
 #: view:crm.phonecall.assign_wizard:0
 msgid "Assign"
 msgstr ""
@@ -3530,7 +3715,9 @@ msgid "Stage of case"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.fundraising:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.fundraising:0
+#: view:crm.opportunity:0
 msgid "Estimates"
 msgstr "Estimaciones"
 
@@ -3540,7 +3727,8 @@ msgid "Responsible User"
 msgstr "Usuario responsable"
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #, python-format
 msgid "Close"
 msgstr "Cerrado"
@@ -3598,9 +3786,14 @@ msgid "% = The '%' Character"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,name:0 field:crm.case.history,description:0
-#: field:crm.case.history,note:0 view:crm.job:0 view:crm.meeting:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: field:crm.case,name:0
+#: field:crm.case.history,description:0
+#: field:crm.case.history,note:0
+#: view:crm.job:0
+#: view:crm.meeting:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: field:crm.segmentation,description:0
 msgid "Description"
 msgstr "Descripción"
@@ -3627,9 +3820,14 @@ msgstr ""
 "electrónico al usuario."
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 wizard_field:crm.new.send.mail,init,cc:0
-#: view:crm.opportunity:0 wizard_field:crm.send.mail,init,cc:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: wizard_field:crm.new.send.mail,init,cc:0
+#: view:crm.opportunity:0
+#: wizard_field:crm.send.mail,init,cc:0
 msgid "CC"
 msgstr ""
 
@@ -3644,10 +3842,14 @@ msgid "_Import"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 field:crm.case.log,case_id:0
-#: field:crm.claim,inherit_case_id:0 field:crm.fundraising,inherit_case_id:0
-#: field:crm.helpdesk,inherit_case_id:0 field:crm.job,inherit_case_id:0
-#: field:crm.lead,inherit_case_id:0 field:crm.meeting,inherit_case_id:0
+#: code:addons/crm/crm.py:0
+#: field:crm.case.log,case_id:0
+#: field:crm.claim,inherit_case_id:0
+#: field:crm.fundraising,inherit_case_id:0
+#: field:crm.helpdesk,inherit_case_id:0
+#: field:crm.job,inherit_case_id:0
+#: field:crm.lead,inherit_case_id:0
+#: field:crm.meeting,inherit_case_id:0
 #: field:crm.opportunity,inherit_case_id:0
 #: field:crm.phonecall,inherit_case_id:0
 #: model:ir.model,name:crm.model_crm_case
@@ -3657,7 +3859,8 @@ msgid "Case"
 msgstr "Caso"
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Lowest"
@@ -3693,7 +3896,8 @@ msgstr ""
 "grado de satisfacción por este factor. Es una multiplicación."
 
 #. module: crm
-#: wizard_view:crm.new.send.mail,init:0 wizard_view:crm.send.mail,init:0
+#: wizard_view:crm.new.send.mail,init:0
+#: wizard_view:crm.send.mail,init:0
 msgid "Mass Mailing"
 msgstr ""
 
@@ -3769,7 +3973,8 @@ msgid "Export ICS File"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,sequence:0 field:crm.case.section,sequence:0
+#: field:crm.case.rule,sequence:0
+#: field:crm.case.section,sequence:0
 #: field:crm.case.stage,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
@@ -3817,8 +4022,11 @@ msgstr ""
 #~ msgid "Add Last Mail for Replying"
 #~ msgstr "Añadir último mail para responder"
 
-#~ msgid "this wizard will create all sub-menus, within the selected menu."
-#~ msgstr "este asistente creará todos los sub-menús, en el menú seleccionado."
+#~ msgid "Update The Proposed Menus To Be Created"
+#~ msgstr "Actualizar los menús propuestos a crear"
+
+#~ msgid "Base Information"
+#~ msgstr "Información base"
 
 #~ msgid "All Open "
 #~ msgstr "Todos los abiertos "
@@ -3826,12 +4034,21 @@ msgstr ""
 #~ msgid "Create menus for a case section"
 #~ msgstr "Crear menús para una sección de casos"
 
+#~ msgid "My "
+#~ msgstr "Mis "
+
 #~ msgid "Create menu Entries"
 #~ msgstr "Crear entradas de menús"
 
 #~ msgid "All Unclosed and Unassigned "
 #~ msgstr "Mis no cerrados o no asignados "
 
+#~ msgid "New "
+#~ msgstr "Nuevo "
+
+#~ msgid "Extra Info"
+#~ msgstr "Información extra"
+
 #~ msgid "My Open "
 #~ msgstr "Mis abiertos "
 
@@ -3841,6 +4058,12 @@ msgstr ""
 #~ msgid "Excluded Answers :"
 #~ msgstr "Respuestas excluidas:"
 
+#~ msgid "Profiling"
+#~ msgstr "Perfiles"
+
+#~ msgid "My cases"
+#~ msgstr "Mis casos"
+
 #~ msgid "All Draft "
 #~ msgstr "Todos los borradores "
 
@@ -3856,14 +4079,36 @@ msgstr ""
 #~ msgid "My Unclosed "
 #~ msgstr "Mis no cerrados "
 
+#~ msgid "Profiling Options"
+#~ msgstr "Opciones de perfiles"
+
+#~ msgid "My Pending "
+#~ msgstr "Mis pendientes "
+
+#~ msgid "New Form"
+#~ msgstr "Nuevo formulario"
+
+#~ msgid ""
+#~ "These people will receive a copy of the futur communication between partner "
+#~ "and users by email"
+#~ msgstr ""
+#~ "Estas personas recibirán una copia de la futura comunicación entre empresa y "
+#~ "usuarios por correo electrónico"
+
+#~ msgid "New With Calendar"
+#~ msgstr "Nuevo con calendario"
+
 #~ msgid "List With Calendar"
 #~ msgstr "Lista con calendario"
 
-#~ msgid ""
-#~ "You may want to create a new parent menu to put all the created menus in."
-#~ msgstr ""
-#~ "Es posible que desee crear un nuevo menú padre para poner todos los menús "
-#~ "creados en él."
+#~ msgid "Calendar View"
+#~ msgstr "Vista calendario"
+
+#~ msgid "Created Menus"
+#~ msgstr "Menús creados"
+
+#~ msgid "Parent Menu"
+#~ msgstr "Menú padre"
 
 #~ msgid "Included Answers :"
 #~ msgstr "Respuestas incluidas:"
@@ -3874,8 +4119,8 @@ msgstr ""
 #~ msgid "Base Menu Name"
 #~ msgstr "Nombre menú base"
 
-#~ msgid "Created Menus"
-#~ msgstr "Menús creados"
+#~ msgid "All Unassigned "
+#~ msgstr "Todos los no asignados "
 
 #~ msgid "All Unclosed "
 #~ msgstr "Todos los no cerrados "
@@ -3889,13 +4134,14 @@ msgstr ""
 #~ msgid "Create Menus For Cases"
 #~ msgstr "Crear menús para una sección de casos"
 
+#~ msgid "All Pending "
+#~ msgstr "Todos los pendientes "
+
 #~ msgid "All Canceled "
 #~ msgstr "Todos los cancelados "
 
-#~ msgid "Deadline Date is automatically computed from Start Date + Duration"
-#~ msgstr ""
-#~ "La fecha límite se calcula automáticamente a partir de Fecha de inicio + "
-#~ "Duración"
+#~ msgid "All "
+#~ msgstr "Todos "
 
 #~ msgid "List"
 #~ msgstr "Lista"
@@ -3912,8 +4158,22 @@ msgstr ""
 #~ msgid "Form View"
 #~ msgstr "Vista formulario"
 
+#~ msgid "Mail to watchers (Cc)"
+#~ msgstr "Enviar correo a observadores (CC)"
+
 #~ msgid "crm.case.section.open"
 #~ msgstr "crm.case.section.open"
 
-#~ msgid "Update The Proposed Menus To Be Created"
-#~ msgstr "Actualizar los menús propuestos a crear"
+#~ msgid "Deadline Date is automatically computed from Start Date + Duration"
+#~ msgstr ""
+#~ "La fecha límite se calcula automáticamente a partir de Fecha de inicio + "
+#~ "Duración"
+
+#~ msgid "this wizard will create all sub-menus, within the selected menu."
+#~ msgstr "este asistente creará todos los sub-menús, en el menú seleccionado."
+
+#~ msgid ""
+#~ "You may want to create a new parent menu to put all the created menus in."
+#~ msgstr ""
+#~ "Es posible que desee crear un nuevo menú padre para poner todos los menús "
+#~ "creados en él."
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index 5ad65e4dbcb..39990a084d7 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-01-09 13:33+0000\n"
+"PO-Revision-Date: 2010-01-22 14:44+0000\n"
 "Last-Translator: Carlo <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-01-10 07:16+0000\n"
+"X-Launchpad-Export-Date: 2010-01-23 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -27,12 +27,16 @@ msgid ""
 "This property defines the list                 of date/time exceptions for "
 "arecurring calendar component."
 msgstr ""
+"Questa proprietà definisce la lista delle eccezioni per data/ora per il "
+"componente del calendario corrente."
 
 #. module: crm
 #: 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 ""
+"Controlla questo se desideri la regola per inviare una e-mail alla persona "
+"responsabile."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -42,12 +46,12 @@ msgstr "Titolo"
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
 msgid "Cases by section and category2"
-msgstr ""
+msgstr "Casi per sezione e categoria2"
 
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
 msgid "Close Lead"
-msgstr ""
+msgstr "Contatto privilegiato chiuso"
 
 #. module: crm
 #: view:crm.job:0
@@ -55,7 +59,7 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 Giorni    "
 
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
@@ -65,7 +69,7 @@ msgstr "Gestisci un servizio di Helpdesk"
 #. module: crm
 #: view:crm.job:0
 msgid "Pending Jobs"
-msgstr ""
+msgstr "Lavori in attesa"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_to:0
@@ -80,12 +84,12 @@ msgstr "Costi Pianificati"
 #. module: crm
 #: wizard_field:crm.job.partner_create,init,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "Chiudere la richiesta di posti di lavoro"
 
 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Nome Scenario"
 
 #. module: crm
 #: view:crm.case:0
@@ -109,12 +113,12 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_hr
 msgid "Human Resources"
-msgstr ""
+msgstr "Risorse Umane"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
 msgid "Cases by Opportunities, Category and Type"
-msgstr ""
+msgstr "Casi da Opportunità, Categoria e Tipo"
 
 #. module: crm
 #: help:crm.menu.config_wizard,claims:0
@@ -122,22 +126,24 @@ msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
+"Gestisce le richieste di fornitori e clienti, includendo i tuoi preventivi e "
+"azioni correttive"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "Importo"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Riunione o teleconferenza per opportunità"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim2
 #: model:crm.case.stage,name:crm.stage_meet1
 msgid "Fixed"
-msgstr ""
+msgstr "Fissato"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -152,34 +158,34 @@ msgstr "Attenzione !"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Please specify user's email address !"
-msgstr ""
+msgstr "Specifica l'indirizzo email dell'utente !"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Campaign"
-msgstr ""
+msgstr "Campagna"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "Ricerca Opportunità"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
 #: view:report.crm.case.section.stage:0
 msgid "Cases by Section and Stage"
-msgstr ""
+msgstr "Casi per Sezione e Scenario"
 
 #. module: crm
 #: wizard_field:crm.job.meeting_set,init,duration:0
 #: wizard_field:crm.phonecall.meeting_set,init,duration:0
 msgid "Duration (Hours)"
-msgstr ""
+msgstr "Durata (Ore)"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
 msgid "TRANSPARENT"
-msgstr ""
+msgstr "TRANSPARENT"
 
 #. module: crm
 #: help:crm.case.rule,server_action_id:0
@@ -227,7 +233,7 @@ msgstr "Sezione Caso"
 #. module: crm
 #: view:crm.job:0
 msgid "Proposed Salary"
-msgstr ""
+msgstr "Stipendio Proposto"
 
 #. module: crm
 #: help:crm.case.section,sequence:0
@@ -240,12 +246,12 @@ msgstr ""
 #: model:crm.case.categ,name:crm.categ_meet3
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Telefonata"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_stage
 msgid "Cases by section and stage"
-msgstr ""
+msgstr "Casi per sezione e scenario"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_email:0
@@ -270,7 +276,7 @@ msgstr "Speciali parole chiave da utilizzare nel Corpo"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Spedisci Nuova Email"
 
 #. module: crm
 #: view:crm.case.history:0
@@ -296,7 +302,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Dates"
-msgstr ""
+msgstr "Date escluse"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -306,17 +312,17 @@ msgstr "Data Ultima Azione"
 #. module: crm
 #: view:crm.job:0
 msgid "Appreciation"
-msgstr ""
+msgstr "Valutazione"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job3
 msgid "Second Interview"
-msgstr ""
+msgstr "Secondo colloquio"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
 msgid "Subscribe to a Remote calendar"
-msgstr ""
+msgstr "Sottoscrizione ad un calendario Remoto"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
@@ -328,7 +334,7 @@ msgstr "Categorie"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Attenzione!"
 
 #. module: crm
 #: view:crm.case:0
@@ -354,18 +360,18 @@ msgstr ""
 #: view:crm.fundraising:0
 #: view:crm.opportunity:0
 msgid "Description Information"
-msgstr ""
+msgstr "Informazioni Descrizione"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Nome Contatto"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Link to an existing partner"
-msgstr ""
+msgstr "Collegamento ad un partner esistente"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_range_type:0
@@ -380,12 +386,12 @@ msgstr "Tipo Ritardo"
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "Contact"
-msgstr ""
+msgstr "Contatto"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Next Interview"
-msgstr ""
+msgstr "Prossimo colloquio"
 
 #. module: crm
 #: field:crm.case.rule,regex_history:0
@@ -395,12 +401,12 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_email_add_cc
 msgid "Email Add CC"
-msgstr ""
+msgstr "Email Add CC"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Incontro per opportunità"
 
 #. module: crm
 #: help:crm.case,canal_id:0
@@ -413,7 +419,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Rules"
-msgstr ""
+msgstr "Regole di eccezione"
 
 #. module: crm
 #: field:crm.menu.config_wizard,opportunity:0
@@ -424,7 +430,7 @@ msgstr "Opportunità"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "Accettato come richiesta"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -449,23 +455,23 @@ msgstr "%(email_from)s = Email Partner"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 msgid "Dead"
-msgstr ""
+msgstr "Chiuso"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm Meeting"
-msgstr ""
+msgstr "Conferma riunione"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead1
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Existing Customer"
-msgstr ""
+msgstr "Cliente esistente"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet2
 msgid "Home"
-msgstr ""
+msgstr "Pagina iniziale"
 
 #. module: crm
 #: field:crm.case,categ_id:0
@@ -484,7 +490,7 @@ msgstr "Categoria"
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_stage_tree
 #: view:report.crm.case.section.categ.stage:0
 msgid "Cases by Section, Category and Stage"
-msgstr ""
+msgstr "Casi per sezione, categoria e scenario"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_watchers:0
@@ -496,7 +502,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Privacy"
-msgstr ""
+msgstr "Privacy"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -556,7 +562,7 @@ msgstr "Stato"
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
 msgid "Create Opportunity"
-msgstr ""
+msgstr "Crea Opportunità"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -564,12 +570,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Tree"
-msgstr ""
+msgstr "Struttura Riunioni"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -586,7 +592,7 @@ msgstr "Intensificare"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
 msgid "All Meetings"
-msgstr ""
+msgstr "Tutte le Riunioni"
 
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
@@ -597,7 +603,7 @@ msgstr "Gestione delle relazione tra Clienti e Fornitori"
 #: view:crm.email.add.cc:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_email_add_cc_wizard
 msgid "Add CC"
-msgstr ""
+msgstr "E CC"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -605,7 +611,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "June"
-msgstr ""
+msgstr "Giugno"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -615,7 +621,7 @@ msgstr "Predefinito (0=nessuno)"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job7
 msgid "Refused by Company"
-msgstr ""
+msgstr "Rifiutato dall'Azienda"
 
 #. module: crm
 #: field:crm.case,planned_revenue:0
@@ -633,12 +639,12 @@ msgstr "Permetti la Cancellazione"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "October"
-msgstr ""
+msgstr "Ottobre"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor3
 msgid "Value Proposition"
-msgstr ""
+msgstr "Proposta di valore"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -648,17 +654,17 @@ msgstr "%(case_id)s = ID Caso"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor2
 msgid "New Business"
-msgstr ""
+msgstr "Nuovo Business"
 
 #. module: crm
 #: help:crm.case,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Queste persone riceveranno email."
 
 #. module: crm
 #: help:crm.case.section,calendar:0
 msgid "Allows to show calendar"
-msgstr ""
+msgstr "Permetti di vedere il calendario"
 
 #. module: crm
 #: view:crm.job:0
@@ -666,7 +672,7 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "   Today   "
-msgstr ""
+msgstr "   Oggi   "
 
 #. module: crm
 #: wizard_view:crm.job.reschedule_phone_call,init:0
@@ -692,7 +698,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "Politica richieste"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -702,11 +708,13 @@ msgstr ""
 msgid ""
 "You must define a responsible user for this case in order to use this action!"
 msgstr ""
+"È necessario definire un utente responsabile di questo caso, al fine di "
+"utilizzare questa azione!"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Assegnato a"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -716,12 +724,12 @@ msgstr "Eventi Partner"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job4
 msgid "Contract Proposed"
-msgstr ""
+msgstr "Contratto Proposto"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main
 msgid "Jobs - Hiring Process"
-msgstr ""
+msgstr "Posti di lavoro - Processo di assunzione"
 
 #. module: crm
 #: view:crm.case:0
@@ -737,7 +745,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "September"
-msgstr ""
+msgstr "Settembre"
 
 #. module: crm
 #: view:crm.case:0
@@ -752,33 +760,33 @@ msgstr "Riepilogo Comunicazioni"
 #. module: crm
 #: view:crm.claim:0
 msgid "New Claims"
-msgstr ""
+msgstr "Nuova Richiesta"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Form"
-msgstr ""
+msgstr "Modulo Riunioni"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor5
 msgid "Negotiation/Review"
-msgstr ""
+msgstr "Negoziazione/Revisione"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "Un partner è già definito in questa telefonata."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_stage
 msgid "Cases by Opportunities and Stage"
-msgstr ""
+msgstr "Casi per Opportunità e Scenario"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Date of Claim"
-msgstr ""
+msgstr "Data della richiesta"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -788,12 +796,12 @@ msgstr "Righe Segmentazione Partner"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
 msgid "All Leads"
-msgstr ""
+msgstr "tutte le Iniziative"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Modulo Iniziativa"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -804,7 +812,7 @@ msgstr "Segmentazione Partner"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job5
 msgid "Contract Signed"
-msgstr ""
+msgstr "Contratto Firmato"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
@@ -814,7 +822,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor1
 msgid "Existing Business"
-msgstr ""
+msgstr "Business Esistenti"
 
 #. module: crm
 #: field:crm.case,probability:0
@@ -852,7 +860,7 @@ msgstr "Regola Caso"
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Opportunità"
 
 #. module: crm
 #: view:crm.case:0
@@ -862,12 +870,12 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Emails"
-msgstr ""
+msgstr "Emails"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead7
 msgid "Television"
-msgstr ""
+msgstr "Televisione"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -877,18 +885,18 @@ msgstr "Arresta Processo"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim1
 msgid "Factual Claims"
-msgstr ""
+msgstr "Richieste reali"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "Ricerca Telefonate"
 
 #. module: crm
 #: wizard_button:crm.lead.opportunity_set,create_partner,create:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
 msgid "Continue"
-msgstr ""
+msgstr "Continua"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -903,13 +911,13 @@ msgstr "Valore"
 #. module: crm
 #: help:caldav.crm.export,init,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "Salva in formato .ics"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,text:0
 #: wizard_field:crm.send.mail,init,text:0
 msgid "Message"
-msgstr ""
+msgstr "Messaggio"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -943,17 +951,17 @@ msgstr "Imposta Stato a"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email!"
-msgstr ""
+msgstr "Email!"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead6
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity_assign_wizard
 msgid "crm.opportunity.assign_wizard"
-msgstr ""
+msgstr "crm.opportunity.assign_wizard"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -968,7 +976,7 @@ msgstr "Data Avvio Automatico"
 #. module: crm
 #: view:crm.case.history:0
 msgid "Search Histories"
-msgstr ""
+msgstr "Ricerca Storico"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
@@ -981,7 +989,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr ""
+msgstr "Opportunità"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -1007,7 +1015,7 @@ msgstr "Importo Acquisto"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Direction"
-msgstr ""
+msgstr "Direzione"
 
 #. module: crm
 #: help:crm.case,email_cc:0
@@ -1016,6 +1024,8 @@ msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
 msgstr ""
+"Queste persone riceveranno una copia delle future comunicazioni tra partner "
+"e utenti via email"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -1023,7 +1033,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1040,18 +1050,18 @@ msgstr "Regole"
 #: wizard_view:crm.job.meeting_set,init:0
 #: wizard_view:crm.phonecall.meeting_set,init:0
 msgid "Plan Meeting"
-msgstr ""
+msgstr "Pianifica Riunione"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,state:0
 msgid "Set State to"
-msgstr ""
+msgstr "Imposta lo Stato per"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "There is no mail to reply!"
-msgstr ""
+msgstr "Non c'è posta per rispondere!"
 
 #. module: crm
 #: wizard_button:crm.job.partner_create,init,confirm:0
@@ -1061,7 +1071,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_partner_create
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_partner_create
 msgid "Create Partner"
-msgstr ""
+msgstr "Creare Partner"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1076,12 +1086,12 @@ msgstr "%(case_description)s = Descrizione del Caso"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "My Funds"
-msgstr ""
+msgstr "I Miei Fondi"
 
 #. module: crm
 #: field:crm.case,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Cellulare"
 
 #. module: crm
 #: field:crm.case.rule,name:0
@@ -1102,12 +1112,12 @@ msgstr "Riepilogo Caso"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job2
 msgid "Junior Developer"
-msgstr ""
+msgstr "Sviluppatore Junior"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Le Mie Riunioni"
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1117,7 +1127,7 @@ msgstr "Nome Categoria Caso"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "Preventivo"
 
 #. module: crm
 #: field:crm.case.rule,act_email_cc:0
@@ -1127,7 +1137,7 @@ msgstr "Aggiungi Osservatori (Cc)"
 #. module: crm
 #: wizard_view:caldav.crm.export,init:0
 msgid "Export ICS"
-msgstr ""
+msgstr "Esporta ICS"
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
@@ -1137,7 +1147,7 @@ msgstr ""
 #: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "You can not assign Closed Case."
-msgstr ""
+msgstr "Non è possibile assegnare \"Caso Chiuso\"."
 
 #. module: crm
 #: help:crm.case.rule,act_remind_partner:0
@@ -1155,7 +1165,7 @@ msgstr ""
 #: view:crm.meeting:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "Riunioni"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1180,12 +1190,12 @@ msgstr "Scadenza"
 #: wizard_button:caldav.crm.import,init,end:0
 #: wizard_button:caldav.crm.subscribe,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancel"
 
 #. module: crm
 #: field:crm.case,category2_id:0
 msgid "Category Name"
-msgstr ""
+msgstr "Nome Categoria"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1195,7 +1205,7 @@ msgstr "Segmentazione Partner"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Rule"
-msgstr ""
+msgstr "Regola Ricorrente"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
@@ -1209,12 +1219,12 @@ msgstr "Categoria Caso"
 #: view:crm.phonecall:0
 #: wizard_field:crm.send.mail,init,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Oggetto"
 
 #. module: crm
 #: field:crm.meeting,attendees:0
 msgid "Attendees"
-msgstr ""
+msgstr "Partecipanti"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
@@ -1282,17 +1292,17 @@ msgstr ""
 #. module: crm
 #: view:crm.claim:0
 msgid "Pending Claims"
-msgstr ""
+msgstr "Richeste pendenti"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_stage
 msgid "Cases by Opportunities, Category and Stage"
-msgstr ""
+msgstr "Casi da Opportunità, Categoria e Scenario"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead4
 msgid "Print"
-msgstr ""
+msgstr "Stampa"
 
 #. module: crm
 #: field:crm.case,som:0
@@ -1307,12 +1317,12 @@ msgstr "Impressione"
 #: field:report.crm.case.section.categ.categ2,category2_id:0
 #: field:report.crm.case.section.categ2,category2_id:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Refused"
-msgstr ""
+msgstr "Candidato rifiutato"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1342,7 +1352,7 @@ msgstr "Data di Creazione"
 #: view:crm.phonecall:0
 #: model:process.node,name:crm.process_node_meeting0
 msgid "Meeting"
-msgstr ""
+msgstr "Riunione"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1363,12 +1373,12 @@ msgstr "Riporta a Bozza"
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_categ2
 msgid "Cases by section, Category and Category2"
-msgstr ""
+msgstr "Casi per Sezione, Categoria e Categoria2"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor6
 msgid "Closed Won"
-msgstr ""
+msgstr "Obbiettivi raggiunti"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_crm_case_categ_crm_case_opened
@@ -1404,13 +1414,14 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund2
 msgid "Learning And Education"
-msgstr ""
+msgstr "Formazione"
 
 #. module: crm
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this phonecall ?"
 msgstr ""
+"Sei sicuro di voler creare un partner, basandoti su questa telefonata?"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -1424,24 +1435,24 @@ msgstr ""
 #: wizard_field:crm.lead.opportunity_set,opportunity,planned_revenue:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "Entrata prevista"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "Data Riunione"
 
 #. module: crm
 #: view:crm.job:0
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Convert to Partner"
-msgstr ""
+msgstr "Converti a Partner"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_meetall3
 msgid "Next Meetings"
-msgstr ""
+msgstr "Prossimi incontri"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1458,7 +1469,7 @@ msgstr ""
 #. module: crm
 #: wizard_button:caldav.crm.subscribe,init,open:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Subscribe"
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_from:0
@@ -1473,22 +1484,22 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "Valore delle richieste"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,display:0
 msgid "Message..."
-msgstr ""
+msgstr "Messaggio..."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_assign_wizard
 msgid "crm.phonecall.assign_wizard"
-msgstr ""
+msgstr "crm.phonecall.assign_wizard"
 
 #. module: crm
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Category2"
-msgstr ""
+msgstr "Casi per Sezione e Categoria2"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1500,7 +1511,7 @@ msgstr "Fatto"
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Reminder"
-msgstr ""
+msgstr "Promemoria"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1527,7 +1538,7 @@ msgstr "Promemoria con Allegato"
 #: model:crm.case.categ,name:crm.categ_lead6
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Website"
-msgstr ""
+msgstr "Sito Web"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_user:0
@@ -1545,11 +1556,13 @@ msgid ""
 "Helps you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
 msgstr ""
+"Vi aiuta a organizzare il processo di assunzione per posti di lavoro: "
+"valutazione, riunioni, integrazione con email ..."
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds"
-msgstr ""
+msgstr "Fondi"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1561,7 +1574,7 @@ msgstr "Bozza"
 #: model:crm.case.stage,name:crm.stage_claim5
 #: model:crm.case.stage,name:crm.stage_meet4
 msgid "Awaiting Response"
-msgstr ""
+msgstr "In attesa di risposta"
 
 #. module: crm
 #: field:crm.case,date:0
@@ -1575,23 +1588,23 @@ msgstr "Data"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name"
-msgstr ""
+msgstr "Nome del candidato"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead2
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Self Generated"
-msgstr ""
+msgstr "Generato in automatico"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "Non verrà fissato"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Converted"
-msgstr ""
+msgstr "Convertito"
 
 #. module: crm
 #: view:crm.case:0
@@ -1601,7 +1614,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Reply to Last Email"
-msgstr ""
+msgstr "Rispondi all'ultima Email"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1611,7 +1624,7 @@ msgstr "Descrizione Segmentazione"
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Gives Location of Meeting"
-msgstr ""
+msgstr "Scrivi Luogo dell'incontro"
 
 #. module: crm
 #: view:crm.case:0
@@ -1626,12 +1639,12 @@ msgstr "Riepilogo"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_job
 msgid "Job Cases"
-msgstr ""
+msgstr "Casi per posti di lavoro"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Jobs - Recruitment Tree"
-msgstr ""
+msgstr "Struttura Reclutamento Lavoro"
 
 #. module: crm
 #: field:crm.case.rule,regex_name:0
@@ -1645,7 +1658,7 @@ msgstr ""
 #: field:report.crm.case.section.categ2,state:0
 #: field:report.crm.case.section.stage,state:0
 msgid "State"
-msgstr ""
+msgstr "Stato"
 
 #. module: crm
 #: view:crm.case:0
@@ -1696,17 +1709,17 @@ msgstr "Annulla"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
-msgstr ""
+msgstr "Non è stata ritrovata email per il tuo indirizzo"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Search Funds"
-msgstr ""
+msgstr "Ricerca Fondi"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Type of claim"
-msgstr ""
+msgstr "Tipo di richiesta"
 
 #. module: crm
 #: view:crm.case:0
@@ -1721,18 +1734,18 @@ msgstr "Descrizione generale"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Other Info"
-msgstr ""
+msgstr "Altre informazioni"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Claim Cost"
-msgstr ""
+msgstr "Costo richiesta"
 
 #. module: crm
 #: view:crm.job:0
 #: view:crm.opportunity:0
 msgid "Schedule a Phone Call"
-msgstr ""
+msgstr "Pianifica una Telefonata"
 
 #. module: crm
 #: field:crm.case,ref:0
@@ -1752,7 +1765,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead2
 msgid "Mail"
-msgstr ""
+msgstr "Mail"
 
 #. module: crm
 #: field:crm.case.rule,act_priority:0
@@ -1762,12 +1775,12 @@ msgstr "Imposta Priorità a"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor2
 msgid "Needs Analysis"
-msgstr ""
+msgstr "Richiesta Analisi"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr ""
+msgstr "Ricerca Richieste"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_body:0
@@ -1777,7 +1790,7 @@ msgstr "Corpo del Messaggio"
 #. module: crm
 #: help:crm.menu.config_wizard,meeting:0
 msgid "Manages the calendar of meetings of the users."
-msgstr ""
+msgstr "Gestisce il calendario delle riunioni degli utenti."
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1792,7 +1805,7 @@ msgstr "Importo Vendita"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Add a CC"
-msgstr ""
+msgstr "Aggiungi CC"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1810,12 +1823,12 @@ msgstr "Nome"
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Sales Stage"
-msgstr ""
+msgstr "Scenario Vendite"
 
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Allarme"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_watchers:0
@@ -1826,7 +1839,7 @@ msgstr ""
 #: view:crm.fundraising:0
 #: view:crm.meeting:0
 msgid "Next Meeting"
-msgstr ""
+msgstr "Prossima Riunione"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1849,7 +1862,7 @@ msgstr ""
 #. module: crm
 #: field:crm.menu.config_wizard,bugs:0
 msgid "Bug Tracking"
-msgstr ""
+msgstr "Tracciamento Bug"
 
 #. module: crm
 #: view:crm.case:0
@@ -1878,7 +1891,7 @@ msgstr ""
 #. module: crm
 #: view:crm.claim:0
 msgid "In Progress Claims"
-msgstr ""
+msgstr "Richieste in progresso"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_set_rrule
@@ -1888,7 +1901,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor4
 msgid "Proposal/Price Quote"
-msgstr ""
+msgstr "Proposta/Prezzo preventivo"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1898,12 +1911,12 @@ msgstr "Ritardo dopo data di trigger:"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead5
 msgid "Web"
-msgstr ""
+msgstr "Web"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Campaign Type"
-msgstr ""
+msgstr "Tipo Campagna"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1915,22 +1928,22 @@ msgstr "Calcolo Impressioni"
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Errore"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting_generic_wizard
 msgid "crm.meeting.generic_wizard"
-msgstr ""
+msgstr "crm.meeting.generic_wizard"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_history-act
 msgid "Histories"
-msgstr ""
+msgstr "Cronologie"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job1
 msgid "Graduate"
-msgstr ""
+msgstr "Laureato"
 
 #. module: crm
 #: wizard_view:crm.job.meeting_set,init:0
@@ -1939,11 +1952,13 @@ msgid ""
 "Note that you can also use the calendar view to graphically schedule your "
 "next meeting."
 msgstr ""
+"Nota che è possibile utilizzare la vista calendario per creare lo "
+"scadenziario dei tuoi prossimi incontri."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Tree"
-msgstr ""
+msgstr "Struttura Iniziative"
 
 #. module: crm
 #: field:crm.meeting,caldav_url:0
@@ -1953,13 +1968,13 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Attendee"
-msgstr ""
+msgstr "Partecipante"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email Fail!"
-msgstr ""
+msgstr "Email Fallita!"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
@@ -1967,12 +1982,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
-msgstr ""
+msgstr "In entrata"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Errore! Non è possibile creare sezioni ricorsive."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm
@@ -1985,6 +2000,8 @@ msgid ""
 " Will allow you to synchronise your Open ERP calendars with your phone, "
 "outlook, Sunbird, ical, ..."
 msgstr ""
+" Permetterà di sincronizzare i tuoi calendari Open ERP con il tuo telefono, "
+"outlook, Sunbird, ical, ..."
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -1992,7 +2009,7 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Year"
-msgstr ""
+msgstr "Quest'anno"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_partner:0
@@ -2010,7 +2027,7 @@ msgstr "Massima"
 #. module: crm
 #: view:crm.job:0
 msgid "Contract Data"
-msgstr ""
+msgstr "Data di contratto"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2021,11 +2038,13 @@ msgstr "Giorni"
 #: help:crm.menu.config_wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on software"
 msgstr ""
+"Utilizzato dalle aziende per tenere traccia dei bug e le richieste di "
+"supporto sul software"
 
 #. module: crm
 #: field:crm.menu.config_wizard,document_ics:0
 msgid "Shared Calendar"
-msgstr ""
+msgstr "Calendario condiviso"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -2035,7 +2054,7 @@ msgstr "Rispondi a"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ
 msgid "Cases by Leads and Type"
-msgstr ""
+msgstr "Casi di Contatti Privilegiati e Tipo"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2051,7 +2070,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job1
 msgid "Initial Jobs Demand"
-msgstr ""
+msgstr "Richiesta di lavori iniziali"
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_to:0
@@ -2066,12 +2085,12 @@ msgstr ""
 #. module: crm
 #: view:crm.claim:0
 msgid "Claims Info"
-msgstr ""
+msgstr "Informazioni Richieste"
 
 #. module: crm
 #: field:crm.case.category2,name:0
 msgid "Case Category2 Name"
-msgstr ""
+msgstr "Nome Caso Categoria2"
 
 #. module: crm
 #: wizard_view:crm.lead.opportunity_set,opportunity:0
@@ -2079,29 +2098,29 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_opportunity_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_opportunity_set
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "Covertire in Opportunità"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone2
 #: view:crm.phonecall:0
 msgid "Held"
-msgstr ""
+msgstr "Sospesa"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Supports"
-msgstr ""
+msgstr "Supporto Helpdesk"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support4
 #: model:ir.ui.menu,name:crm.menu_crm_case_fund_raise
 msgid "Fund Raising"
-msgstr ""
+msgstr "Raccolta Fondi"
 
 #. module: crm
 #: selection:crm.new.send.mail,init,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Invariato"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -2110,7 +2129,7 @@ msgstr ""
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "Convert To Partner"
-msgstr ""
+msgstr "Converti a Partner"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_from:0
@@ -2136,17 +2155,17 @@ msgstr "Priorità"
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Source"
-msgstr ""
+msgstr "Fonte"
 
 #. module: crm
 #: field:crm.meeting,location:0
 msgid "Location"
-msgstr ""
+msgstr "Località"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Modalità Pagamento"
 
 #. module: crm
 #: help:crm.case.rule,trg_date_range:0
@@ -2171,7 +2190,7 @@ msgstr "Sezione Caso"
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "Metti a scadenziatio una riunione o una telefonata"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2192,7 +2211,7 @@ msgstr "Campi da cambiare"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead1
 msgid "Telesales"
-msgstr ""
+msgstr "Televendite"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main
@@ -2219,7 +2238,7 @@ msgstr "Riga Segmentazione"
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,deadline:0
 #: view:crm.phonecall:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Data Pianificata"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2236,17 +2255,17 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_import
 msgid "Import ICS File"
-msgstr ""
+msgstr "Importa File ICS"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Attendee Detail"
-msgstr ""
+msgstr "Dettaglio Partecipante"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job3
 msgid " > Bac +5"
-msgstr ""
+msgstr " > Bac +5"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -2254,7 +2273,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "July"
-msgstr ""
+msgstr "Luglio"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor1
@@ -2264,7 +2283,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,partner_name2:0
 msgid "Employee Email"
-msgstr ""
+msgstr "Email Dipendente"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting
@@ -2274,28 +2293,28 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Job Info"
-msgstr ""
+msgstr "Informazioni Lavoro"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Cancel Meeting"
-msgstr ""
+msgstr "Annulla Riunione"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support0
 msgid "Jobs"
-msgstr ""
+msgstr "Lavori"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_date)s = Creation date"
-msgstr ""
+msgstr "%(case_date) = Data Creazione"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone3
 #: view:crm.phonecall:0
 msgid "Not Held"
-msgstr ""
+msgstr "Non gestito"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_user:0
@@ -2305,12 +2324,12 @@ msgstr "Mail a Responsabile"
 #. module: crm
 #: view:crm.job:0
 msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "Modulo di Assunzione"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim1
 msgid "Corrective"
-msgstr ""
+msgstr "Correttivo"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity
@@ -2320,7 +2339,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case:0
 msgid "Support Query"
-msgstr ""
+msgstr "Richiesta di Supporto"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2333,7 +2352,7 @@ msgstr "Modello di Email da spedire"
 #: field:report.crm.case.section.categ2,month:0
 #: field:report.crm.case.section.stage,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mese"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support2
@@ -2349,7 +2368,7 @@ msgstr ""
 #: wizard_button:crm.new.send.mail,init,send:0
 #: wizard_button:crm.send.mail,init,send:0
 msgid "Send Email"
-msgstr ""
+msgstr "Invia Email"
 
 #. module: crm
 #: wizard_view:crm.new.send.mail,init:0
@@ -2359,7 +2378,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund3
 msgid "Credit Card"
-msgstr ""
+msgstr "Carta di Credito"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2372,7 +2391,7 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Search Jobs"
-msgstr ""
+msgstr "Ricerca Lavori"
 
 #. module: crm
 #: field:crm.case.history,log_id:0
@@ -2384,16 +2403,18 @@ msgstr "Log"
 msgid ""
 "This may help associations in their fund raising process and tracking."
 msgstr ""
+"Questo può aiutare le associazioni nel loro processo diraccolta fondi e nel "
+"mantenere traccia di ciò."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "Ripristina a Non confermato"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Support"
-msgstr ""
+msgstr "Supporto Helpdesk"
 
 #. module: crm
 #: field:crm.case,email_cc:0
@@ -2437,7 +2458,7 @@ msgstr "Chiuso"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name2"
-msgstr ""
+msgstr "Nome2 Candidato"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2448,7 +2469,7 @@ msgstr "Annulla"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "Riunione Interna"
 
 #. module: crm
 #: view:crm.case:0
@@ -2457,7 +2478,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Events"
-msgstr ""
+msgstr "Eventi"
 
 #. module: crm
 #: help:crm.menu.config_wizard,lead:0
@@ -2465,6 +2486,9 @@ msgid ""
 "Allows you to track and manage leads which are pre-sales requests or "
 "contacts, the very first contact with a customer request."
 msgstr ""
+"Permette di tenere traccia e gestire i contatti privilegiati che sono "
+"richieste di prevendita o contatti,il primo contatto con un richiesta del "
+"cliente."
 
 #. module: crm
 #: help:crm.case,som:0
@@ -2482,27 +2506,27 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "Riunione del cliente"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc2:0
 msgid "Attachment2"
-msgstr ""
+msgstr "Allegato2"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc3:0
 msgid "Attachment3"
-msgstr ""
+msgstr "Allegato3"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Degree"
-msgstr ""
+msgstr "Titolo di studio"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc1:0
 msgid "Attachment1"
-msgstr ""
+msgstr "Allegato1"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:0
@@ -2513,7 +2537,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #, python-format
 msgid "Phone Calls"
-msgstr ""
+msgstr "Chiamate Telefoniche"
 
 #. module: crm
 #: help:crm.case,active:0
@@ -2525,7 +2549,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_menu_config_wizard
 msgid "crm.menu.config_wizard"
-msgstr ""
+msgstr "crm.menu.config_wizard"
 
 #. module: crm
 #: view:crm.case.history:0
@@ -2535,12 +2559,12 @@ msgstr "Riepilogo Caso"
 #. module: crm
 #: field:crm.case,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefono"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund2
 msgid "Cheque"
-msgstr ""
+msgstr "Assegno"
 
 #. module: crm
 #: field:crm.case,active:0
@@ -2576,7 +2600,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
 msgid "Send Mail"
-msgstr ""
+msgstr "Invia email"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2593,23 +2617,25 @@ msgstr "Mesi"
 #: model:ir.actions.act_window,name:crm.action_crm_opportunity_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall_assign_wizard
 msgid "To Assign"
-msgstr ""
+msgstr "Da Assegnare"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Please provide Proper URL !"
-msgstr ""
+msgstr "Si prega di fornire un URL corretto!"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "Quando un progetto reale / opportunità è rilevato"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this job request ?"
 msgstr ""
+"Sei sicuro di voler creare un partner sulla base di questa richiesta di "
+"lavoro?"
 
 #. module: crm
 #: wizard_field:crm.lead.opportunity_set,create_partner,action:0
@@ -2626,7 +2652,7 @@ msgstr "Azione"
 #: model:ir.ui.menu,name:crm.menu_crm_case_claims
 #, python-format
 msgid "Claims"
-msgstr ""
+msgstr "Richieste"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
@@ -2636,18 +2662,18 @@ msgstr "Diminuisci (0>1)"
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_case_history_event
 msgid "History of Events"
-msgstr ""
+msgstr "Cronologia degli Eventi"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_category2
 msgid "Category2 of case"
-msgstr ""
+msgstr "Categoria2 del caso"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,to:0
 #: wizard_field:crm.send.mail,init,to:0
 msgid "To"
-msgstr ""
+msgstr "Per"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2657,7 +2683,7 @@ msgstr "%(case_user_email)s = Email Responsabile"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_presale
 msgid "Sales"
-msgstr ""
+msgstr "Vendite"
 
 #. module: crm
 #: view:crm.case:0
@@ -2668,18 +2694,18 @@ msgstr "Generale"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 msgid "Assigned"
-msgstr ""
+msgstr "Assegnato"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 msgid "Recycled"
-msgstr ""
+msgstr "Riciclata"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead8
 #: model:crm.case.categ,name:crm.categ_oppor8
 msgid "Other"
-msgstr ""
+msgstr "Altro"
 
 #. module: crm
 #: view:crm.case:0
@@ -2689,7 +2715,7 @@ msgstr ""
 #: selection:crm.new.send.mail,init,state:0
 #: view:crm.opportunity:0
 msgid "Done"
-msgstr ""
+msgstr "Completato"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2699,7 +2725,7 @@ msgstr "Intervallo Massimo"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
 msgid "All Opportunities"
-msgstr ""
+msgstr "Tutte le Opportunità"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2748,7 +2774,7 @@ msgstr ""
 #. module: crm
 #: field:crm.menu.config_wizard,helpdesk:0
 msgid "Helpdesk"
-msgstr ""
+msgstr "Helpdesk"
 
 #. module: crm
 #: field:crm.case,user_id:0
@@ -2770,18 +2796,18 @@ msgstr "Responsabile"
 #: model:crm.case.stage,name:crm.stage_claim4
 #: model:crm.case.stage,name:crm.stage_meet3
 msgid "Invalid"
-msgstr ""
+msgstr "Non valido"
 
 #. module: crm
 #: wizard_button:crm.job.meeting_set,init,order:0
 #: wizard_button:crm.phonecall.meeting_set,init,order:0
 msgid "Set Meeting"
-msgstr ""
+msgstr "Fissa la Riunione"
 
 #. module: crm
 #: field:crm.menu.config_wizard,meeting:0
 msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Calendario Riunioni"
 
 #. module: crm
 #: view:crm.case:0
@@ -2795,11 +2821,13 @@ msgid ""
 "You can not escalate this case.\n"
 "You are already at the top level."
 msgstr ""
+"Non è possibile aumentare questo caso.\n"
+"Sì è già al massimo livello."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Name"
-msgstr ""
+msgstr "Nome iniziativa"
 
 #. module: crm
 #: view:crm.claim:0
@@ -2814,28 +2842,29 @@ msgstr "Massimo Storico Contatti"
 #. module: crm
 #: view:crm.lead:0
 msgid "Meeting For Leads Generation"
-msgstr ""
+msgstr "Riunione per Creare Iniziative"
 
 #. module: crm
 #: wizard_view:crm.lead.opportunity_set,create_partner:0
 #: wizard_view:crm.lead.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this lead ?"
 msgstr ""
+"Si è sicuri di voler creare un partner da questo contatto privilegiato?"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job6
 msgid "Refused by Employee"
-msgstr ""
+msgstr "Rifiutato da dipendente"
 
 #. module: crm
 #: field:crm.case,partner_name:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Nome dipendente"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job2
 msgid "First Interview"
-msgstr ""
+msgstr "Primo colloquio"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -2843,17 +2872,17 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Month"
-msgstr ""
+msgstr "Questo Mese"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Availability (weeks)"
-msgstr ""
+msgstr "Disponibilità (settimane)"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Opportunities Tree"
-msgstr ""
+msgstr "Struttura Opportunità"
 
 #. module: crm
 #: help:crm.case,state:0
@@ -2875,7 +2904,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.email.add.cc,name:0
 msgid "Email Address"
-msgstr ""
+msgstr "Indirizzo Email"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2889,17 +2918,17 @@ msgstr ""
 #. module: crm
 #: field:crm.case,case_id:0
 msgid "Related Case"
-msgstr ""
+msgstr "Caso correlato"
 
 #. module: crm
 #: field:crm.case.rule,server_action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Azione Server"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_claim0
 msgid "All Claims"
-msgstr ""
+msgstr "Tutte le Richieste"
 
 #. module: crm
 #: field:crm.case.log,user_id:0
@@ -2910,12 +2939,12 @@ msgstr "Utente Responsabile"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Email not sent !"
-msgstr ""
+msgstr "Email non spedita"
 
 #. module: crm
 #: wizard_field:crm.phonecall.partner_create,init,close:0
 msgid "Close Phonecall"
-msgstr ""
+msgstr "Chiudi Telefonata"
 
 #. module: crm
 #: field:crm.case,email_last:0
@@ -2930,7 +2959,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund4
 msgid "Demand Draft"
-msgstr ""
+msgstr "Bozza di domanda"
 
 #. module: crm
 #: field:crm.case,id:0
@@ -2946,7 +2975,7 @@ msgstr "Riepilogo Log"
 #: wizard_field:crm.lead.opportunity_set,opportunity,name:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,name:0
 msgid "Opportunity Summary"
-msgstr ""
+msgstr "Riepilogo Opportunità"
 
 #. module: crm
 #: view:crm.case:0
@@ -2967,7 +2996,7 @@ msgstr "Descrizione Caso"
 #: wizard_field:crm.job.reschedule_phone_call,init,user_id:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Assegna A"
 
 #. module: crm
 #: field:crm.case,date_action_last:0
@@ -2977,22 +3006,22 @@ msgstr "Ultima Azione"
 #. module: crm
 #: field:crm.case,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Durata"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_stage
 msgid "Cases by section, Category and stage"
-msgstr ""
+msgstr "Casi per sezione, Categoria e Scenario"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Hired"
-msgstr ""
+msgstr "Candidato Assunto"
 
 #. module: crm
 #: field:crm.menu.config_wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "Processo di assunzione per assegnazione posti di lavoro"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_52
@@ -3003,12 +3032,12 @@ msgstr "Tutti i Casi"
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this lead."
-msgstr ""
+msgstr "Un partner è già definito in questo contatto privilegiato"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Source"
-msgstr ""
+msgstr "Origine Iniziativa"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,nbr:0
@@ -3016,7 +3045,7 @@ msgstr ""
 #: field:report.crm.case.section.categ2,nbr:0
 #: field:report.crm.case.section.stage,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "Numero di Casi"
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -3037,7 +3066,7 @@ msgstr "Segmentazione"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Form"
-msgstr ""
+msgstr "Modulo Fondi"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3048,17 +3077,17 @@ msgstr ""
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Create a new partner"
-msgstr ""
+msgstr "Crea un nuovo partner"
 
 #. module: crm
 #: field:crm.case,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Azienda"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "In Process"
-msgstr ""
+msgstr "In corso"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -3074,18 +3103,18 @@ msgstr "%(case_user)s = Nome Responsabile"
 #: wizard_field:crm.job.reschedule_phone_call,init,note:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,note:0
 msgid "Goals"
-msgstr ""
+msgstr "Obiettivi"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_tree
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Type"
-msgstr ""
+msgstr "Casi per Sezione e Tipo"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Servizi Post Vendita"
 
 #. module: crm
 #: wizard_button:caldav.crm.export,init,end:0
@@ -3093,12 +3122,12 @@ msgstr ""
 #: wizard_button:caldav.crm.subscribe,display,end:0
 #: view:crm.email.add.cc:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Nome file"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3122,13 +3151,13 @@ msgstr "Errore!"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_claim_assign_wizard
 msgid "crm.claim.assign_wizard"
-msgstr ""
+msgstr "crm.claim.assign_wizard"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_job
 msgid "All Jobs Requests"
-msgstr ""
+msgstr "Tutte le Richieste di Lavoro"
 
 #. module: crm
 #: selection:crm.case,state:0
@@ -3140,7 +3169,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,state:0
 #: selection:report.crm.case.section.stage,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Annullato"
 
 #. module: crm
 #: view:crm.job:0
@@ -3157,7 +3186,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Relevant"
-msgstr ""
+msgstr "Rilevante"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0
@@ -3172,7 +3201,7 @@ msgstr ""
 #. module: crm
 #: wizard_view:caldav.crm.import,init:0
 msgid "Import ICS"
-msgstr ""
+msgstr "Importa ICS"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -3192,7 +3221,7 @@ msgstr "Comunicazione storia del caso"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ
 msgid "Cases by Opportunities and Type"
-msgstr ""
+msgstr "Casi per Opportunità e Tipo"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3225,7 +3254,7 @@ msgstr "Espressione Opzionale"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund1
 msgid "Social Rehabilitation And Rural Upliftment"
-msgstr ""
+msgstr "Reinserimento sociale e crescita rurale"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -3236,7 +3265,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
 msgid "New"
-msgstr ""
+msgstr "Nuovo"
 
 #. module: crm
 #: field:crm.case,description:0
@@ -3275,7 +3304,7 @@ msgstr "E-Mail di Promemoria (include il contenuto del caso)"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_stage
 msgid "Cases by Leads and Stage"
-msgstr ""
+msgstr "Casi per Iniziativa e Scenario"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
@@ -3295,7 +3324,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_64
 msgid "Reporting"
-msgstr ""
+msgstr "Rapporto"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3326,7 +3355,7 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Expected Salary"
-msgstr ""
+msgstr "Stipendio Previsto"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_configuration
@@ -3336,12 +3365,12 @@ msgstr "Configurazione"
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_new_send_mail
 msgid "Send New Mail"
-msgstr ""
+msgstr "Spedisci Nuova Email"
 
 #. module: crm
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Argomenti non validi"
 
 #. module: crm
 #: field:crm.meeting,transparent:0
@@ -3351,13 +3380,13 @@ msgstr ""
 #. module: crm
 #: view:crm.case:0
 msgid "My Cases"
-msgstr ""
+msgstr "I Miei Casi"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead7
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Word of mouth"
-msgstr ""
+msgstr "A voce"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3368,32 +3397,32 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Converti ad Opportunità"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone1
 msgid "Planned"
-msgstr ""
+msgstr "Pianificato"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet3
 msgid "Customer Office"
-msgstr ""
+msgstr "Ufficio cliente"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Email"
-msgstr ""
+msgstr "Email del candidato"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Sales Stage: "
-msgstr ""
+msgstr "Scenario di vendita: "
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Type of Action"
-msgstr ""
+msgstr "Tipo di azione"
 
 #. module: crm
 #: field:crm.case.rule,act_user_id:0
@@ -3403,7 +3432,7 @@ msgstr "Imposta Responsabile"
 #. module: crm
 #: view:crm.job:0
 msgid "Meeting With Candidates"
-msgstr ""
+msgstr "Riunione con candidati"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3427,7 +3456,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "December"
-msgstr ""
+msgstr "Dicembre"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -3447,7 +3476,7 @@ msgstr "Invia a Partner"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Tree"
-msgstr ""
+msgstr "Struttura Fondi"
 
 #. module: crm
 #: field:crm.case.rule,act_method:0
@@ -3457,7 +3486,7 @@ msgstr "Metodo Chiamata Oggetto"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1
 msgid "All Funds"
-msgstr ""
+msgstr "Tutti i Fondi"
 
 #. module: crm
 #: field:crm.case.section,calendar:0
@@ -3469,12 +3498,12 @@ msgstr "Calendario"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job1
 msgid "Salesman"
-msgstr ""
+msgstr "Venditore"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support_help
 msgid "HelpDesk"
-msgstr ""
+msgstr "HelpDesk"
 
 #. module: crm
 #: field:crm.case,ref2:0
@@ -3491,12 +3520,12 @@ msgstr "Vendite Acquisti"
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "Mettere a scandenziario una riunione"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund4
 msgid "Arts And Culture"
-msgstr ""
+msgstr "Arti e cultura"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3504,7 +3533,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
-msgstr ""
+msgstr "In uscita"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3515,7 +3544,7 @@ msgstr "Storicizza"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confermato"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -3527,7 +3556,7 @@ msgstr "Non in esecuzione"
 #: wizard_field:crm.lead.opportunity_set,opportunity,probability:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "Probabilità di successo"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3552,7 +3581,7 @@ msgstr "Ritardo dopo Data di Avvio Automatico"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Details"
-msgstr ""
+msgstr "Dettagli contatto privilegiato"
 
 #. module: crm
 #: field:crm.case.rule,act_section_id:0
@@ -3583,12 +3612,12 @@ msgstr ""
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "Si deve verificare che questo partner non esista già."
 
 #. module: crm
 #: view:crm.job:0
 msgid "Qualication"
-msgstr ""
+msgstr "Qualifica"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3603,14 +3632,14 @@ msgstr ""
 #: field:report.crm.case.section.categ2,user_id:0
 #: field:report.crm.case.section.stage,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Utente"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_categ2
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_categ2_tree
 #: view:report.crm.case.section.categ.categ2:0
 msgid "Cases by Section, Category and Type"
-msgstr ""
+msgstr "Casi per Sezione, Categoria e Tipo"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3618,12 +3647,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job2
 msgid "Licenced"
-msgstr ""
+msgstr "Autorizzato"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
@@ -3639,7 +3668,7 @@ msgstr "Sezione Superiore"
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_reschedule_phone_call
 #: model:ir.actions.wizard,name:crm.wizard_crm_opportunity_reschedule_phone_call
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "Pianifica telefonata"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3654,12 +3683,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "January"
-msgstr ""
+msgstr "Gennaio"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "Contratto"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -3674,7 +3703,7 @@ msgstr "Entrata Pianificata"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund3
 msgid "Healthcare"
-msgstr ""
+msgstr "Assistenza sanitaria"
 
 #. module: crm
 #: view:crm.case:0
@@ -3688,7 +3717,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:crm.phonecall.assign_wizard:0
 msgid "Assign"
-msgstr ""
+msgstr "Assegna"
 
 #. module: crm
 #: field:crm.case,partner_address_id:0
@@ -3698,7 +3727,7 @@ msgstr "Contatto Partner"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet1
 msgid "Office"
-msgstr ""
+msgstr "Ufficio"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_fundraising
@@ -3732,7 +3761,7 @@ msgstr "Chiudi"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_helpdesk_assign_wizard
 msgid "crm.helpdesk.assign_wizard"
-msgstr ""
+msgstr "crm.helpdesk.assign_wizard"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3748,28 +3777,28 @@ msgstr "Codice Sezione"
 #: wizard_field:crm.job.meeting_set,init,date:0
 #: wizard_field:crm.phonecall.meeting_set,init,date:0
 msgid "Meeting date"
-msgstr ""
+msgstr "Data di riunione"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "CONFIDENTIAL"
-msgstr ""
+msgstr "CONFIDENZIALE"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_body:0
 msgid "Content of mail"
-msgstr ""
+msgstr "Contenuto dell'email"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_meet2
 msgid "Not fixed"
-msgstr ""
+msgstr "Non fissato"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead3
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Employee"
-msgstr ""
+msgstr "Dipendente"
 
 #. module: crm
 #: field:crm.case,email_from:0
@@ -3779,7 +3808,7 @@ msgstr "Email Partner"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "% = The '%' Character"
-msgstr ""
+msgstr "% = Il Carattere '%'"
 
 #. module: crm
 #: view:crm.case:0
@@ -3800,12 +3829,12 @@ msgstr "Descrizione"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "May"
-msgstr ""
+msgstr "Maggio"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Note Interne"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_user:0
@@ -3825,7 +3854,7 @@ msgstr ""
 #: view:crm.opportunity:0
 #: wizard_field:crm.send.mail,init,cc:0
 msgid "CC"
-msgstr ""
+msgstr "CC"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
@@ -3835,7 +3864,7 @@ msgstr "Obbligatorio/Opzionale"
 #. module: crm
 #: wizard_button:caldav.crm.import,init,open:0
 msgid "_Import"
-msgstr ""
+msgstr "_Import"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3868,14 +3897,14 @@ msgstr "Minima"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "February"
-msgstr ""
+msgstr "Febbraio"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_case
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "Pianifica una Riunione"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3895,7 +3924,7 @@ msgstr ""
 #: wizard_view:crm.new.send.mail,init:0
 #: wizard_view:crm.send.mail,init:0
 msgid "Mass Mailing"
-msgstr ""
+msgstr "Mailing di Massa"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3908,22 +3937,22 @@ msgstr "Azioni E-mail"
 #: field:report.crm.case.section.categ2,name:0
 #: field:report.crm.case.section.stage,name:0
 msgid "Year"
-msgstr ""
+msgstr "Anno"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund1
 msgid "Cash"
-msgstr ""
+msgstr "Contante"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds by Categories"
-msgstr ""
+msgstr "Fondi per Categoria"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "Primo contatto il nuovo candidato"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3931,17 +3960,17 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "April"
-msgstr ""
+msgstr "Aprile"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_meet5
 msgid "Future"
-msgstr ""
+msgstr "Futuro"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,file_path:0
 msgid "Save ICS file"
-msgstr ""
+msgstr "Salva file ICS"
 
 #. module: crm
 #: wizard_field:caldav.crm.subscribe,init,url_path:0
@@ -3966,7 +3995,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_export
 msgid "Export ICS File"
-msgstr ""
+msgstr "Esporta File ICS"
 
 #. module: crm
 #: field:crm.case.rule,sequence:0
@@ -3984,7 +4013,7 @@ msgstr ""
 #. module: crm
 #: wizard_view:caldav.crm.import,display:0
 msgid "Import Message"
-msgstr ""
+msgstr "Importa Messaggio"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -4005,12 +4034,12 @@ msgstr ""
 #. module: crm
 #: field:crm.menu.config_wizard,fund:0
 msgid "Fund Raising Operations"
-msgstr ""
+msgstr "Operazioni di ricerca fondi"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "Newsletter"
 
 #~ msgid "My Draft "
 #~ msgstr "Le Mie Bozze di "
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 5d55f1e962d..0382786e3b6 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.po
@@ -1,62 +1,68 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* crm
+#	* crm
 #
 msgid ""
 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:11+0000\n"
-"PO-Revision-Date: 2010-01-05 10:44+0000\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"
 "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: 2009-12-16 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-01-24 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: field:crm.email.add.cc,name:0
 msgid "Send to"
-msgstr ""
+msgstr "Enviar para"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
 msgid ""
-"This property defines the list of date/time exceptions for arecurring "
-"calendar component."
+"This property defines the list                 of date/time exceptions for "
+"arecurring calendar component."
 msgstr ""
+"Esta propriedade define a lista de excepções de data/tempo para componentes "
+"de calendário recorrentes."
 
 #. module: crm
 #: 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."
+msgid ""
+"Check this if you want the rule to send an email to the responsible person."
 msgstr ""
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
 msgid "Cases by section and category2"
-msgstr ""
+msgstr "Casos por secção e categoria 2"
 
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
 msgid "Close Lead"
-msgstr ""
+msgstr "Fechar dica"
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "    7 Days    "
 msgstr ""
 
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Gere um serviço de Helpdesk"
 
 #. module: crm
 #: view:crm.job:0
@@ -81,10 +87,11 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Nome do Estágio"
 
 #. module: crm
-#: view:crm.case:0 view:crm.case.history:0
+#: view:crm.case:0
+#: view:crm.case.history:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act
 #: model:ir.actions.act_window,name:crm.crm_case_section_open_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
@@ -104,12 +111,12 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_hr
 msgid "Human Resources"
-msgstr ""
+msgstr "Recursos humanos"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
 msgid "Cases by Opportunities, Category and Type"
-msgstr ""
+msgstr "Casos por oportunidade, categoria e tipo"
 
 #. module: crm
 #: help:crm.menu.config_wizard,claims:0
@@ -117,63 +124,66 @@ msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
+"Gere as reclamações de fornecedores e clientes, incluindo as suas acções "
+"correctivas ou preventivas."
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "Montante"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Normal ou reunião telefonica por oportunidade"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim2
 #: model:crm.case.stage,name:crm.stage_meet1
 msgid "Fixed"
-msgstr ""
+msgstr "Resolvido"
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/wizard/crm_job_wizard.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/wizard/crm_job_wizard.py:0
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Aviso!"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Please specify user's email address !"
-msgstr ""
+msgstr "Por favor especifique o email do utilizador"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Campaign"
-msgstr ""
+msgstr "Campanha"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "Pesquisar oportunidades"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
 #: view:report.crm.case.section.stage:0
 msgid "Cases by Section and Stage"
-msgstr ""
+msgstr "Casos por secção e Estágio"
 
 #. module: crm
 #: wizard_field:crm.job.meeting_set,init,duration:0
 #: wizard_field:crm.phonecall.meeting_set,init,duration:0
 msgid "Duration (Hours)"
-msgstr ""
+msgstr "Duração (Horas)"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
 msgid "TRANSPARENT"
-msgstr ""
+msgstr "TRANSPARENT"
 
 #. module: crm
 #: help:crm.case.rule,server_action_id:0
@@ -188,17 +198,22 @@ msgid ""
 "Section to which Case belongs to. Define Responsible user and Email account "
 "for mail gateway."
 msgstr ""
+"Secção à qual o Caso pertence. Defina o utilizador responsável e o endereço "
+"de correio electrónico."
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,partner_id:0
+#: view:crm.case:0
+#: field:crm.case,partner_id:0
 #: model:crm.case.categ,name:crm.categ_lead4
 #: model:crm.case.categ,name:crm.categ_oppor4
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,partner_id:0
-#: field:crm.case.rule,trg_partner_id:0 selection:crm.email.add.cc,name:0
+#: field:crm.case.rule,trg_partner_id:0
+#: selection:crm.email.add.cc,name:0
 #: field:crm.email.add.cc,partner_id:0
 #: wizard_field:crm.lead.opportunity_set,create_partner,partner_id:0
 #: wizard_field:crm.lead.opportunity_set,opportunity,partner_id:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: wizard_field:crm.phonecall.opportunity_set,create_partner,partner_id:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
 #: model:process.node,name:crm.process_node_partner0
@@ -206,8 +221,10 @@ msgid "Partner"
 msgstr "Terceiro"
 
 #. module: crm
-#: field:crm.case.categ,section_id:0 field:crm.case.category2,section_id:0
-#: view:crm.case.section:0 field:crm.case.section,name:0
+#: field:crm.case.categ,section_id:0
+#: field:crm.case.category2,section_id:0
+#: view:crm.case.section:0
+#: field:crm.case.section,name:0
 #: field:crm.case.stage,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
@@ -216,7 +233,7 @@ msgstr "Secção de processos"
 #. module: crm
 #: view:crm.job:0
 msgid "Proposed Salary"
-msgstr ""
+msgstr "Salário proposto"
 
 #. module: crm
 #: help:crm.case.section,sequence:0
@@ -229,12 +246,12 @@ msgstr ""
 #: model:crm.case.categ,name:crm.categ_meet3
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Telefonema"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_stage
 msgid "Cases by section and stage"
-msgstr ""
+msgstr "Casos por secção e estágio"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_email:0
@@ -252,10 +269,14 @@ msgid "Special Keywords to Be Used in The Body"
 msgstr "Palavras chaves especiais a serem usadas no corpo"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Enviar novo email"
 
 #. module: crm
 #: view:crm.case.history:0
@@ -277,11 +298,12 @@ msgstr "Secções"
 #: help:crm.menu.config_wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
 msgstr ""
+"Rastreia oportunidade de negócio identificadas para o seu canal de vendas."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Dates"
-msgstr ""
+msgstr "Datas de Excepção"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -291,17 +313,17 @@ msgstr "Data da última acção"
 #. module: crm
 #: view:crm.job:0
 msgid "Appreciation"
-msgstr ""
+msgstr "Apreciação"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job3
 msgid "Second Interview"
-msgstr ""
+msgstr "Segunda entrevista"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
 msgid "Subscribe to a Remote calendar"
-msgstr ""
+msgstr "Subscreva uma calendário remoto"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
@@ -313,11 +335,15 @@ msgstr "Categorias"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Aviso!"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Dates"
 msgstr "Datas"
 
@@ -329,23 +355,24 @@ msgstr "Teste de segmentação"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr ""
+msgstr "Parceiro potencial"
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.opportunity:0
+#: view:crm.fundraising:0
+#: view:crm.opportunity:0
 msgid "Description Information"
-msgstr ""
+msgstr "Informação descritiva"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Nome do contacto"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Link to an existing partner"
-msgstr ""
+msgstr "Ligar a um parceiro existente"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_range_type:0
@@ -353,15 +380,19 @@ msgid "Delay type"
 msgstr "Tipo de atraso"
 
 #. module: crm
-#: view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Next Interview"
-msgstr ""
+msgstr "Próxima entrevista"
 
 #. module: crm
 #: field:crm.case.rule,regex_history:0
@@ -376,7 +407,7 @@ msgstr ""
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Oportunidade de uma reunião"
 
 #. module: crm
 #: help:crm.case,canal_id:0
@@ -389,7 +420,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Rules"
-msgstr ""
+msgstr "Regras de excepção"
 
 #. module: crm
 #: field:crm.menu.config_wizard,opportunity:0
@@ -400,7 +431,7 @@ msgstr "Oportunidades de negócio"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "Aceite como reclamação"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -408,6 +439,8 @@ msgid ""
 "The rule use a AND operator. The case must match all non empty fields so "
 "that the rule execute the action described in the 'Actions' tab."
 msgstr ""
+"A regra usa o operador \"E\". O caso tem de corresponder com todos os campos "
+"não vazios, para que a regra execute a acção descrita no separador 'Acções'."
 
 #. module: crm
 #: field:crm.case,history_line:0
@@ -422,26 +455,27 @@ msgstr "%(email_from)s = Partner email"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 msgid "Dead"
-msgstr ""
+msgstr "Morto"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm Meeting"
-msgstr ""
+msgstr "Confirmar Reunião"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead1
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Existing Customer"
-msgstr ""
+msgstr "Cliente existente"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet2
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #. module: crm
-#: field:crm.case,categ_id:0 field:crm.case.rule,trg_categ_id:0
+#: field:crm.case,categ_id:0
+#: field:crm.case.rule,trg_categ_id:0
 #: wizard_field:crm.job.reschedule_phone_call,init,category_id:0
 #: view:crm.opportunity:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,category_id:0
@@ -456,7 +490,7 @@ msgstr "Categoria"
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_stage_tree
 #: view:report.crm.case.section.categ.stage:0
 msgid "Cases by Section, Category and Stage"
-msgstr ""
+msgstr "Casos por secção, categopria e estágio"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_watchers:0
@@ -468,7 +502,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Privacy"
-msgstr ""
+msgstr "Privacidade"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -476,8 +510,12 @@ msgid "%(partner)s = Partner name"
 msgstr "%(partner)s = Partner name"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Action Information"
 msgstr "informação de activação"
 
@@ -509,7 +547,9 @@ msgid "Open Cases"
 msgstr "Abrir processos"
 
 #. module: crm
-#: field:crm.case.log,name:0 view:crm.claim:0 view:crm.job:0
+#: field:crm.case.log,name:0
+#: view:crm.claim:0
+#: view:crm.job:0
 msgid "Status"
 msgstr "Estados"
 
@@ -521,7 +561,7 @@ msgstr "Estados"
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
 msgid "Create Opportunity"
-msgstr ""
+msgstr "Criar Oportunidade"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -529,18 +569,21 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Tree"
-msgstr ""
+msgstr "Árvore de reuniões"
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.fundraising:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 #, python-format
 msgid "Escalate"
 msgstr "Encaminhar"
@@ -548,7 +591,7 @@ msgstr "Encaminhar"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
 msgid "All Meetings"
-msgstr ""
+msgstr "Todos as reuniões"
 
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
@@ -567,7 +610,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "June"
-msgstr ""
+msgstr "Junho"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -577,7 +620,7 @@ msgstr "Default (0=None)"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job7
 msgid "Refused by Company"
-msgstr ""
+msgstr "Recusado pela companhia"
 
 #. module: crm
 #: field:crm.case,planned_revenue:0
@@ -595,12 +638,12 @@ msgstr "Permite Eliminar"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor3
 msgid "Value Proposition"
-msgstr ""
+msgstr "Preposta de valor"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -610,20 +653,23 @@ msgstr "%(case_id)s = Case ID"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor2
 msgid "New Business"
-msgstr ""
+msgstr "Novo Negócio"
 
 #. module: crm
 #: help:crm.case,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Estas pessoas vão receber email"
 
 #. module: crm
 #: help:crm.case.section,calendar:0
 msgid "Allows to show calendar"
-msgstr ""
+msgstr "Permite mostrar o calendário"
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "   Today   "
 msgstr ""
 
@@ -631,7 +677,7 @@ msgstr ""
 #: wizard_view:crm.job.reschedule_phone_call,init:0
 #: wizard_view:crm.opportunity.reschedule_phone_call,init:0
 msgid "Phone Call Description"
-msgstr ""
+msgstr "Descrição do telefonema"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -661,11 +707,13 @@ msgstr ""
 msgid ""
 "You must define a responsible user for this case in order to use this action!"
 msgstr ""
+"Tem de definir o utilizador responsável para este caso a fim de utilizar "
+"esta acção!"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Atribuído a"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -675,17 +723,20 @@ msgstr "Evento dos terceiros"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job4
 msgid "Contract Proposed"
-msgstr ""
+msgstr "Proposta de Contrato"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main
 msgid "Jobs - Hiring Process"
-msgstr ""
+msgstr "Empregos - Processo de recrutamento"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Related Cases"
-msgstr ""
+msgstr "Casos relacionados"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -693,44 +744,48 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Communication history"
 msgstr "Histórico de comunicação"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "New Claims"
-msgstr ""
+msgstr "Novas reclamações"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Form"
-msgstr ""
+msgstr "Formulário de reuniões"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor5
 msgid "Negotiation/Review"
-msgstr ""
+msgstr "Negociação/Revisão"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "Um parceiro já se encontra definido neste telefonema"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_stage
 msgid "Cases by Opportunities and Stage"
-msgstr ""
+msgstr "Casos por oportunidades e Estágio"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Date of Claim"
-msgstr ""
+msgstr "Data da Reclamação"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -740,22 +795,23 @@ msgstr "Linhas de segmentação do terceiro"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
 msgid "All Leads"
-msgstr ""
+msgstr "Todas as dicas"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Formulários de dicas"
 
 #. module: crm
-#: view:crm.segmentation:0 model:ir.model,name:crm.model_crm_segmentation
+#: view:crm.segmentation:0
+#: model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
 msgstr "Segmentação do terceiro"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job5
 msgid "Contract Signed"
-msgstr ""
+msgstr "Contrato Assinado"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
@@ -765,10 +821,11 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor1
 msgid "Existing Business"
-msgstr ""
+msgstr "Negócio Existente"
 
 #. module: crm
-#: field:crm.case,probability:0 field:crm.case.categ,probability:0
+#: field:crm.case,probability:0
+#: field:crm.case.categ,probability:0
 msgid "Probability (%)"
 msgstr "Probabilidade (%)"
 
@@ -785,7 +842,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.case.rule:0 model:ir.model,name:crm.model_crm_case_rule
+#: view:crm.case.rule:0
+#: model:ir.model,name:crm.model_crm_case_rule
 msgid "Case Rule"
 msgstr "Regra do processo"
 
@@ -793,23 +851,28 @@ msgstr "Regra do processo"
 #: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #: code:addons/crm/wizard/crm_opportunity_wizard.py:0
-#: code:addons/crm/wizard/crm_phonecall_wizard.py:0 view:crm.opportunity:0
+#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
+#: view:crm.opportunity:0
 #: view:crm.phonecall:0
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Oportunidade"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Emails"
-msgstr ""
+msgstr "Emails"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead7
 msgid "Television"
-msgstr ""
+msgstr "Televisão"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -819,18 +882,18 @@ msgstr "Parar processo"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim1
 msgid "Factual Claims"
-msgstr ""
+msgstr "Alegações factuais"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "Pesquisar telefonemas"
 
 #. module: crm
 #: wizard_button:crm.lead.opportunity_set,create_partner,create:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
 msgid "Continue"
-msgstr ""
+msgstr "Continuar"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -845,13 +908,13 @@ msgstr "Valor"
 #. module: crm
 #: help:caldav.crm.export,init,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "Guardar no formato .ics"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,text:0
 #: wizard_field:crm.send.mail,init,text:0
 msgid "Message"
-msgstr ""
+msgstr "Mensagem"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -885,17 +948,17 @@ msgstr "Definir status como"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email!"
-msgstr ""
+msgstr "Email!"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead6
 msgid "Radio"
-msgstr ""
+msgstr "Rádio"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity_assign_wizard
 msgid "crm.opportunity.assign_wizard"
-msgstr ""
+msgstr "crm.opportunity.assign_wizard"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -918,11 +981,12 @@ msgid "Gives the sequence order when displaying a list of case stages."
 msgstr ""
 
 #. module: crm
-#: model:crm.case.section,name:crm.section_support3 view:crm.opportunity:0
+#: model:crm.case.section,name:crm.section_support3
+#: view:crm.opportunity:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr ""
+msgstr "Opurtunidades"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -948,10 +1012,11 @@ msgstr "Montante de compra"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Direction"
-msgstr ""
+msgstr "Direcção"
 
 #. module: crm
-#: help:crm.case,email_cc:0 help:crm.case.rule,act_email_cc:0
+#: help:crm.case,email_cc:0
+#: help:crm.case.rule,act_email_cc:0
 msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
@@ -963,7 +1028,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "March"
-msgstr ""
+msgstr "Março"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1001,7 +1066,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_partner_create
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_partner_create
 msgid "Create Partner"
-msgstr ""
+msgstr "Criar parceiro"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1016,15 +1081,16 @@ msgstr ""
 #. module: crm
 #: view:crm.fundraising:0
 msgid "My Funds"
-msgstr ""
+msgstr "Meus fundos"
 
 #. module: crm
 #: field:crm.case,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Telemóvel"
 
 #. module: crm
-#: field:crm.case.rule,name:0 field:crm.segmentation.line,name:0
+#: field:crm.case.rule,name:0
+#: field:crm.segmentation.line,name:0
 msgid "Rule Name"
 msgstr "Nome da regra"
 
@@ -1046,7 +1112,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Minhas reuniões"
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1056,7 +1122,7 @@ msgstr "Nome da categoria do processo"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "Preventivo"
 
 #. module: crm
 #: field:crm.case.rule,act_email_cc:0
@@ -1066,15 +1132,17 @@ msgstr "Adicionar observadores (como copia)"
 #. module: crm
 #: wizard_view:caldav.crm.export,init:0
 msgid "Export ICS"
-msgstr ""
+msgstr "Exportar ICS"
 
 #. module: crm
-#: code:addons/crm/crm_claim.py:0 code:addons/crm/crm_helpdesk.py:0
-#: code:addons/crm/crm_meeting.py:0 code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/crm_claim.py:0
+#: code:addons/crm/crm_helpdesk.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "You can not assign Closed Case."
-msgstr ""
+msgstr "Não pode atribuir um caso encerrado."
 
 #. module: crm
 #: help:crm.case.rule,act_remind_partner:0
@@ -1083,12 +1151,14 @@ msgid ""
 msgstr "Marque, se quer que a regra envie um lembrete por email ao parceiro"
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:0 code:addons/crm/wizard/crm_job_wizard.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/wizard/crm_job_wizard.py:0
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
-#: model:crm.case.section,name:crm.section_support1 view:crm.meeting:0
+#: model:crm.case.section,name:crm.section_support1
+#: view:crm.meeting:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "Reuniões"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1101,8 +1171,10 @@ msgid "Next Action"
 msgstr "Próxima Acção"
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,date_deadline:0
-#: selection:crm.case.rule,trg_date_type:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: field:crm.case,date_deadline:0
+#: selection:crm.case.rule,trg_date_type:0
+#: view:crm.opportunity:0
 msgid "Deadline"
 msgstr "Prazo limite"
 
@@ -1111,12 +1183,12 @@ msgstr "Prazo limite"
 #: wizard_button:caldav.crm.import,init,end:0
 #: wizard_button:caldav.crm.subscribe,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancelar"
 
 #. module: crm
 #: field:crm.case,category2_id:0
 msgid "Category Name"
-msgstr ""
+msgstr "Nome da categoria"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1134,16 +1206,18 @@ msgid "Category of case"
 msgstr "Categoria de processo"
 
 #. module: crm
-#: field:crm.email.add.cc,subject:0 view:crm.meeting:0
-#: wizard_field:crm.new.send.mail,init,subject:0 view:crm.phonecall:0
+#: field:crm.email.add.cc,subject:0
+#: view:crm.meeting:0
+#: wizard_field:crm.new.send.mail,init,subject:0
+#: view:crm.phonecall:0
 #: wizard_field:crm.send.mail,init,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Assunto"
 
 #. module: crm
 #: field:crm.meeting,attendees:0
 msgid "Attendees"
-msgstr ""
+msgstr "Participantes"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
@@ -1187,35 +1261,37 @@ msgstr ""
 #. module: crm
 #: view:crm.claim:0
 msgid "Pending Claims"
-msgstr ""
+msgstr "Queixas pendentes"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_stage
 msgid "Cases by Opportunities, Category and Stage"
-msgstr ""
+msgstr "Casos por oportunidades, categoria e estágios"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead4
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: crm
-#: field:crm.case,som:0 field:crm.case.log,som:0
+#: field:crm.case,som:0
+#: field:crm.case.log,som:0
 #: selection:crm.segmentation.line,expr_name:0
 msgid "State of Mind"
 msgstr "Estado da mente"
 
 #. module: crm
-#: view:crm.claim:0 view:crm.meeting:0
+#: view:crm.claim:0
+#: view:crm.meeting:0
 #: field:report.crm.case.section.categ.categ2,category2_id:0
 #: field:report.crm.case.section.categ2,category2_id:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Refused"
-msgstr ""
+msgstr "Candidato Recusado"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1225,7 +1301,7 @@ msgstr "Calcular segmentação"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Email"
-msgstr ""
+msgstr "Email com dica"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation-act
@@ -1241,10 +1317,11 @@ msgid "Creation Date"
 msgstr "Data de Criação"
 
 #. module: crm
-#: view:crm.meeting:0 view:crm.phonecall:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
 #: model:process.node,name:crm.process_node_meeting0
 msgid "Meeting"
-msgstr ""
+msgstr "Reunião"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1252,15 +1329,20 @@ msgid "%(partner_email)s = Partner email"
 msgstr "%(partner_email)s = Partner email"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "Reset to Draft"
 msgstr "Reverter para rascunho"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_categ2
 msgid "Cases by section, Category and Category2"
-msgstr ""
+msgstr "Casos por secção, categoria e categoria2"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor6
@@ -1277,13 +1359,14 @@ msgid "Open cases"
 msgstr "Processos abertos"
 
 #. module: crm
-#: field:crm.case,stage_id:0 view:crm.case.stage:0
+#: field:crm.case,stage_id:0
+#: view:crm.case.stage:0
 #: field:report.crm.case.section.categ.categ2,stage_id:0
 #: field:report.crm.case.section.categ.stage,stage_id:0
 #: field:report.crm.case.section.categ2,stage_id:0
 #: field:report.crm.case.section.stage,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Estágio"
 
 #. module: crm
 #: constraint:ir.ui.view:0
@@ -1300,7 +1383,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund2
 msgid "Learning And Education"
-msgstr ""
+msgstr "Aprendizagem e Educação"
 
 #. module: crm
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
@@ -1313,29 +1396,31 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Estágios"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
 #: wizard_field:crm.lead.opportunity_set,opportunity,planned_revenue:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "Retorno Esperado"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "Data da reunião"
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.phonecall:0
 msgid "Convert to Partner"
-msgstr ""
+msgstr "Converter para Parceiro"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_meetall3
 msgid "Next Meetings"
-msgstr ""
+msgstr "Próximas Reuniões"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1346,12 +1431,12 @@ msgstr "ID máximo de terceiros processados"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "You can not delete this case. You should better cancel it."
-msgstr ""
+msgstr "Não pode eliminar este processo. O melhor a fazer é cancela-lo."
 
 #. module: crm
 #: wizard_button:caldav.crm.subscribe,init,open:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Subscrever"
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_from:0
@@ -1366,33 +1451,34 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "Queixas de valor"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,display:0
 msgid "Message..."
-msgstr ""
+msgstr "Mensagem..."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_assign_wizard
 msgid "crm.phonecall.assign_wizard"
-msgstr ""
+msgstr "crm.phonecall.assign_wizard"
 
 #. module: crm
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Category2"
-msgstr ""
+msgstr "Casos por seccção e categoria2"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "done"
-msgstr ""
+msgstr "concluído"
 
 #. module: crm
-#: view:crm.meeting:0 view:crm.phonecall:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
 msgid "Reminder"
-msgstr ""
+msgstr "Lembrete"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1407,7 +1493,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "open"
-msgstr ""
+msgstr "abrir"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_attach:0
@@ -1418,7 +1504,7 @@ msgstr "Lembrar com anexo"
 #: model:crm.case.categ,name:crm.categ_lead6
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Website"
-msgstr ""
+msgstr "Página de Internet"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_user:0
@@ -1440,23 +1526,25 @@ msgstr ""
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds"
-msgstr ""
+msgstr "Fundos"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "draft"
-msgstr ""
+msgstr "Rascunho"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim5
 #: model:crm.case.stage,name:crm.stage_meet4
 msgid "Awaiting Response"
-msgstr ""
+msgstr "A espera da Resposta"
 
 #. module: crm
-#: field:crm.case,date:0 field:crm.case.log,date:0
-#: selection:crm.case.rule,trg_date_type:0 view:crm.claim:0
+#: field:crm.case,date:0
+#: field:crm.case.log,date:0
+#: selection:crm.case.rule,trg_date_type:0
+#: view:crm.claim:0
 #: view:crm.phonecall:0
 msgid "Date"
 msgstr "Data"
@@ -1464,27 +1552,31 @@ msgstr "Data"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name"
-msgstr ""
+msgstr "Nome do Candidato"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead2
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Self Generated"
-msgstr ""
+msgstr "Gerado automaticamente"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "Não vai corrigir"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Converted"
-msgstr ""
+msgstr "Convertido"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Reply to Last Email"
 msgstr ""
 
@@ -1499,8 +1591,12 @@ msgid "Gives Location of Meeting"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "History"
 msgstr "Histórico"
 
@@ -1512,7 +1608,7 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Jobs - Recruitment Tree"
-msgstr ""
+msgstr "Empregos - arvore de recrutamento"
 
 #. module: crm
 #: field:crm.case.rule,regex_name:0
@@ -1520,12 +1616,13 @@ msgid "Regular Expression on Case Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,state:0 field:report.crm.case.section.categ.categ2,state:0
+#: field:crm.case,state:0
+#: field:report.crm.case.section.categ.categ2,state:0
 #: field:report.crm.case.section.categ.stage,state:0
 #: field:report.crm.case.section.categ2,state:0
 #: field:report.crm.case.section.stage,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: crm
 #: view:crm.case:0
@@ -1533,27 +1630,36 @@ msgid "Send Reminder"
 msgstr "Enviar lembrete"
 
 #. module: crm
-#: view:crm.case:0 view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.case:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "References"
 msgstr "Referências"
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #: wizard_button:crm.case.opportunity.partner_opportunity,init,end:0
-#: view:crm.claim:0 view:crm.claim.assign_wizard:0 view:crm.fundraising:0
+#: view:crm.claim:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.fundraising:0
 #: view:crm.helpdesk.assign_wizard:0
 #: wizard_button:crm.job.meeting_set,init,end:0
 #: wizard_button:crm.job.partner_create,init,end:0
-#: wizard_button:crm.job.reschedule_phone_call,init,end:0 view:crm.lead:0
+#: wizard_button:crm.job.reschedule_phone_call,init,end:0
+#: view:crm.lead:0
 #: wizard_button:crm.lead.opportunity_set,create_partner,end:0
 #: wizard_button:crm.lead.opportunity_set,opportunity,end:0
 #: wizard_button:crm.lead.partner_create,init,end:0
 #: view:crm.meeting.generic_wizard:0
-#: wizard_button:crm.new.send.mail,init,end:0 view:crm.opportunity:0
+#: wizard_button:crm.new.send.mail,init,end:0
+#: view:crm.opportunity:0
 #: view:crm.opportunity.assign_wizard:0
 #: wizard_button:crm.opportunity.reschedule_phone_call,init,end:0
-#: view:crm.phonecall:0 view:crm.phonecall.assign_wizard:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall.assign_wizard:0
 #: wizard_button:crm.phonecall.meeting_set,init,end:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,end:0
 #: wizard_button:crm.phonecall.opportunity_set,opportunity,end:0
@@ -1577,7 +1683,7 @@ msgstr ""
 #. module: crm
 #: view:crm.claim:0
 msgid "Type of claim"
-msgstr ""
+msgstr "Tipo de queixa"
 
 #. module: crm
 #: view:crm.case:0
@@ -1592,17 +1698,18 @@ msgstr "Descrição geral"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Other Info"
-msgstr ""
+msgstr "Outras Informações"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Claim Cost"
-msgstr ""
+msgstr "Custo da reclamação"
 
 #. module: crm
-#: view:crm.job:0 view:crm.opportunity:0
+#: view:crm.job:0
+#: view:crm.opportunity:0
 msgid "Schedule a Phone Call"
-msgstr ""
+msgstr "Agendar um telefonema"
 
 #. module: crm
 #: field:crm.case,ref:0
@@ -1622,7 +1729,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead2
 msgid "Mail"
-msgstr ""
+msgstr "Correio"
 
 #. module: crm
 #: field:crm.case.rule,act_priority:0
@@ -1632,7 +1739,7 @@ msgstr "Definir prioridade como"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor2
 msgid "Needs Analysis"
-msgstr ""
+msgstr "Precisa de análise"
 
 #. module: crm
 #: view:crm.claim:0
@@ -1647,7 +1754,7 @@ msgstr "Corpo do email"
 #. module: crm
 #: help:crm.menu.config_wizard,meeting:0
 msgid "Manages the calendar of meetings of the users."
-msgstr ""
+msgstr "Gere a agenda de reuniões dos utilizadores."
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1655,8 +1762,12 @@ msgid "Sale Amount"
 msgstr "Montante de venda"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Add a CC"
 msgstr ""
 
@@ -1666,7 +1777,9 @@ msgid "="
 msgstr "="
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.job:0 field:crm.menu.config_wizard,name:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: field:crm.menu.config_wizard,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
 msgstr "Nome"
@@ -1674,12 +1787,12 @@ msgstr "Nome"
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Sales Stage"
-msgstr ""
+msgstr "Estágio de vendas"
 
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Alarme"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_watchers:0
@@ -1687,9 +1800,10 @@ msgid "Mail to watchers (CC)"
 msgstr ""
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.meeting:0
+#: view:crm.fundraising:0
+#: view:crm.meeting:0
 msgid "Next Meeting"
-msgstr ""
+msgstr "Próxima reunião"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1715,14 +1829,19 @@ msgid "Bug Tracking"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.case.rule:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.case:0
+#: view:crm.case.rule:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Actions"
 msgstr "Acções"
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "High"
@@ -1746,7 +1865,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor4
 msgid "Proposal/Price Quote"
-msgstr ""
+msgstr "Proposta / Cotação"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1756,12 +1875,12 @@ msgstr "Atraso após activação da data:"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead5
 msgid "Web"
-msgstr ""
+msgstr "Web"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Campaign Type"
-msgstr ""
+msgstr "Tipo de campanha"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1773,22 +1892,22 @@ msgstr "Processamento do estado da mente"
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting_generic_wizard
 msgid "crm.meeting.generic_wizard"
-msgstr ""
+msgstr "crm.meeting.generic_wizard"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_history-act
 msgid "Histories"
-msgstr ""
+msgstr "Histórias"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job1
 msgid "Graduate"
-msgstr ""
+msgstr "Graduado"
 
 #. module: crm
 #: wizard_view:crm.job.meeting_set,init:0
@@ -1801,17 +1920,17 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Tree"
-msgstr ""
+msgstr "Árvore de dicas"
 
 #. module: crm
 #: field:crm.meeting,caldav_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "Caldav URL"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Attendee"
-msgstr ""
+msgstr "Participante"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1820,16 +1939,17 @@ msgid "Email Fail!"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_phone1 view:crm.phonecall:0
+#: model:crm.case.categ,name:crm.categ_phone1
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
-msgstr ""
+msgstr "Entrada"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Erro! Não pode criar secções recursivamente."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm
@@ -1846,9 +1966,10 @@ msgstr ""
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 #: view:report.crm.case.section.categ.stage:0
-#: view:report.crm.case.section.categ2:0 view:report.crm.case.section.stage:0
+#: view:report.crm.case.section.categ2:0
+#: view:report.crm.case.section.stage:0
 msgid "This Year"
-msgstr ""
+msgstr "Este ano"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_partner:0
@@ -1856,7 +1977,8 @@ msgid "Remind Partner"
 msgstr "Alertar Parceiro"
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Highest"
@@ -1865,7 +1987,7 @@ msgstr "Mais elevado"
 #. module: crm
 #: view:crm.job:0
 msgid "Contract Data"
-msgstr ""
+msgstr "Dados do Contrato"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -1880,7 +2002,7 @@ msgstr ""
 #. module: crm
 #: field:crm.menu.config_wizard,document_ics:0
 msgid "Shared Calendar"
-msgstr ""
+msgstr "Calendário Partilhado"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -1934,10 +2056,11 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_opportunity_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_opportunity_set
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "Converter em Oportunidade"
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_phone2 view:crm.phonecall:0
+#: model:crm.case.stage,name:crm.stage_phone2
+#: view:crm.phonecall:0
 msgid "Held"
 msgstr ""
 
@@ -1950,12 +2073,12 @@ msgstr ""
 #: model:crm.case.section,name:crm.section_support4
 #: model:ir.ui.menu,name:crm.menu_crm_case_fund_raise
 msgid "Fund Raising"
-msgstr ""
+msgstr "Angariação de fundos"
 
 #. module: crm
 #: selection:crm.new.send.mail,init,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Inalterado"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -1964,7 +2087,7 @@ msgstr ""
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "Convert To Partner"
-msgstr ""
+msgstr "Converter para Parceiro"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_from:0
@@ -1977,10 +2100,12 @@ msgstr "Estado do Processo"
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Send"
-msgstr ""
+msgstr "Enviar"
 
 #. module: crm
-#: field:crm.case,priority:0 view:crm.fundraising:0 view:crm.lead:0
+#: field:crm.case,priority:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Priority"
 msgstr "Prioridade"
@@ -1988,17 +2113,17 @@ msgstr "Prioridade"
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Source"
-msgstr ""
+msgstr "Fonte"
 
 #. module: crm
 #: field:crm.meeting,location:0
 msgid "Location"
-msgstr ""
+msgstr "Localização"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Modo de pagamento"
 
 #. module: crm
 #: help:crm.case.rule,trg_date_range:0
@@ -2009,9 +2134,11 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.claim:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.claim:0
+#: view:crm.job:0
+#: view:crm.lead:0
 msgid "Stage: "
-msgstr ""
+msgstr "Estágio: "
 
 #. module: crm
 #: view:crm.case.section:0
@@ -2021,15 +2148,18 @@ msgstr "Secção do processo"
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "Agendar reunião ou telefonema"
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/crm_claim.py:0
-#: code:addons/crm/crm_helpdesk.py:0 code:addons/crm/crm_meeting.py:0
-#: code:addons/crm/crm_opportunity.py:0 code:addons/crm/crm_phonecall.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm_claim.py:0
+#: code:addons/crm/crm_helpdesk.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Erro !"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2039,7 +2169,7 @@ msgstr "Campos a mudar"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead1
 msgid "Telesales"
-msgstr ""
+msgstr "Televendas"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main
@@ -2066,7 +2196,7 @@ msgstr "Linha de segmentação"
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,deadline:0
 #: view:crm.phonecall:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Data planeada"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2101,17 +2231,17 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "July"
-msgstr ""
+msgstr "Julho"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor1
 msgid "Prospecting"
-msgstr ""
+msgstr "A prospectar"
 
 #. module: crm
 #: field:crm.case,partner_name2:0
 msgid "Employee Email"
-msgstr ""
+msgstr "E-mail do empregado"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting
@@ -2121,17 +2251,17 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Job Info"
-msgstr ""
+msgstr "Informações do emprego"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Cancel Meeting"
-msgstr ""
+msgstr "Cancelar reunião"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support0
 msgid "Jobs"
-msgstr ""
+msgstr "Empregos"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2139,7 +2269,8 @@ msgid "%(case_date)s = Creation date"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_phone3 view:crm.phonecall:0
+#: model:crm.case.stage,name:crm.stage_phone3
+#: view:crm.phonecall:0
 msgid "Not Held"
 msgstr ""
 
@@ -2151,12 +2282,12 @@ msgstr "Enviar ao responsável"
 #. module: crm
 #: view:crm.job:0
 msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "Empregos - Formulário de recrutamento"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim1
 msgid "Corrective"
-msgstr ""
+msgstr "Correctivo"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity
@@ -2179,22 +2310,23 @@ msgstr "Modelo do email a enviar"
 #: field:report.crm.case.section.categ2,month:0
 #: field:report.crm.case.section.stage,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mês"
 
 #. module: crm
-#: model:crm.case.section,name:crm.section_support2 view:crm.lead:0
+#: model:crm.case.section,name:crm.section_support2
+#: view:crm.lead:0
 #: field:crm.menu.config_wizard,lead:0
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "Dicas"
 
 #. module: crm
 #: wizard_button:crm.new.send.mail,init,send:0
 #: wizard_button:crm.send.mail,init,send:0
 msgid "Send Email"
-msgstr ""
+msgstr "Enviar email"
 
 #. module: crm
 #: wizard_view:crm.new.send.mail,init:0
@@ -2204,7 +2336,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund3
 msgid "Credit Card"
-msgstr ""
+msgstr "Cartão de crédito"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2226,8 +2358,11 @@ msgstr "Registo"
 
 #. module: crm
 #: help:crm.menu.config_wizard,fund:0
-msgid "This may help associations in their fund raising process and tracking."
+msgid ""
+"This may help associations in their fund raising process and tracking."
 msgstr ""
+"Isto pode ajudar as associações no seu processo de angaração de fundos e "
+"monitoramento."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2258,14 +2393,16 @@ msgid "Delay Close"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Low"
 msgstr "Baixo"
 
 #. module: crm
-#: field:crm.case,date_closed:0 selection:crm.case,state:0
+#: field:crm.case,date_closed:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
@@ -2279,24 +2416,27 @@ msgstr "Fechado"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name2"
-msgstr ""
+msgstr "2Nome do Candidato"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "cancel"
-msgstr ""
+msgstr "cancelar"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "Reunião Interna"
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,child_ids:0 view:crm.claim:0 view:crm.lead:0
+#: view:crm.case:0
+#: field:crm.case,child_ids:0
+#: view:crm.claim:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Events"
-msgstr ""
+msgstr "Eventos"
 
 #. module: crm
 #: help:crm.menu.config_wizard,lead:0
@@ -2321,7 +2461,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "Reunião com Clientes"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc2:0
@@ -2331,27 +2471,28 @@ msgstr ""
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc3:0
 msgid "Attachment3"
-msgstr ""
+msgstr "Anexo3"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Degree"
-msgstr ""
+msgstr "Grau"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc1:0
 msgid "Attachment1"
-msgstr ""
+msgstr "Anexo1"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:0
 #: model:crm.case.section,name:crm.section_support_phone
-#: field:crm.menu.config_wizard,phonecall:0 view:crm.phonecall:0
+#: field:crm.menu.config_wizard,phonecall:0
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #, python-format
 msgid "Phone Calls"
-msgstr ""
+msgstr "Chamadas Telefónicas"
 
 #. module: crm
 #: help:crm.case,active:0
@@ -2363,7 +2504,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_menu_config_wizard
 msgid "crm.menu.config_wizard"
-msgstr ""
+msgstr "crm.menu.config_wizard"
 
 #. module: crm
 #: view:crm.case.history:0
@@ -2373,15 +2514,16 @@ msgstr "Histórico do caso"
 #. module: crm
 #: field:crm.case,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefone"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund2
 msgid "Cheque"
-msgstr ""
+msgstr "Cheque"
 
 #. module: crm
-#: field:crm.case,active:0 field:crm.case.rule,active:0
+#: field:crm.case,active:0
+#: field:crm.case.rule,active:0
 #: field:crm.case.section,active:0
 msgid "Active"
 msgstr "Activo"
@@ -2413,7 +2555,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
 msgid "Send Mail"
-msgstr ""
+msgstr "Enviar Correio"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2421,14 +2563,16 @@ msgid "Months"
 msgstr "Meses"
 
 #. module: crm
-#: view:crm.claim.assign_wizard:0 view:crm.helpdesk.assign_wizard:0
-#: view:crm.opportunity.assign_wizard:0 view:crm.phonecall.assign_wizard:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.helpdesk.assign_wizard:0
+#: view:crm.opportunity.assign_wizard:0
+#: view:crm.phonecall.assign_wizard:0
 #: model:ir.actions.act_window,name:crm.action_crm_claim_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_helpdesk_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_opportunity_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall_assign_wizard
 msgid "To Assign"
-msgstr ""
+msgstr "A atribuir."
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_cal_subscribe.py:0
@@ -2439,7 +2583,7 @@ msgstr ""
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "Quando um verdadeiro projecto / Oportunidade é detectado"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -2454,12 +2598,14 @@ msgstr "Acção"
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
-#: model:crm.case.section,name:crm.section_support_claims view:crm.claim:0
-#: field:crm.menu.config_wizard,claims:0 view:crm.phonecall:0
+#: model:crm.case.section,name:crm.section_support_claims
+#: view:crm.claim:0
+#: field:crm.menu.config_wizard,claims:0
+#: view:crm.phonecall:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_claims
 #, python-format
 msgid "Claims"
-msgstr ""
+msgstr "Reclamações"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
@@ -2474,13 +2620,13 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_category2
 msgid "Category2 of case"
-msgstr ""
+msgstr "Categoria 2 do caso"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,to:0
 #: wizard_field:crm.send.mail,init,to:0
 msgid "To"
-msgstr ""
+msgstr "Para"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2490,34 +2636,39 @@ msgstr "%(case_user_email)s = Responsible email"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_presale
 msgid "Sales"
-msgstr ""
+msgstr "Vendas"
 
 #. module: crm
-#: view:crm.case:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.phonecall:0
 msgid "General"
 msgstr "Geral"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 msgid "Assigned"
-msgstr ""
+msgstr "Atribuído"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 msgid "Recycled"
-msgstr ""
+msgstr "Reciclado"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead8
 #: model:crm.case.categ,name:crm.categ_oppor8
 msgid "Other"
-msgstr ""
+msgstr "Outro"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
+#: selection:crm.new.send.mail,init,state:0
+#: view:crm.opportunity:0
 msgid "Done"
-msgstr ""
+msgstr "Pronto"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2527,15 +2678,21 @@ msgstr "Interválo Máximo"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
 msgid "All Opportunities"
-msgstr ""
+msgstr "Todas as oportunidades"
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -2555,7 +2712,7 @@ msgstr ""
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already existing with the same name."
-msgstr ""
+msgstr "Já existe um parceiro com o mesmo nome"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
@@ -2570,14 +2727,20 @@ msgstr ""
 #. module: crm
 #: field:crm.menu.config_wizard,helpdesk:0
 msgid "Helpdesk"
-msgstr ""
+msgstr "Helpdesk"
 
 #. module: crm
-#: field:crm.case,user_id:0 field:crm.case.rule,trg_user_id:0 view:crm.claim:0
-#: field:crm.claim.assign_wizard,user_id:0 view:crm.fundraising:0
-#: field:crm.helpdesk.assign_wizard,user_id:0 view:crm.job:0
-#: view:crm.meeting:0 field:crm.meeting.generic_wizard,user_id:0
-#: view:crm.opportunity:0 field:crm.opportunity.assign_wizard,user_id:0
+#: field:crm.case,user_id:0
+#: field:crm.case.rule,trg_user_id:0
+#: view:crm.claim:0
+#: field:crm.claim.assign_wizard,user_id:0
+#: view:crm.fundraising:0
+#: field:crm.helpdesk.assign_wizard,user_id:0
+#: view:crm.job:0
+#: view:crm.meeting:0
+#: field:crm.meeting.generic_wizard,user_id:0
+#: view:crm.opportunity:0
+#: field:crm.opportunity.assign_wizard,user_id:0
 #: field:crm.phonecall.assign_wizard,user_id:0
 msgid "Responsible"
 msgstr "Responsável"
@@ -2586,23 +2749,23 @@ msgstr "Responsável"
 #: model:crm.case.stage,name:crm.stage_claim4
 #: model:crm.case.stage,name:crm.stage_meet3
 msgid "Invalid"
-msgstr ""
+msgstr "Inválido"
 
 #. module: crm
 #: wizard_button:crm.job.meeting_set,init,order:0
 #: wizard_button:crm.phonecall.meeting_set,init,order:0
 msgid "Set Meeting"
-msgstr ""
+msgstr "Definir Reunião"
 
 #. module: crm
 #: field:crm.menu.config_wizard,meeting:0
 msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Calendário de reuniões"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Casos por estágios e estimativas"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2636,61 +2799,62 @@ msgstr ""
 #: wizard_view:crm.lead.opportunity_set,create_partner:0
 #: wizard_view:crm.lead.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this lead ?"
-msgstr ""
+msgstr "Tem a certeza de que deseja criar um parceiro baseado nesta dica"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job6
 msgid "Refused by Employee"
-msgstr ""
+msgstr "Recusado pelo empregado"
 
 #. module: crm
 #: field:crm.case,partner_name:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Nome do funcionário"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job2
 msgid "First Interview"
-msgstr ""
+msgstr "Primeira Entrevista"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 #: view:report.crm.case.section.categ.stage:0
-#: view:report.crm.case.section.categ2:0 view:report.crm.case.section.stage:0
+#: view:report.crm.case.section.categ2:0
+#: view:report.crm.case.section.stage:0
 msgid "This Month"
-msgstr ""
+msgstr "Este Mês"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Availability (weeks)"
-msgstr ""
+msgstr "Disponibilidade (semanas)"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Opportunities Tree"
-msgstr ""
+msgstr "Árvore de oportunidades"
 
 #. module: crm
 #: help:crm.case,state:0
 msgid ""
-"The state is set to 'Draft', when a case is "
-"created.                                  \n"
-"If the case is in progress the state is set to "
-"'Open'.                                  \n"
-"When the case is over, the state is set to "
-"'Done'.                                  \n"
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
 
 #. module: crm
 #: view:crm.job:0
 msgid "Open Jobs"
-msgstr ""
+msgstr "Empregos em aberto"
 
 #. module: crm
 #: selection:crm.email.add.cc,name:0
 msgid "Email Address"
-msgstr ""
+msgstr "Endereço de Correio Electrónico"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2704,17 +2868,17 @@ msgstr ""
 #. module: crm
 #: field:crm.case,case_id:0
 msgid "Related Case"
-msgstr ""
+msgstr "Caso relacionado"
 
 #. module: crm
 #: field:crm.case.rule,server_action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Acção de servidor"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_claim0
 msgid "All Claims"
-msgstr ""
+msgstr "Todas as reclamações"
 
 #. module: crm
 #: field:crm.case.log,user_id:0
@@ -2761,7 +2925,7 @@ msgstr "Histórico de registos"
 #: wizard_field:crm.lead.opportunity_set,opportunity,name:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,name:0
 msgid "Opportunity Summary"
-msgstr ""
+msgstr "Resumo da Oportunidade"
 
 #. module: crm
 #: view:crm.case:0
@@ -2782,7 +2946,7 @@ msgstr "Descrição do Processo"
 #: wizard_field:crm.job.reschedule_phone_call,init,user_id:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Atribuir a"
 
 #. module: crm
 #: field:crm.case,date_action_last:0
@@ -2792,22 +2956,22 @@ msgstr "Última acção"
 #. module: crm
 #: field:crm.case,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duração"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_stage
 msgid "Cases by section, Category and stage"
-msgstr ""
+msgstr "Casos por secção, categoria e estágio"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Hired"
-msgstr ""
+msgstr "Candidato Contratado"
 
 #. module: crm
 #: field:crm.menu.config_wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "Processo de contratação de empregados"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_52
@@ -2818,12 +2982,12 @@ msgstr "Todos os Processos"
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this lead."
-msgstr ""
+msgstr "Um parceiro já se encontra definido nesta dica"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Source"
-msgstr ""
+msgstr "Fonte da dica"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,nbr:0
@@ -2844,14 +3008,15 @@ msgid "Provide path for Remote Calendar"
 msgstr ""
 
 #. module: crm
-#: view:crm.segmentation:0 field:crm.segmentation.line,segmentation_id:0
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
 msgid "Segmentation"
 msgstr "Segmentação"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Form"
-msgstr ""
+msgstr "Formulários de fundos"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2867,12 +3032,12 @@ msgstr ""
 #. module: crm
 #: field:crm.case,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companhia"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "In Process"
-msgstr ""
+msgstr "Em Curso"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -2888,30 +3053,31 @@ msgstr "%(case_user)s = Responsible name"
 #: wizard_field:crm.job.reschedule_phone_call,init,note:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,note:0
 msgid "Goals"
-msgstr ""
+msgstr "Objectivos"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_tree
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Type"
-msgstr ""
+msgstr "Casos por secção e tipo"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Serviço pós venda"
 
 #. module: crm
 #: wizard_button:caldav.crm.export,init,end:0
 #: wizard_button:caldav.crm.import,display,end:0
-#: wizard_button:caldav.crm.subscribe,display,end:0 view:crm.email.add.cc:0
+#: wizard_button:caldav.crm.subscribe,display,end:0
+#: view:crm.email.add.cc:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Nome do ficheiro"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2926,15 +3092,16 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/wizard/wizard_cal_subscribe.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_claim_assign_wizard
 msgid "crm.claim.assign_wizard"
-msgstr ""
+msgstr "crm.claim.assign_wizard"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job
@@ -2943,7 +3110,8 @@ msgid "All Jobs Requests"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,state:0 selection:crm.case.rule,act_state:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
 #: selection:report.crm.case.section.categ.categ2,state:0
@@ -3011,7 +3179,8 @@ msgid "%(case_subject)s = Case subject"
 msgstr "%(case_subject)s = Case subject"
 
 #. module: crm
-#: field:crm.case,section_id:0 field:crm.case.log,section_id:0
+#: field:crm.case,section_id:0
+#: field:crm.case.log,section_id:0
 #: field:crm.case.rule,trg_section_id:0
 #: field:crm.claim.assign_wizard,section_id:0
 #: field:crm.helpdesk.assign_wizard,section_id:0
@@ -3055,13 +3224,15 @@ msgstr "Sua acção"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead3
-#: field:crm.case.history,email:0 field:crm.email.add.cc,email:0
+#: field:crm.case.history,email:0
+#: field:crm.email.add.cc,email:0
 #: view:crm.job:0
 msgid "Email"
 msgstr "Email"
 
 #. module: crm
-#: field:crm.case,canal_id:0 field:crm.case.log,canal_id:0
+#: field:crm.case,canal_id:0
+#: field:crm.case.log,canal_id:0
 msgid "Channel"
 msgstr "Canal"
 
@@ -3106,12 +3277,18 @@ msgid "Reporting"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0 view:crm.opportunity:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: selection:crm.new.send.mail,init,state:0
+#: view:crm.opportunity:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -3167,7 +3344,8 @@ msgid "Lead Subject"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0 view:crm.phonecall:0
+#: view:crm.lead:0
+#: view:crm.phonecall:0
 msgid "Convert to Opportunity"
 msgstr ""
 
@@ -3255,7 +3433,8 @@ msgid "All Funds"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.section,calendar:0 view:crm.meeting:0
+#: field:crm.case.section,calendar:0
+#: view:crm.meeting:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
 msgid "Calendar"
 msgstr "Calendário"
@@ -3281,7 +3460,8 @@ msgid "Sales Purchase"
 msgstr "Vendas adquiridas"
 
 #. module: crm
-#: view:crm.job:0 model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
+#: view:crm.job:0
+#: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
 msgid "Schedule Meeting"
 msgstr ""
@@ -3292,7 +3472,8 @@ msgid "Arts And Culture"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_phone2 view:crm.phonecall:0
+#: model:crm.case.categ,name:crm.categ_phone2
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
@@ -3322,10 +3503,12 @@ msgid "Success Probability"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.meeting:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.meeting:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -3350,7 +3533,8 @@ msgid "Set section to"
 msgstr "Definir secção para"
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Normal"
@@ -3362,7 +3546,7 @@ msgstr "Normal"
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "You must put a Partner eMail to use this action!"
-msgstr ""
+msgstr "Você deve inserir um email do terceiro para usar esta acção!"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -3384,7 +3568,8 @@ msgid "Change RRule"
 msgstr ""
 
 #. module: crm
-#: selection:crm.email.add.cc,name:0 field:crm.email.add.cc,user_id:0
+#: selection:crm.email.add.cc,name:0
+#: field:crm.email.add.cc,user_id:0
 #: field:report.crm.case.section.categ.categ2,user_id:0
 #: field:report.crm.case.section.categ.stage,user_id:0
 #: field:report.crm.case.section.categ2,user_id:0
@@ -3464,10 +3649,15 @@ msgid "Healthcare"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.claim.assign_wizard:0
-#: view:crm.helpdesk.assign_wizard:0 view:crm.meeting:0
-#: view:crm.meeting.generic_wizard:0 view:crm.opportunity:0
-#: view:crm.opportunity.assign_wizard:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.helpdesk.assign_wizard:0
+#: view:crm.meeting:0
+#: view:crm.meeting.generic_wizard:0
+#: view:crm.opportunity:0
+#: view:crm.opportunity.assign_wizard:0
+#: view:crm.phonecall:0
 #: view:crm.phonecall.assign_wizard:0
 msgid "Assign"
 msgstr ""
@@ -3493,7 +3683,9 @@ msgid "Stage of case"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.fundraising:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.fundraising:0
+#: view:crm.opportunity:0
 msgid "Estimates"
 msgstr "Estimativas"
 
@@ -3503,7 +3695,8 @@ msgid "Responsible User"
 msgstr "Utilizador Responsável"
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #, python-format
 msgid "Close"
 msgstr "Fechar"
@@ -3561,9 +3754,14 @@ msgid "% = The '%' Character"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,name:0 field:crm.case.history,description:0
-#: field:crm.case.history,note:0 view:crm.job:0 view:crm.meeting:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: field:crm.case,name:0
+#: field:crm.case.history,description:0
+#: field:crm.case.history,note:0
+#: view:crm.job:0
+#: view:crm.meeting:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: field:crm.segmentation,description:0
 msgid "Description"
 msgstr "Descrição"
@@ -3588,9 +3786,14 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 wizard_field:crm.new.send.mail,init,cc:0
-#: view:crm.opportunity:0 wizard_field:crm.send.mail,init,cc:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: wizard_field:crm.new.send.mail,init,cc:0
+#: view:crm.opportunity:0
+#: wizard_field:crm.send.mail,init,cc:0
 msgid "CC"
 msgstr ""
 
@@ -3605,10 +3808,14 @@ msgid "_Import"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 field:crm.case.log,case_id:0
-#: field:crm.claim,inherit_case_id:0 field:crm.fundraising,inherit_case_id:0
-#: field:crm.helpdesk,inherit_case_id:0 field:crm.job,inherit_case_id:0
-#: field:crm.lead,inherit_case_id:0 field:crm.meeting,inherit_case_id:0
+#: code:addons/crm/crm.py:0
+#: field:crm.case.log,case_id:0
+#: field:crm.claim,inherit_case_id:0
+#: field:crm.fundraising,inherit_case_id:0
+#: field:crm.helpdesk,inherit_case_id:0
+#: field:crm.job,inherit_case_id:0
+#: field:crm.lead,inherit_case_id:0
+#: field:crm.meeting,inherit_case_id:0
 #: field:crm.opportunity,inherit_case_id:0
 #: field:crm.phonecall,inherit_case_id:0
 #: model:ir.model,name:crm.model_crm_case
@@ -3618,7 +3825,8 @@ msgid "Case"
 msgstr "Processo"
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Lowest"
@@ -3654,7 +3862,8 @@ msgstr ""
 "da mente por esse factor. É uma multiplicação"
 
 #. module: crm
-#: wizard_view:crm.new.send.mail,init:0 wizard_view:crm.send.mail,init:0
+#: wizard_view:crm.new.send.mail,init:0
+#: wizard_view:crm.send.mail,init:0
 msgid "Mass Mailing"
 msgstr ""
 
@@ -3730,7 +3939,8 @@ msgid "Export ICS File"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,sequence:0 field:crm.case.section,sequence:0
+#: field:crm.case.rule,sequence:0
+#: field:crm.case.section,sequence:0
 #: field:crm.case.stage,sequence:0
 msgid "Sequence"
 msgstr "Sequência"
@@ -3778,18 +3988,30 @@ msgstr ""
 #~ msgid "Add Last Mail for Replying"
 #~ msgstr "Adicionar o último e-mail para resposta"
 
+#~ msgid "Update The Proposed Menus To Be Created"
+#~ msgstr "Actualizar os menus propostos para serem criados"
+
+#~ msgid "Base Information"
+#~ msgstr "Informação de base"
+
 #~ msgid "All Open "
 #~ msgstr "Todos abertos "
 
 #~ msgid "Create menus for a case section"
 #~ msgstr "Criar menus para uma secção de processo"
 
+#~ msgid "My "
+#~ msgstr "Meu "
+
 #~ msgid "Create menu Entries"
 #~ msgstr "Criar entradas do menu"
 
 #~ msgid "All Unclosed and Unassigned "
 #~ msgstr "Todos os não fechados e não assinados "
 
+#~ msgid "Extra Info"
+#~ msgstr "Informação extra"
+
 #~ msgid "My Open "
 #~ msgstr "Meu  aberto "
 
@@ -3799,6 +4021,12 @@ msgstr ""
 #~ msgid "Excluded Answers :"
 #~ msgstr "Respostas excluídas :"
 
+#~ msgid "Profiling"
+#~ msgstr "Definição de perfil"
+
+#~ msgid "My cases"
+#~ msgstr "Meus processos"
+
 #~ msgid "All Draft "
 #~ msgstr "Todos os esboços "
 
@@ -3814,9 +4042,30 @@ msgstr ""
 #~ msgid "My Unclosed "
 #~ msgstr "Meus  não fechados "
 
+#~ msgid "Profiling Options"
+#~ msgstr "Opções da definição do perfil"
+
+#~ msgid "My Pending "
+#~ msgstr "Meus   pendentes "
+
+#~ msgid "New Form"
+#~ msgstr "Novo formulário"
+
+#~ msgid "New With Calendar"
+#~ msgstr "Novo com calendário"
+
 #~ msgid "List With Calendar"
 #~ msgstr "Lista com calendário"
 
+#~ msgid "Calendar View"
+#~ msgstr "Visualizar Calendário"
+
+#~ msgid "Created Menus"
+#~ msgstr "Menus criados"
+
+#~ msgid "Parent Menu"
+#~ msgstr "Menu pai"
+
 #~ msgid "Included Answers :"
 #~ msgstr "Incluir respostas:"
 
@@ -3826,8 +4075,8 @@ msgstr ""
 #~ msgid "Base Menu Name"
 #~ msgstr "Nome do menu base"
 
-#~ msgid "Created Menus"
-#~ msgstr "Menus criados"
+#~ msgid "All Unassigned "
+#~ msgstr "Todos sem registos "
 
 #~ msgid "All Unclosed "
 #~ msgstr "Todos não fechados "
@@ -3841,9 +4090,15 @@ msgstr ""
 #~ msgid "Create Menus For Cases"
 #~ msgstr "Criar menus para processos"
 
+#~ msgid "All Pending "
+#~ msgstr "Todos os   pendentes "
+
 #~ msgid "All Canceled "
 #~ msgstr "Todos os   cancelados "
 
+#~ msgid "All "
+#~ msgstr "Todos "
+
 #~ msgid "List"
 #~ msgstr "Lista"
 
@@ -3859,8 +4114,8 @@ msgstr ""
 #~ msgid "Form View"
 #~ msgstr "Vista em formulários"
 
+#~ msgid "Mail to watchers (Cc)"
+#~ msgstr "Enviar e-mail ao observador (como copia)"
+
 #~ msgid "crm.case.section.open"
 #~ msgstr "crm.case.section.open"
-
-#~ msgid "Update The Proposed Menus To Be Created"
-#~ msgstr "Actualizar os menus propostos para serem criados"
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index f0b4b427d5e..7f9365e1f6d 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -1,31 +1,31 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* crm
+#	* crm
 #
 msgid ""
 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:11+0000\n"
-"PO-Revision-Date: 2010-01-05 17:04+0000\n"
-"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
+"POT-Creation-Date: 2010-01-05 05:59+0000\n"
+"PO-Revision-Date: 2010-01-23 18:58+0000\n"
+"Last-Translator: pedrobom <pedrobomlimeira@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: 2009-12-16 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-01-24 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: field:crm.email.add.cc,name:0
 msgid "Send to"
-msgstr ""
+msgstr "Enviar para"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
 msgid ""
-"This property defines the list of date/time exceptions for arecurring "
-"calendar component."
+"This property defines the list                 of date/time exceptions for "
+"arecurring calendar component."
 msgstr ""
 
 #. module: crm
@@ -33,11 +33,13 @@ msgstr ""
 msgid ""
 "Check this if you want the rule to send an email to the responsible person."
 msgstr ""
+"Marque isto se você quiser que a regra envie um email para  a pessoa "
+"responsável."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
@@ -50,9 +52,12 @@ msgid "Close Lead"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 Dias    "
 
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
@@ -62,12 +67,12 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Pending Jobs"
-msgstr ""
+msgstr "Serviços Pendentes"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_to:0
 msgid "Button Pressed"
-msgstr "Butão pressionado"
+msgstr "Botão pressionado"
 
 #. module: crm
 #: view:crm.case:0
@@ -85,7 +90,8 @@ msgid "Stage Name"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.case.history:0
+#: view:crm.case:0
+#: view:crm.case.history:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act
 #: model:ir.actions.act_window,name:crm.crm_case_section_open_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
@@ -122,7 +128,7 @@ msgstr ""
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "Quantia"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -136,12 +142,13 @@ msgid "Fixed"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/wizard/crm_job_wizard.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/wizard/crm_job_wizard.py:0
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Atenção !"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
@@ -152,29 +159,29 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Campaign"
-msgstr ""
+msgstr "Campanha"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "Procura Oportunidades"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
 #: view:report.crm.case.section.stage:0
 msgid "Cases by Section and Stage"
-msgstr ""
+msgstr "Casos por Seção e Estágio"
 
 #. module: crm
 #: wizard_field:crm.job.meeting_set,init,duration:0
 #: wizard_field:crm.phonecall.meeting_set,init,duration:0
 msgid "Duration (Hours)"
-msgstr ""
+msgstr "Duração (Horas)"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
 msgid "TRANSPARENT"
-msgstr ""
+msgstr "TRANSPARENTE"
 
 #. module: crm
 #: help:crm.case.rule,server_action_id:0
@@ -191,15 +198,18 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,partner_id:0
+#: view:crm.case:0
+#: field:crm.case,partner_id:0
 #: model:crm.case.categ,name:crm.categ_lead4
 #: model:crm.case.categ,name:crm.categ_oppor4
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,partner_id:0
-#: field:crm.case.rule,trg_partner_id:0 selection:crm.email.add.cc,name:0
+#: field:crm.case.rule,trg_partner_id:0
+#: selection:crm.email.add.cc,name:0
 #: field:crm.email.add.cc,partner_id:0
 #: wizard_field:crm.lead.opportunity_set,create_partner,partner_id:0
 #: wizard_field:crm.lead.opportunity_set,opportunity,partner_id:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: wizard_field:crm.phonecall.opportunity_set,create_partner,partner_id:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
 #: model:process.node,name:crm.process_node_partner0
@@ -207,8 +217,10 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: crm
-#: field:crm.case.categ,section_id:0 field:crm.case.category2,section_id:0
-#: view:crm.case.section:0 field:crm.case.section,name:0
+#: field:crm.case.categ,section_id:0
+#: field:crm.case.category2,section_id:0
+#: view:crm.case.section:0
+#: field:crm.case.section,name:0
 #: field:crm.case.stage,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
@@ -217,7 +229,7 @@ msgstr "Seção de caso"
 #. module: crm
 #: view:crm.job:0
 msgid "Proposed Salary"
-msgstr ""
+msgstr "Salário proposto"
 
 #. module: crm
 #: help:crm.case.section,sequence:0
@@ -230,12 +242,12 @@ msgstr ""
 #: model:crm.case.categ,name:crm.categ_meet3
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Ligação Telefônica"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_stage
 msgid "Cases by section and stage"
-msgstr ""
+msgstr "Casos por seção e estágio"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_email:0
@@ -253,10 +265,14 @@ msgid "Special Keywords to Be Used in The Body"
 msgstr "Palavras-chave especiais a serem utilizadas no corpo"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Envia Novo Email"
 
 #. module: crm
 #: view:crm.case.history:0
@@ -292,17 +308,17 @@ msgstr "Data da última ação"
 #. module: crm
 #: view:crm.job:0
 msgid "Appreciation"
-msgstr ""
+msgstr "Apreciação"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job3
 msgid "Second Interview"
-msgstr ""
+msgstr "Segunda entrevista"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
 msgid "Subscribe to a Remote calendar"
-msgstr ""
+msgstr "Inscrever-se num calendário Remoto"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
@@ -314,11 +330,15 @@ msgstr "Categorias"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Atenção!"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Dates"
 msgstr "Datas"
 
@@ -333,20 +353,21 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.opportunity:0
+#: view:crm.fundraising:0
+#: view:crm.opportunity:0
 msgid "Description Information"
-msgstr ""
+msgstr "Informação da descrição"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Nome do Contato"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Link to an existing partner"
-msgstr ""
+msgstr "Link para um parceiro existente"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_range_type:0
@@ -354,15 +375,19 @@ msgid "Delay type"
 msgstr "Tipo de atraso"
 
 #. module: crm
-#: view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "Contact"
 msgstr ""
 
 #. module: crm
 #: view:crm.job:0
 msgid "Next Interview"
-msgstr ""
+msgstr "Próxima entrevista"
 
 #. module: crm
 #: field:crm.case.rule,regex_history:0
@@ -377,7 +402,7 @@ msgstr ""
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Reunindo oportunidades"
 
 #. module: crm
 #: help:crm.case,canal_id:0
@@ -386,11 +411,14 @@ msgid ""
 "customer. With each commercial opportunity, you can indicate the canall "
 "which is this opportunity source."
 msgstr ""
+"Os canais representam os diferentes modos de comunicação disponíveis com o "
+"cliente. A cada oportunidade comercial, você pode indicar o canal que é essa "
+"fonte de oportunidade."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Rules"
-msgstr ""
+msgstr "Regras de exceção"
 
 #. module: crm
 #: field:crm.menu.config_wizard,opportunity:0
@@ -401,7 +429,7 @@ msgstr "Oportunidades de negócios"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "Aceito como reivindicação"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -430,13 +458,13 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm Meeting"
-msgstr ""
+msgstr "Confirmar reunião"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead1
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Existing Customer"
-msgstr ""
+msgstr "Cliente existente"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet2
@@ -444,7 +472,8 @@ msgid "Home"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,categ_id:0 field:crm.case.rule,trg_categ_id:0
+#: field:crm.case,categ_id:0
+#: field:crm.case.rule,trg_categ_id:0
 #: wizard_field:crm.job.reschedule_phone_call,init,category_id:0
 #: view:crm.opportunity:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,category_id:0
@@ -459,7 +488,7 @@ msgstr "Categoria"
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_stage_tree
 #: view:report.crm.case.section.categ.stage:0
 msgid "Cases by Section, Category and Stage"
-msgstr ""
+msgstr "Casos por seção, categoria e estágio"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_watchers:0
@@ -471,7 +500,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Privacy"
-msgstr ""
+msgstr "Privacidade"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -479,8 +508,12 @@ msgid "%(partner)s = Partner name"
 msgstr "%(parceiro)s = Nome do Parceiro"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Action Information"
 msgstr "Informação da ação"
 
@@ -513,7 +546,9 @@ msgid "Open Cases"
 msgstr "Casos abertos"
 
 #. module: crm
-#: field:crm.case.log,name:0 view:crm.claim:0 view:crm.job:0
+#: field:crm.case.log,name:0
+#: view:crm.claim:0
+#: view:crm.job:0
 msgid "Status"
 msgstr "Situação"
 
@@ -533,18 +568,21 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Tree"
-msgstr ""
+msgstr "Árvore de reuniões"
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.fundraising:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 #, python-format
 msgid "Escalate"
 msgstr "Escalada"
@@ -552,7 +590,7 @@ msgstr "Escalada"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
 msgid "All Meetings"
-msgstr ""
+msgstr "Todas as reuniões"
 
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
@@ -571,7 +609,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "June"
-msgstr ""
+msgstr "Junho"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -581,7 +619,7 @@ msgstr "Padrão (0=Nada)"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job7
 msgid "Refused by Company"
-msgstr ""
+msgstr "Recusado pela Empresa"
 
 #. module: crm
 #: field:crm.case,planned_revenue:0
@@ -599,12 +637,12 @@ msgstr "Permite exclusão"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "October"
-msgstr ""
+msgstr "Outubro"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor3
 msgid "Value Proposition"
-msgstr ""
+msgstr "Proposta de valor"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -619,23 +657,26 @@ msgstr ""
 #. module: crm
 #: help:crm.case,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Essas pessoas receberão e-mail."
 
 #. module: crm
 #: help:crm.case.section,calendar:0
 msgid "Allows to show calendar"
-msgstr ""
+msgstr "Permite mostrar calendário"
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "   Today   "
-msgstr ""
+msgstr "   Hoje   "
 
 #. module: crm
 #: wizard_view:crm.job.reschedule_phone_call,init:0
 #: wizard_view:crm.opportunity.reschedule_phone_call,init:0
 msgid "Phone Call Description"
-msgstr ""
+msgstr "Descrição da chamada telefônica"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -665,11 +706,13 @@ msgstr ""
 msgid ""
 "You must define a responsible user for this case in order to use this action!"
 msgstr ""
+"Você deve definir um usuário responsável para este caso se quiser usar esta "
+"ação!"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Atribuído a"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -679,7 +722,7 @@ msgstr "Eventos dos parceiros"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job4
 msgid "Contract Proposed"
-msgstr ""
+msgstr "Contrato proposto"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main
@@ -687,9 +730,12 @@ msgid "Jobs - Hiring Process"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Related Cases"
-msgstr ""
+msgstr "Casos relacionados"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -697,44 +743,48 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembro"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Communication history"
 msgstr "Histórico"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "New Claims"
-msgstr ""
+msgstr "Pedidos Novos"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Form"
-msgstr ""
+msgstr "Formulario de reuniões"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor5
 msgid "Negotiation/Review"
-msgstr ""
+msgstr "Negociação/Revisão"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "Um parceiro já está definido sobre esta chamada."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_stage
 msgid "Cases by Opportunities and Stage"
-msgstr ""
+msgstr "Casos por oportunidades e estágios"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Date of Claim"
-msgstr ""
+msgstr "Data da reivindicação"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -749,17 +799,18 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Formulário de ligações"
 
 #. module: crm
-#: view:crm.segmentation:0 model:ir.model,name:crm.model_crm_segmentation
+#: view:crm.segmentation:0
+#: model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
 msgstr "Segmentação de parceiros"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job5
 msgid "Contract Signed"
-msgstr ""
+msgstr "Contrato assinado"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
@@ -769,10 +820,11 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor1
 msgid "Existing Business"
-msgstr ""
+msgstr "Negócios existentes"
 
 #. module: crm
-#: field:crm.case,probability:0 field:crm.case.categ,probability:0
+#: field:crm.case,probability:0
+#: field:crm.case.categ,probability:0
 msgid "Probability (%)"
 msgstr "Probabilidade (%)"
 
@@ -791,7 +843,8 @@ msgstr ""
 "todos os e-mails enviados sobre casos desta seção"
 
 #. module: crm
-#: view:crm.case.rule:0 model:ir.model,name:crm.model_crm_case_rule
+#: view:crm.case.rule:0
+#: model:ir.model,name:crm.model_crm_case_rule
 msgid "Case Rule"
 msgstr "Regra do caso"
 
@@ -799,23 +852,28 @@ msgstr "Regra do caso"
 #: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #: code:addons/crm/wizard/crm_opportunity_wizard.py:0
-#: code:addons/crm/wizard/crm_phonecall_wizard.py:0 view:crm.opportunity:0
+#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
+#: view:crm.opportunity:0
 #: view:crm.phonecall:0
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Oportunidade"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Emails"
 msgstr ""
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead7
 msgid "Television"
-msgstr ""
+msgstr "Televisão"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -851,13 +909,13 @@ msgstr "Valor"
 #. module: crm
 #: help:caldav.crm.export,init,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "Salve em formato .ics"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,text:0
 #: wizard_field:crm.send.mail,init,text:0
 msgid "Message"
-msgstr ""
+msgstr "Mensagem"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -891,7 +949,7 @@ msgstr "Definir estado para"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email!"
-msgstr ""
+msgstr "Email!"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead6
@@ -924,11 +982,12 @@ msgid "Gives the sequence order when displaying a list of case stages."
 msgstr ""
 
 #. module: crm
-#: model:crm.case.section,name:crm.section_support3 view:crm.opportunity:0
+#: model:crm.case.section,name:crm.section_support3
+#: view:crm.opportunity:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr ""
+msgstr "Oportunidades"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -957,7 +1016,8 @@ msgid "Direction"
 msgstr ""
 
 #. module: crm
-#: help:crm.case,email_cc:0 help:crm.case.rule,act_email_cc:0
+#: help:crm.case,email_cc:0
+#: help:crm.case.rule,act_email_cc:0
 msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
@@ -991,13 +1051,13 @@ msgstr ""
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,state:0
 msgid "Set State to"
-msgstr ""
+msgstr "Define Estado para"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "There is no mail to reply!"
-msgstr ""
+msgstr "Não há email para resposta!"
 
 #. module: crm
 #: wizard_button:crm.job.partner_create,init,confirm:0
@@ -1022,7 +1082,7 @@ msgstr "%(case_description)s = Descrição de Caso"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "My Funds"
-msgstr ""
+msgstr "Meus Fundos"
 
 #. module: crm
 #: field:crm.case,partner_mobile:0
@@ -1030,7 +1090,8 @@ msgid "Mobile"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,name:0 field:crm.segmentation.line,name:0
+#: field:crm.case.rule,name:0
+#: field:crm.segmentation.line,name:0
 msgid "Rule Name"
 msgstr "Nome da Regra"
 
@@ -1047,12 +1108,12 @@ msgstr "Processo Histórico"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job2
 msgid "Junior Developer"
-msgstr ""
+msgstr "Desenvolvedor júnior"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Minhas Reuniões"
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1062,7 +1123,7 @@ msgstr "Nome da Categoria do Case"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "Preventivo"
 
 #. module: crm
 #: field:crm.case.rule,act_email_cc:0
@@ -1075,8 +1136,10 @@ msgid "Export ICS"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_claim.py:0 code:addons/crm/crm_helpdesk.py:0
-#: code:addons/crm/crm_meeting.py:0 code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/crm_claim.py:0
+#: code:addons/crm/crm_helpdesk.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/crm_opportunity.py:0
 #: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "You can not assign Closed Case."
@@ -1091,12 +1154,14 @@ msgstr ""
 "parceiro."
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:0 code:addons/crm/wizard/crm_job_wizard.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/wizard/crm_job_wizard.py:0
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
-#: model:crm.case.section,name:crm.section_support1 view:crm.meeting:0
+#: model:crm.case.section,name:crm.section_support1
+#: view:crm.meeting:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "Reuniões"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1109,8 +1174,10 @@ msgid "Next Action"
 msgstr "Próxima ação"
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,date_deadline:0
-#: selection:crm.case.rule,trg_date_type:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: field:crm.case,date_deadline:0
+#: selection:crm.case.rule,trg_date_type:0
+#: view:crm.opportunity:0
 msgid "Deadline"
 msgstr "Prazo final"
 
@@ -1142,8 +1209,10 @@ msgid "Category of case"
 msgstr "Categorias de casos"
 
 #. module: crm
-#: field:crm.email.add.cc,subject:0 view:crm.meeting:0
-#: wizard_field:crm.new.send.mail,init,subject:0 view:crm.phonecall:0
+#: field:crm.email.add.cc,subject:0
+#: view:crm.meeting:0
+#: wizard_field:crm.new.send.mail,init,subject:0
+#: view:crm.phonecall:0
 #: wizard_field:crm.send.mail,init,subject:0
 msgid "Subject"
 msgstr ""
@@ -1238,13 +1307,15 @@ msgid "Print"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,som:0 field:crm.case.log,som:0
+#: field:crm.case,som:0
+#: field:crm.case.log,som:0
 #: selection:crm.segmentation.line,expr_name:0
 msgid "State of Mind"
 msgstr "Estado emocional"
 
 #. module: crm
-#: view:crm.claim:0 view:crm.meeting:0
+#: view:crm.claim:0
+#: view:crm.meeting:0
 #: field:report.crm.case.section.categ.categ2,category2_id:0
 #: field:report.crm.case.section.categ2,category2_id:0
 msgid "Type"
@@ -1279,7 +1350,8 @@ msgid "Creation Date"
 msgstr "Data de Criação"
 
 #. module: crm
-#: view:crm.meeting:0 view:crm.phonecall:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
 #: model:process.node,name:crm.process_node_meeting0
 msgid "Meeting"
 msgstr ""
@@ -1290,8 +1362,13 @@ msgid "%(partner_email)s = Partner email"
 msgstr "%(partner_email)s = Email do Parceiro"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 msgid "Reset to Draft"
 msgstr "Restaurar para esboço"
 
@@ -1315,7 +1392,8 @@ msgid "Open cases"
 msgstr "Casos abertos"
 
 #. module: crm
-#: field:crm.case,stage_id:0 view:crm.case.stage:0
+#: field:crm.case,stage_id:0
+#: view:crm.case.stage:0
 #: field:report.crm.case.section.categ.categ2,stage_id:0
 #: field:report.crm.case.section.categ.stage,stage_id:0
 #: field:report.crm.case.section.categ2,stage_id:0
@@ -1366,7 +1444,9 @@ msgid "Meeting Date"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 view:crm.lead:0 view:crm.phonecall:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.phonecall:0
 msgid "Convert to Partner"
 msgstr ""
 
@@ -1384,7 +1464,7 @@ msgstr "ID do maior parceiro processado"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "You can not delete this case. You should better cancel it."
-msgstr ""
+msgstr "Você não pode excluir este caso. O melhor é você cancelá-lo."
 
 #. module: crm
 #: wizard_button:caldav.crm.subscribe,init,open:0
@@ -1425,10 +1505,11 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "done"
-msgstr ""
+msgstr "concluído"
 
 #. module: crm
-#: view:crm.meeting:0 view:crm.phonecall:0
+#: view:crm.meeting:0
+#: view:crm.phonecall:0
 msgid "Reminder"
 msgstr ""
 
@@ -1445,7 +1526,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "open"
-msgstr ""
+msgstr "Abrir"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_attach:0
@@ -1484,7 +1565,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "draft"
-msgstr ""
+msgstr "esboço"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim5
@@ -1493,8 +1574,10 @@ msgid "Awaiting Response"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,date:0 field:crm.case.log,date:0
-#: selection:crm.case.rule,trg_date_type:0 view:crm.claim:0
+#: field:crm.case,date:0
+#: field:crm.case.log,date:0
+#: selection:crm.case.rule,trg_date_type:0
+#: view:crm.claim:0
 #: view:crm.phonecall:0
 msgid "Date"
 msgstr "Data"
@@ -1521,8 +1604,12 @@ msgid "Converted"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Reply to Last Email"
 msgstr ""
 
@@ -1537,8 +1624,12 @@ msgid "Gives Location of Meeting"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "History"
 msgstr "Histórico"
 
@@ -1558,7 +1649,8 @@ msgid "Regular Expression on Case Name"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,state:0 field:report.crm.case.section.categ.categ2,state:0
+#: field:crm.case,state:0
+#: field:report.crm.case.section.categ.categ2,state:0
 #: field:report.crm.case.section.categ.stage,state:0
 #: field:report.crm.case.section.categ2,state:0
 #: field:report.crm.case.section.stage,state:0
@@ -1571,27 +1663,36 @@ msgid "Send Reminder"
 msgstr "Enviar lembrete"
 
 #. module: crm
-#: view:crm.case:0 view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.case:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "References"
 msgstr "Referências"
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #: wizard_button:crm.case.opportunity.partner_opportunity,init,end:0
-#: view:crm.claim:0 view:crm.claim.assign_wizard:0 view:crm.fundraising:0
+#: view:crm.claim:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.fundraising:0
 #: view:crm.helpdesk.assign_wizard:0
 #: wizard_button:crm.job.meeting_set,init,end:0
 #: wizard_button:crm.job.partner_create,init,end:0
-#: wizard_button:crm.job.reschedule_phone_call,init,end:0 view:crm.lead:0
+#: wizard_button:crm.job.reschedule_phone_call,init,end:0
+#: view:crm.lead:0
 #: wizard_button:crm.lead.opportunity_set,create_partner,end:0
 #: wizard_button:crm.lead.opportunity_set,opportunity,end:0
 #: wizard_button:crm.lead.partner_create,init,end:0
 #: view:crm.meeting.generic_wizard:0
-#: wizard_button:crm.new.send.mail,init,end:0 view:crm.opportunity:0
+#: wizard_button:crm.new.send.mail,init,end:0
+#: view:crm.opportunity:0
 #: view:crm.opportunity.assign_wizard:0
 #: wizard_button:crm.opportunity.reschedule_phone_call,init,end:0
-#: view:crm.phonecall:0 view:crm.phonecall.assign_wizard:0
+#: view:crm.phonecall:0
+#: view:crm.phonecall.assign_wizard:0
 #: wizard_button:crm.phonecall.meeting_set,init,end:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,end:0
 #: wizard_button:crm.phonecall.opportunity_set,opportunity,end:0
@@ -1638,7 +1739,8 @@ msgid "Claim Cost"
 msgstr ""
 
 #. module: crm
-#: view:crm.job:0 view:crm.opportunity:0
+#: view:crm.job:0
+#: view:crm.opportunity:0
 msgid "Schedule a Phone Call"
 msgstr ""
 
@@ -1693,8 +1795,12 @@ msgid "Sale Amount"
 msgstr "Montante de Vendas"
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
 msgid "Add a CC"
 msgstr ""
 
@@ -1704,7 +1810,9 @@ msgid "="
 msgstr "="
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.job:0 field:crm.menu.config_wizard,name:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: field:crm.menu.config_wizard,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
 msgstr "Nome"
@@ -1725,7 +1833,8 @@ msgid "Mail to watchers (CC)"
 msgstr ""
 
 #. module: crm
-#: view:crm.fundraising:0 view:crm.meeting:0
+#: view:crm.fundraising:0
+#: view:crm.meeting:0
 msgid "Next Meeting"
 msgstr ""
 
@@ -1753,14 +1862,19 @@ msgid "Bug Tracking"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.case.rule:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.case:0
+#: view:crm.case.rule:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Actions"
 msgstr "Ações"
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "High"
@@ -1858,7 +1972,8 @@ msgid "Email Fail!"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_phone1 view:crm.phonecall:0
+#: model:crm.case.categ,name:crm.categ_phone1
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
@@ -1884,7 +1999,8 @@ msgstr ""
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 #: view:report.crm.case.section.categ.stage:0
-#: view:report.crm.case.section.categ2:0 view:report.crm.case.section.stage:0
+#: view:report.crm.case.section.categ2:0
+#: view:report.crm.case.section.stage:0
 msgid "This Year"
 msgstr ""
 
@@ -1894,7 +2010,8 @@ msgid "Remind Partner"
 msgstr "Relembre Parceiro"
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Highest"
@@ -1975,7 +2092,8 @@ msgid "Convert To Opportunity"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_phone2 view:crm.phonecall:0
+#: model:crm.case.stage,name:crm.stage_phone2
+#: view:crm.phonecall:0
 msgid "Held"
 msgstr ""
 
@@ -2015,10 +2133,12 @@ msgstr "Estado do caso"
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Send"
-msgstr ""
+msgstr "Enviar"
 
 #. module: crm
-#: field:crm.case,priority:0 view:crm.fundraising:0 view:crm.lead:0
+#: field:crm.case,priority:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Priority"
 msgstr "Prioridade"
@@ -2047,7 +2167,9 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: view:crm.claim:0 view:crm.job:0 view:crm.lead:0
+#: view:crm.claim:0
+#: view:crm.job:0
+#: view:crm.lead:0
 msgid "Stage: "
 msgstr ""
 
@@ -2062,12 +2184,15 @@ msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/crm_claim.py:0
-#: code:addons/crm/crm_helpdesk.py:0 code:addons/crm/crm_meeting.py:0
-#: code:addons/crm/crm_opportunity.py:0 code:addons/crm/crm_phonecall.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm_claim.py:0
+#: code:addons/crm/crm_helpdesk.py:0
+#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Erro !"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2177,7 +2302,8 @@ msgid "%(case_date)s = Creation date"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.stage,name:crm.stage_phone3 view:crm.phonecall:0
+#: model:crm.case.stage,name:crm.stage_phone3
+#: view:crm.phonecall:0
 msgid "Not Held"
 msgstr ""
 
@@ -2220,7 +2346,8 @@ msgid "Month"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.section,name:crm.section_support2 view:crm.lead:0
+#: model:crm.case.section,name:crm.section_support2
+#: view:crm.lead:0
 #: field:crm.menu.config_wizard,lead:0
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
@@ -2264,7 +2391,8 @@ msgstr "Log"
 
 #. module: crm
 #: help:crm.menu.config_wizard,fund:0
-msgid "This may help associations in their fund raising process and tracking."
+msgid ""
+"This may help associations in their fund raising process and tracking."
 msgstr ""
 
 #. module: crm
@@ -2296,14 +2424,16 @@ msgid "Delay Close"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Low"
 msgstr "Baixo"
 
 #. module: crm
-#: field:crm.case,date_closed:0 selection:crm.case,state:0
+#: field:crm.case,date_closed:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
@@ -2323,7 +2453,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "cancel"
-msgstr ""
+msgstr "cancelar"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2331,7 +2461,10 @@ msgid "Internal Meeting"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,child_ids:0 view:crm.claim:0 view:crm.lead:0
+#: view:crm.case:0
+#: field:crm.case,child_ids:0
+#: view:crm.claim:0
+#: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Events"
 msgstr ""
@@ -2384,7 +2517,8 @@ msgstr ""
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:0
 #: model:crm.case.section,name:crm.section_support_phone
-#: field:crm.menu.config_wizard,phonecall:0 view:crm.phonecall:0
+#: field:crm.menu.config_wizard,phonecall:0
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #, python-format
@@ -2419,7 +2553,8 @@ msgid "Cheque"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,active:0 field:crm.case.rule,active:0
+#: field:crm.case,active:0
+#: field:crm.case.rule,active:0
 #: field:crm.case.section,active:0
 msgid "Active"
 msgstr "Ativo"
@@ -2459,8 +2594,10 @@ msgid "Months"
 msgstr "Meses"
 
 #. module: crm
-#: view:crm.claim.assign_wizard:0 view:crm.helpdesk.assign_wizard:0
-#: view:crm.opportunity.assign_wizard:0 view:crm.phonecall.assign_wizard:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.helpdesk.assign_wizard:0
+#: view:crm.opportunity.assign_wizard:0
+#: view:crm.phonecall.assign_wizard:0
 #: model:ir.actions.act_window,name:crm.action_crm_claim_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_helpdesk_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_opportunity_assign_wizard
@@ -2492,8 +2629,10 @@ msgstr "Ação"
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
-#: model:crm.case.section,name:crm.section_support_claims view:crm.claim:0
-#: field:crm.menu.config_wizard,claims:0 view:crm.phonecall:0
+#: model:crm.case.section,name:crm.section_support_claims
+#: view:crm.claim:0
+#: field:crm.menu.config_wizard,claims:0
+#: view:crm.phonecall:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_claims
 #, python-format
 msgid "Claims"
@@ -2531,7 +2670,8 @@ msgid "Sales"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.phonecall:0
 msgid "General"
 msgstr "Geral"
 
@@ -2552,8 +2692,12 @@ msgid "Other"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.lead:0
+#: selection:crm.new.send.mail,init,state:0
+#: view:crm.opportunity:0
 msgid "Done"
 msgstr ""
 
@@ -2568,12 +2712,18 @@ msgid "All Opportunities"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -2611,11 +2761,17 @@ msgid "Helpdesk"
 msgstr ""
 
 #. module: crm
-#: field:crm.case,user_id:0 field:crm.case.rule,trg_user_id:0 view:crm.claim:0
-#: field:crm.claim.assign_wizard,user_id:0 view:crm.fundraising:0
-#: field:crm.helpdesk.assign_wizard,user_id:0 view:crm.job:0
-#: view:crm.meeting:0 field:crm.meeting.generic_wizard,user_id:0
-#: view:crm.opportunity:0 field:crm.opportunity.assign_wizard,user_id:0
+#: field:crm.case,user_id:0
+#: field:crm.case.rule,trg_user_id:0
+#: view:crm.claim:0
+#: field:crm.claim.assign_wizard,user_id:0
+#: view:crm.fundraising:0
+#: field:crm.helpdesk.assign_wizard,user_id:0
+#: view:crm.job:0
+#: view:crm.meeting:0
+#: field:crm.meeting.generic_wizard,user_id:0
+#: view:crm.opportunity:0
+#: field:crm.opportunity.assign_wizard,user_id:0
 #: field:crm.phonecall.assign_wizard,user_id:0
 msgid "Responsible"
 msgstr "Responsável"
@@ -2649,6 +2805,8 @@ msgid ""
 "You can not escalate this case.\n"
 "You are already at the top level."
 msgstr ""
+"Você não pode escalar este case.\n"
+"Você já está em nível superior."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2694,7 +2852,8 @@ msgstr ""
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 #: view:report.crm.case.section.categ.stage:0
-#: view:report.crm.case.section.categ2:0 view:report.crm.case.section.stage:0
+#: view:report.crm.case.section.categ2:0
+#: view:report.crm.case.section.stage:0
 msgid "This Month"
 msgstr ""
 
@@ -2711,12 +2870,12 @@ msgstr ""
 #. module: crm
 #: help:crm.case,state:0
 msgid ""
-"The state is set to 'Draft', when a case is "
-"created.                                  \n"
-"If the case is in progress the state is set to "
-"'Open'.                                  \n"
-"When the case is over, the state is set to "
-"'Done'.                                  \n"
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
 
@@ -2882,7 +3041,8 @@ msgid "Provide path for Remote Calendar"
 msgstr ""
 
 #. module: crm
-#: view:crm.segmentation:0 field:crm.segmentation.line,segmentation_id:0
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
 msgid "Segmentation"
 msgstr "Segmentação"
 
@@ -2942,7 +3102,8 @@ msgstr ""
 #. module: crm
 #: wizard_button:caldav.crm.export,init,end:0
 #: wizard_button:caldav.crm.import,display,end:0
-#: wizard_button:caldav.crm.subscribe,display,end:0 view:crm.email.add.cc:0
+#: wizard_button:caldav.crm.subscribe,display,end:0
+#: view:crm.email.add.cc:0
 msgid "Ok"
 msgstr ""
 
@@ -2964,10 +3125,11 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 code:addons/crm/wizard/wizard_cal_subscribe.py:0
+#: code:addons/crm/crm.py:0
+#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_claim_assign_wizard
@@ -2981,7 +3143,8 @@ msgid "All Jobs Requests"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case,state:0 selection:crm.case.rule,act_state:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
 #: selection:report.crm.case.section.categ.categ2,state:0
@@ -3049,7 +3212,8 @@ msgid "%(case_subject)s = Case subject"
 msgstr "%(case_subject)s = Assunto do Caso"
 
 #. module: crm
-#: field:crm.case,section_id:0 field:crm.case.log,section_id:0
+#: field:crm.case,section_id:0
+#: field:crm.case.log,section_id:0
 #: field:crm.case.rule,trg_section_id:0
 #: field:crm.claim.assign_wizard,section_id:0
 #: field:crm.helpdesk.assign_wizard,section_id:0
@@ -3093,13 +3257,15 @@ msgstr "Sua ação"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead3
-#: field:crm.case.history,email:0 field:crm.email.add.cc,email:0
+#: field:crm.case.history,email:0
+#: field:crm.email.add.cc,email:0
 #: view:crm.job:0
 msgid "Email"
 msgstr "E-mail"
 
 #. module: crm
-#: field:crm.case,canal_id:0 field:crm.case.log,canal_id:0
+#: field:crm.case,canal_id:0
+#: field:crm.case.log,canal_id:0
 msgid "Channel"
 msgstr "Canal"
 
@@ -3144,12 +3310,18 @@ msgid "Reporting"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.claim:0
-#: view:crm.fundraising:0 view:crm.job:0 view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0 view:crm.opportunity:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: selection:crm.new.send.mail,init,state:0
+#: view:crm.opportunity:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -3205,7 +3377,8 @@ msgid "Lead Subject"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0 view:crm.phonecall:0
+#: view:crm.lead:0
+#: view:crm.phonecall:0
 msgid "Convert to Opportunity"
 msgstr ""
 
@@ -3298,7 +3471,8 @@ msgid "All Funds"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.section,calendar:0 view:crm.meeting:0
+#: field:crm.case.section,calendar:0
+#: view:crm.meeting:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
 msgid "Calendar"
 msgstr "Calendário"
@@ -3324,7 +3498,8 @@ msgid "Sales Purchase"
 msgstr "Propostas de vendas"
 
 #. module: crm
-#: view:crm.job:0 model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
+#: view:crm.job:0
+#: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
 msgid "Schedule Meeting"
 msgstr ""
@@ -3335,7 +3510,8 @@ msgid "Arts And Culture"
 msgstr ""
 
 #. module: crm
-#: model:crm.case.categ,name:crm.categ_phone2 view:crm.phonecall:0
+#: model:crm.case.categ,name:crm.categ_phone2
+#: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
@@ -3360,14 +3536,17 @@ msgstr "Parado"
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,probability:0
 #: wizard_field:crm.lead.opportunity_set,opportunity,probability:0
+#: wizard_field:crm.phonecall.opportunity_set,opportunity,probability:0
 msgid "Success Probability"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 selection:crm.case,state:0
+#: code:addons/crm/crm.py:0
+#: selection:crm.case,state:0
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0 view:crm.meeting:0
+#: selection:crm.case.rule,trg_state_to:0
+#: view:crm.meeting:0
 #: selection:report.crm.case.section.categ.categ2,state:0
 #: selection:report.crm.case.section.categ.stage,state:0
 #: selection:report.crm.case.section.categ2,state:0
@@ -3392,7 +3571,8 @@ msgid "Set section to"
 msgstr "Definir seção para"
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Normal"
@@ -3404,7 +3584,7 @@ msgstr "Normal"
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "You must put a Partner eMail to use this action!"
-msgstr ""
+msgstr "Você deve colocar um e-mail de parceiro para utilizar esta ação!"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -3426,7 +3606,8 @@ msgid "Change RRule"
 msgstr ""
 
 #. module: crm
-#: selection:crm.email.add.cc,name:0 field:crm.email.add.cc,user_id:0
+#: selection:crm.email.add.cc,name:0
+#: field:crm.email.add.cc,user_id:0
 #: field:report.crm.case.section.categ.categ2,user_id:0
 #: field:report.crm.case.section.categ.stage,user_id:0
 #: field:report.crm.case.section.categ2,user_id:0
@@ -3476,6 +3657,8 @@ msgstr ""
 msgid ""
 "Can not send mail with empty body,you should have description in the body"
 msgstr ""
+"Não é possível enviar um e-mail com uma mensagem de corpo vazia, escreva a "
+"mensagem"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3506,10 +3689,15 @@ msgid "Healthcare"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.claim.assign_wizard:0
-#: view:crm.helpdesk.assign_wizard:0 view:crm.meeting:0
-#: view:crm.meeting.generic_wizard:0 view:crm.opportunity:0
-#: view:crm.opportunity.assign_wizard:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.claim.assign_wizard:0
+#: view:crm.helpdesk.assign_wizard:0
+#: view:crm.meeting:0
+#: view:crm.meeting.generic_wizard:0
+#: view:crm.opportunity:0
+#: view:crm.opportunity.assign_wizard:0
+#: view:crm.phonecall:0
 #: view:crm.phonecall.assign_wizard:0
 msgid "Assign"
 msgstr ""
@@ -3535,7 +3723,9 @@ msgid "Stage of case"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 view:crm.fundraising:0 view:crm.opportunity:0
+#: view:crm.case:0
+#: view:crm.fundraising:0
+#: view:crm.opportunity:0
 msgid "Estimates"
 msgstr "Estimativas"
 
@@ -3545,7 +3735,8 @@ msgid "Responsible User"
 msgstr "Usuário Responsável"
 
 #. module: crm
-#: code:addons/crm/crm.py:0 view:crm.case:0
+#: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #, python-format
 msgid "Close"
 msgstr "Fechar"
@@ -3603,9 +3794,14 @@ msgid "% = The '%' Character"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0 field:crm.case,name:0 field:crm.case.history,description:0
-#: field:crm.case.history,note:0 view:crm.job:0 view:crm.meeting:0
-#: view:crm.opportunity:0 view:crm.phonecall:0
+#: view:crm.case:0
+#: field:crm.case,name:0
+#: field:crm.case.history,description:0
+#: field:crm.case.history,note:0
+#: view:crm.job:0
+#: view:crm.meeting:0
+#: view:crm.opportunity:0
+#: view:crm.phonecall:0
 #: field:crm.segmentation,description:0
 msgid "Description"
 msgstr "Descrição"
@@ -3631,9 +3827,14 @@ msgstr ""
 "Marque isto se quiser a regra para enviar um aviso por e-mail para o usuário."
 
 #. module: crm
-#: view:crm.case:0 view:crm.claim:0 view:crm.fundraising:0 view:crm.job:0
-#: view:crm.lead:0 wizard_field:crm.new.send.mail,init,cc:0
-#: view:crm.opportunity:0 wizard_field:crm.send.mail,init,cc:0
+#: view:crm.case:0
+#: view:crm.claim:0
+#: view:crm.fundraising:0
+#: view:crm.job:0
+#: view:crm.lead:0
+#: wizard_field:crm.new.send.mail,init,cc:0
+#: view:crm.opportunity:0
+#: wizard_field:crm.send.mail,init,cc:0
 msgid "CC"
 msgstr ""
 
@@ -3648,10 +3849,14 @@ msgid "_Import"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0 field:crm.case.log,case_id:0
-#: field:crm.claim,inherit_case_id:0 field:crm.fundraising,inherit_case_id:0
-#: field:crm.helpdesk,inherit_case_id:0 field:crm.job,inherit_case_id:0
-#: field:crm.lead,inherit_case_id:0 field:crm.meeting,inherit_case_id:0
+#: code:addons/crm/crm.py:0
+#: field:crm.case.log,case_id:0
+#: field:crm.claim,inherit_case_id:0
+#: field:crm.fundraising,inherit_case_id:0
+#: field:crm.helpdesk,inherit_case_id:0
+#: field:crm.job,inherit_case_id:0
+#: field:crm.lead,inherit_case_id:0
+#: field:crm.meeting,inherit_case_id:0
 #: field:crm.opportunity,inherit_case_id:0
 #: field:crm.phonecall,inherit_case_id:0
 #: model:ir.model,name:crm.model_crm_case
@@ -3661,7 +3866,8 @@ msgid "Case"
 msgstr "Caso"
 
 #. module: crm
-#: selection:crm.case,priority:0 selection:crm.case.rule,act_priority:0
+#: selection:crm.case,priority:0
+#: selection:crm.case.rule,act_priority:0
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Lowest"
@@ -3697,7 +3903,8 @@ msgstr ""
 "por este fator. Trata-se de uma multiplicação"
 
 #. module: crm
-#: wizard_view:crm.new.send.mail,init:0 wizard_view:crm.send.mail,init:0
+#: wizard_view:crm.new.send.mail,init:0
+#: wizard_view:crm.send.mail,init:0
 msgid "Mass Mailing"
 msgstr ""
 
@@ -3722,7 +3929,7 @@ msgstr ""
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds by Categories"
-msgstr "Categorias"
+msgstr ""
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
@@ -3773,7 +3980,8 @@ msgid "Export ICS File"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.rule,sequence:0 field:crm.case.section,sequence:0
+#: field:crm.case.rule,sequence:0
+#: field:crm.case.section,sequence:0
 #: field:crm.case.stage,sequence:0
 msgid "Sequence"
 msgstr "Sequência"
@@ -3821,8 +4029,11 @@ msgstr ""
 #~ msgid "Add Last Mail for Replying"
 #~ msgstr "Adicionar último e-mail para responder"
 
-#~ msgid "this wizard will create all sub-menus, within the selected menu."
-#~ msgstr "este wizard cria todos os sub-menus, dentro de um menu selecionado"
+#~ msgid "Update The Proposed Menus To Be Created"
+#~ msgstr "Atualizar os menus propostos para serem criados"
+
+#~ msgid "Base Information"
+#~ msgstr "Informações básicas"
 
 #~ msgid "All Open "
 #~ msgstr "Tudo aberto "
@@ -3830,12 +4041,18 @@ msgstr ""
 #~ msgid "Create menus for a case section"
 #~ msgstr "Criar menus para uma seção de caso"
 
+#~ msgid "My "
+#~ msgstr "Meu "
+
 #~ msgid "Create menu Entries"
 #~ msgstr "Criar entradas de menus"
 
 #~ msgid "All Unclosed and Unassigned "
 #~ msgstr "Todos abertos e não assinados "
 
+#~ msgid "Extra Info"
+#~ msgstr "Informações Extra"
+
 #~ msgid "My Open "
 #~ msgstr "Meus abertos "
 
@@ -3845,6 +4062,12 @@ msgstr ""
 #~ msgid "Excluded Answers :"
 #~ msgstr "Respostas Excluídas :"
 
+#~ msgid "Profiling"
+#~ msgstr "Avaliação"
+
+#~ msgid "My cases"
+#~ msgstr "Meus casos"
+
 #~ msgid "All Draft "
 #~ msgstr "Todos esboços "
 
@@ -3860,14 +4083,36 @@ msgstr ""
 #~ msgid "My Unclosed "
 #~ msgstr "Meus não fechados "
 
+#~ msgid "Profiling Options"
+#~ msgstr "Filtrando Opções"
+
+#~ msgid "My Pending "
+#~ msgstr "Minhas pendências "
+
+#~ msgid "New Form"
+#~ msgstr "Novo formulário"
+
+#~ msgid ""
+#~ "These people will receive a copy of the futur communication between partner "
+#~ "and users by email"
+#~ msgstr ""
+#~ "Essas pessoas receberão uma cópia por e-mail da futura comunicação entre "
+#~ "parceiros e usuários"
+
+#~ msgid "New With Calendar"
+#~ msgstr "Novo com calendário"
+
 #~ msgid "List With Calendar"
 #~ msgstr "Lista com calendário"
 
-#~ msgid ""
-#~ "You may want to create a new parent menu to put all the created menus in."
-#~ msgstr ""
-#~ "Pode ser que você queira criar um novo menu principal para agregar todos "
-#~ "os menus criados."
+#~ msgid "Calendar View"
+#~ msgstr "Visualização do Calendário"
+
+#~ msgid "Created Menus"
+#~ msgstr "Menus criados"
+
+#~ msgid "Parent Menu"
+#~ msgstr "Menu Superior(pai)"
 
 #~ msgid "Included Answers :"
 #~ msgstr "Respostas incluídas :"
@@ -3878,8 +4123,8 @@ msgstr ""
 #~ msgid "Base Menu Name"
 #~ msgstr "Nome do menu básico"
 
-#~ msgid "Created Menus"
-#~ msgstr "Menus criados"
+#~ msgid "All Unassigned "
+#~ msgstr "Tudo não atribuído "
 
 #~ msgid "All Unclosed "
 #~ msgstr "Tudo aberto "
@@ -3893,13 +4138,14 @@ msgstr ""
 #~ msgid "Create Menus For Cases"
 #~ msgstr "Criar Menus para os Casos"
 
+#~ msgid "All Pending "
+#~ msgstr "Tudo Pendente "
+
 #~ msgid "All Canceled "
 #~ msgstr "Tudo cancelado "
 
-#~ msgid "Deadline Date is automatically computed from Start Date + Duration"
-#~ msgstr ""
-#~ "Data limite é calculada automaticamente pela soma da Data Inicial + "
-#~ "Duração"
+#~ msgid "All "
+#~ msgstr "Tudo "
 
 #~ msgid "List"
 #~ msgstr "Listar"
@@ -3913,11 +4159,11 @@ msgstr ""
 #~ msgid "My Canceled "
 #~ msgstr "Meus cancelados "
 
-#~ msgid "Form View"
-#~ msgstr "Visualização de formulário"
+#~ msgid "Mail to watchers (Cc)"
+#~ msgstr "Correio para observadors (cc)"
 
 #~ msgid "crm.case.section.open"
 #~ msgstr "crm.case.section.open"
 
-#~ msgid "Update The Proposed Menus To Be Created"
-#~ msgstr "Atualizar os menus propostos para serem criados"
+#~ msgid "Form View"
+#~ msgstr "Visualização de formulário"
diff --git a/addons/crm/report/__init__.py b/addons/crm/report/__init__.py
index ac2113a5deb..2c08abaca5e 100644
--- a/addons/crm/report/__init__.py
+++ b/addons/crm/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/crm/report/crm_report.py b/addons/crm/report/crm_report.py
index 87b77937c5a..e847f010b77 100644
--- a/addons/crm/report/crm_report.py
+++ b/addons/crm/report/crm_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/crm/report/report_businessopp.py b/addons/crm/report/report_businessopp.py
index fb54dc88b18..74022e00c28 100644
--- a/addons/crm/report/report_businessopp.py
+++ b/addons/crm/report/report_businessopp.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/crm/scripts/__init__.py b/addons/crm/scripts/__init__.py
index 7ccd749f0a5..9d7f6bf56c9 100644
--- a/addons/crm/scripts/__init__.py
+++ b/addons/crm/scripts/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/crm/scripts/openerp_mailgate/__init__.py b/addons/crm/scripts/openerp_mailgate/__init__.py
index 6f9eb256735..4f7fae0a190 100644
--- a/addons/crm/scripts/openerp_mailgate/__init__.py
+++ b/addons/crm/scripts/openerp_mailgate/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index d2c996ce223..0e4fd4347bd 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 8d2c5530c7d..ab5fd369f0f 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -9,14 +9,14 @@
     <record id="group_crm_user" model="res.groups">
         <field name="name">CRM / User</field>
     </record>
+<!---->
+<!--    <record model='ir.ui.menu' id='menu_crm'>-->
+<!--        <field name="groups_id" eval="[(6,0,[ref('group_crm_manager'),ref('group_crm_user')])]"/>-->
+<!--    </record>-->
 
-    <record model='ir.ui.menu' id='menu_crm'>
-        <field name="groups_id" eval="[(6,0,[ref('group_crm_manager'),ref('group_crm_user')])]"/>
-    </record>
-
-    <record model='ir.ui.menu' id='menu_crm_configuration'>
-        <field name="groups_id" eval="[(6,0,[ref('group_crm_manager')])]"/>
-    </record>
+<!--    <record model='ir.ui.menu' id='menu_crm_configuration'>-->
+<!--        <field name="groups_id" eval="[(6,0,[ref('group_crm_manager')])]"/>-->
+<!--    </record>-->
 
     <!--rule for meeting-->
     <record model="ir.rule.group" id="crm_meeting_rule_group">
@@ -26,7 +26,7 @@
     </record>
 
 	<record id="crm_meeting_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_meeting_rule_group"/>
     </record>
 
@@ -37,7 +37,7 @@
         <field name="global" eval="True"/>
     </record>
 	<record id="crm_claim_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_claim_rule_group"/>
     </record>
 
@@ -48,7 +48,7 @@
         <field name="global" eval="True"/>
     </record>
 	<record id="crm_fundraising_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_fundraising_rule_group"/>
     </record>
 
@@ -59,20 +59,10 @@
         <field name="global" eval="True"/>
     </record>
 	<record id="crm_helpdesk_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_helpdesk_rule_group"/>
     </record>
 
-    <!--rule for Jobs-->
-    <record model="ir.rule.group" id="crm_job_rule_group">
-        <field name="name">crm.meeting.rule</field>
-        <field name="model_id" search="[('model','=','crm.job')]" model="ir.model"/>
-        <field name="global" eval="True"/>
-    </record>
-	<record id="crm_job_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
-        <field name="rule_group" ref="crm_job_rule_group"/>
-    </record>
 
     <!--rule for leads-->
     <record model="ir.rule.group" id="crm_leads_rule_group">
@@ -81,7 +71,7 @@
         <field name="global" eval="True"/>
     </record>
 	<record id="crm_leads_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_leads_rule_group"/>
    </record>
 
@@ -92,7 +82,7 @@
         <field name="global" eval="True"/>
     </record>
 	<record id="crm_opportunities_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_opportunities_rule_group"/>
     </record>
 
@@ -103,7 +93,7 @@
         <field name="global" eval="True"/>
     </record>
     <record id="crm_phone_calls_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_phone_calls_rule_group"/>
     </record>
 
@@ -114,7 +104,7 @@
         <field name="global" eval="True"/>
     </record>
     <record id="crm_case_rule" model="ir.rule">
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
         <field name="rule_group" ref="crm_case_rule_group"/>
     </record>
     </data>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index d9073168f3e..62be2041d98 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -21,15 +21,10 @@
 
 import crm_opportunity_wizard
 import crm_lead_wizard
-import crm_job_wizard
 import crm_phonecall_wizard
 
-
 import wizard_crm_send_email
 import wizard_crm_new_send_email
-import wizard_cal_export
-import wizard_cal_import
-import wizard_cal_subscribe
 import wizard_history_event
 
 
diff --git a/addons/crm/wizard/crm_lead_wizard.py b/addons/crm/wizard/crm_lead_wizard.py
index fd7022ac5f1..a7c24863ee1 100644
--- a/addons/crm/wizard/crm_lead_wizard.py
+++ b/addons/crm/wizard/crm_lead_wizard.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -96,14 +96,17 @@ class lead2opportunity(wizard.interface):
 
         lead_case_obj = pool.get('crm.lead')
         opportunity_case_obj = pool.get('crm.opportunity')        
-        for lead in lead_case_obj.browse(cr, uid, data['ids']):         
+        for lead in lead_case_obj.browse(cr, uid, data['ids']):
             #TODO : Take other info from lead       
             new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
                 'name': data['form']['name'],
                 'planned_revenue': data['form']['planned_revenue'],
                 'probability': data['form']['probability'],
                 'partner_id': data['form']['partner_id'],
-                'case_id':lead.inherit_case_id.id,                
+                'section_id':lead.section_id.id,
+                'description':lead.description,
+                'partner_address_id':lead.partner_address_id.id, 
+                'priority':lead.priority,         
             })       
             
             new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
@@ -111,8 +114,8 @@ class lead2opportunity(wizard.interface):
             vals = {
                 'partner_id': data['form']['partner_id'],                
                 }
-            if not lead.case_id:
-                vals.update({'case_id' : new_opportunity.inherit_case_id.id})
+            if not lead.opportunity_id:
+                vals.update({'opportunity_id' : new_opportunity.id})
 
             lead_case_obj.write(cr, uid, [lead.id], vals)
             lead_case_obj.case_cancel(cr, uid, [lead.id])
diff --git a/addons/crm/wizard/crm_opportunity_wizard.py b/addons/crm/wizard/crm_opportunity_wizard.py
index 1f79102bc93..50e62ddfa99 100644
--- a/addons/crm/wizard/crm_opportunity_wizard.py
+++ b/addons/crm/wizard/crm_opportunity_wizard.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -41,12 +41,12 @@ class opportunity2phonecall(wizard.interface):
                     <field name='note' colspan="4"/>
                     <newline />
                     <field name='section_id' />    
-                    <field name='category_id' domain="[('section_id','=',section_id)]"/>
+                    <field name='category_id' domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.phonecall')]"/>
                 </form>"""
 
     case_fields = {
         'user_id' : {'string' : 'Assign To', 'type' : 'many2one', 'relation' : 'res.users'},
-        'deadline' : {'string' : 'Planned Date', 'type' : 'datetime'},
+        'deadline' : {'string' : 'Planned Date', 'type' : 'datetime' ,'required' :True},
         'note' : {'string' : 'Goals', 'type' : 'text'},
         'category_id' : {'string' : 'Category', 'type' : 'many2one', 'relation' : 'crm.case.categ', 'required' :True},
         'section_id' : {'string' : 'Section', 'type' : 'many2one', 'relation' : 'crm.case.section'},
@@ -59,7 +59,7 @@ class opportunity2phonecall(wizard.interface):
         return {
                 'user_id' : case.user_id and case.user_id.id,
                 'category_id' : categ_id and categ_id[0] or case.categ_id and case.categ_id.id,
-                'section_id' : case.section_id and case.section_id or False,
+                'section_id' : case.section_id and case.section_id.id or False,
                 'note' : case.description
                }
 
@@ -86,14 +86,20 @@ class opportunity2phonecall(wizard.interface):
             #TODO : Take Other Info from opportunity            
             new_case = phonecall_case_obj.create(cr, uid, {
                     'name' : opportunity.name,
-                    'case_id' : opportunity.inherit_case_id.id,
+                    'case_id' : opportunity.id,
                     'user_id' : form['user_id'],
                     'categ_id' : form['category_id'],
                     'description' : form['note'],
                     'date' : form['deadline'], 
-                    'section_id' : form['section_id']
+                    'section_id' : form['section_id'],
+                    'partner_id': opportunity.partner_id.id,
+                    'partner_address_id':opportunity.partner_address_id.id,
+                    'description':opportunity.description
             }, context=context)
-            
+            vals = {}
+            if not opportunity.phonecall_id:
+                vals.update({'phonecall_id' : new_case})
+            opportunity_case_obj.write(cr, uid, [opportunity.id], vals)
             opportunity_case_obj.case_cancel(cr, uid, [opportunity.id])
             phonecall_case_obj.case_open(cr, uid, [new_case])        
             
@@ -123,6 +129,59 @@ class opportunity2phonecall(wizard.interface):
 
 opportunity2phonecall('crm.opportunity.reschedule_phone_call')
 
+class opportunity2meeting(wizard.interface):
+
+    def _makeMeeting(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        opportunity_case_obj = pool.get('crm.opportunity')
+        meeting_case_obj = pool.get('crm.meeting')        
+        for opportunity in opportunity_case_obj.browse(cr, uid, data['ids']):
+            new_meeting_id = meeting_case_obj.create(cr, uid, {
+                'name': opportunity.name,
+                'date': opportunity.date,
+                'section_id' : opportunity.section_id and opportunity.section_id.id or False,
+                'date_deadline': opportunity.date_deadline,
+                'description':opportunity.description,
+                })
+            new_meeting = meeting_case_obj.browse(cr, uid, new_meeting_id)
+            vals = {}
+            opportunity_case_obj.write(cr, uid, [opportunity.id], vals)
+            opportunity_case_obj.case_cancel(cr, uid, [opportunity.id])
+            meeting_case_obj.case_open(cr, uid, [new_meeting_id])        
+        data_obj = pool.get('ir.model.data')
+        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+        id = data_obj.read(cr, uid, result, ['res_id'])
+        id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+        if id1:
+            id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        return {            
+            'name': _('Meetings'),
+            'view_type': 'form',
+            'view_mode': 'calendar,form,tree',
+            'res_model': 'crm.meeting',
+            'view_id': False,
+            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['res_id']
+            }
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _makeMeeting, 'state': 'order'}
+        },
+        'order': {
+            'actions': [],
+            'result': {'type': 'state', 'state': 'end'}
+        }
+    }
+opportunity2meeting('crm.opportunity.meeting_set')
 
 class partner_opportunity(wizard.interface):
 
diff --git a/addons/crm/wizard/crm_phonecall_wizard.py b/addons/crm/wizard/crm_phonecall_wizard.py
index e9c3c0ad780..1ca84696b73 100644
--- a/addons/crm/wizard/crm_phonecall_wizard.py
+++ b/addons/crm/wizard/crm_phonecall_wizard.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -102,15 +102,16 @@ class phonecall2opportunity(wizard.interface):
                 'name': data['form']['name'],
                 'planned_revenue': data['form']['planned_revenue'],
                 'probability': data['form']['probability'],
-                'partner_id': data['form']['partner_id'],
-                'case_id':phonecall.inherit_case_id.id, 
+                'partner_id': data['form']['partner_id'],                 
+                'section_id':phonecall.section_id.id,
+                'description':phonecall.description,                
             })
             new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
             vals = {
                 'partner_id': data['form']['partner_id'],                
                 }
-            if not phonecall.case_id:
-                vals.update({'case_id' : new_opportunity.inherit_case_id.id})
+            if not phonecall.opportunity_id:
+                vals.update({'opportunity_id' : new_opportunity.id})
             phonecall_case_obj.write(cr, uid, [phonecall.id], vals)
             phonecall_case_obj.case_cancel(cr, uid, [phonecall.id])
             opportunity_case_obj.case_open(cr, uid, [new_opportunity_id])
@@ -189,43 +190,24 @@ class phonecall2opportunity(wizard.interface):
 phonecall2opportunity('crm.phonecall.opportunity_set')
 
 class phonecall2meeting(wizard.interface):
-    case_form = """<?xml version="1.0"?>
-    <form string="Plan Meeting">
-        <field name="date"/>
-        <field name="duration" widget="float_time"/>
-        <label string="Note that you can also use the calendar view to graphically schedule your next meeting." colspan="4"/>
-    </form>"""
-
-    case_fields = {
-        'date': {'string': 'Meeting date', 'type': 'datetime', 'required': 1},
-        'duration': {'string': 'Duration (Hours)', 'type': 'float', 'required': 1}
-    }
-
-    def _selectPartner(self, cr, uid, data, context):
-        case_obj = pooler.get_pool(cr.dbname).get('crm.phonecall')
-        case = case_obj.browse(cr, uid, data['id'])
-        return {'date': case.date, 'duration': case.duration or 2.0}
 
     def _makeMeeting(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
         phonecall_case_obj = pool.get('crm.phonecall')
         meeting_case_obj = pool.get('crm.meeting')        
-        for phonecall in phonecall_case_obj.browse(cr, uid, data['ids']):         
-            #TODO : Take other info from phonecall
+        for phonecall in phonecall_case_obj.browse(cr, uid, data['ids']):
             new_meeting_id = meeting_case_obj.create(cr, uid, {
                 'name': phonecall.name,
-                'date': data['form']['date'],
-                'duration': data['form']['duration'],
-                'case_id': phonecall.inherit_case_id.id,
+                'date': phonecall.date,
+                'section_id' : phonecall.section_id and phonecall.section_id.id or False,
+                'duration': phonecall.duration,
+                'description':phonecall.description,
                 })
             new_meeting = meeting_case_obj.browse(cr, uid, new_meeting_id)
             vals = {}
-            if not phonecall.case_id:
-                vals.update({'case_id' : new_meeting.inherit_case_id.id})
             phonecall_case_obj.write(cr, uid, [phonecall.id], vals)
             phonecall_case_obj.case_cancel(cr, uid, [phonecall.id])
-            meeting_case_obj.case_open(cr, uid, [new_meeting_id])
-
+            meeting_case_obj.case_open(cr, uid, [new_meeting_id])             
         data_obj = pool.get('ir.model.data')
         result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
         id = data_obj.read(cr, uid, result, ['res_id'])
@@ -244,26 +226,23 @@ class phonecall2meeting(wizard.interface):
             'view_mode': 'calendar,form,tree',
             'res_model': 'crm.meeting',
             'view_id': False,
-            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree'),(False,'graph')],
+            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
             'type': 'ir.actions.act_window',
             'search_view_id': id['res_id']
             }
 
     states = {
         'init': {
-            'actions': [_selectPartner],
-            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
-                'state' : [('end', 'Cancel','gtk-cancel'),('order', 'Set Meeting','gtk-go-forward')]}
+            'actions': [],
+            'result': {'type': 'action', 'action': _makeMeeting, 'state': 'order'}
         },
         'order': {
             'actions': [],
-            'result': {'type': 'action', 'action': _makeMeeting, 'state': 'end'}
+            'result': {'type': 'state', 'state': 'end'}
         }
     }
-
 phonecall2meeting('crm.phonecall.meeting_set')
 
-
 class partner_create(wizard.interface):
 
     case_form = """<?xml version="1.0"?>
diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
index ef961b0b161..6e9951ad328 100644
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ b/addons/crm/wizard/wizard_crm_new_send_email.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/crm/wizard/wizard_crm_send_email.py b/addons/crm/wizard/wizard_crm_send_email.py
index c7b2da8247a..d5a4be358ff 100644
--- a/addons/crm/wizard/wizard_crm_send_email.py
+++ b/addons/crm/wizard/wizard_crm_send_email.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/crm/wizard/wizard_history_event.py b/addons/crm/wizard/wizard_history_event.py
index 5b1b1b3b7d2..92e98c23dbb 100644
--- a/addons/crm/wizard/wizard_history_event.py
+++ b/addons/crm/wizard/wizard_history_event.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/crm_hr/__init__.py b/addons/crm_hr/__init__.py
new file mode 100644
index 00000000000..b6fae421755
--- /dev/null
+++ b/addons/crm_hr/__init__.py
@@ -0,0 +1,27 @@
+# -*- 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 crm_hr
+import report
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_hr/__terp__.py b/addons/crm_hr/__terp__.py
new file mode 100644
index 00000000000..3faec9b3b96
--- /dev/null
+++ b/addons/crm_hr/__terp__.py
@@ -0,0 +1,52 @@
+# -*- 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/>.
+#
+##############################################################################
+
+
+{
+    'name': 'CRM Stuff in Job ',
+    'version': '1.0',
+    'category': 'Generic Modules/CRM & SRM',
+    'description': """
+        This module provide  Store the Job
+    """,
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'depends': ['crm','hr','board_crm_configuration','survey'],
+    'init_xml': [
+        'crm_hr_data.xml'
+    ],
+    'update_xml': [
+        'crm_hr_wizard.xml',
+        'crm_hr_view.xml',
+        'crm_hr_menu.xml',
+        'report_crm_hr_view.xml',
+        'security/crm_hr_security.xml',
+        'board_crm_hr_statistical_view.xml',
+     ],
+    'demo_xml': [
+        'crm_hr_demo.xml'
+    ],
+    'installable': True,
+    'active': False,
+    'certificate': '',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_hr/board_crm_hr_statistical_view.xml b/addons/crm_hr/board_crm_hr_statistical_view.xml
new file mode 100644
index 00000000000..c70ac559a5e
--- /dev/null
+++ b/addons/crm_hr/board_crm_hr_statistical_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+    	<record model="ir.ui.view" id="view_crm_job_categ_graph">
+            <field name="name">report.crm.job.categ.graph</field>
+            <field name="model">report.crm.job.categ</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Jobs by Sections and Categories" type="bar" orientation="horizontal">
+                    <field name="categ_id"/>
+                    <field name="nbr" operator="+"/>
+                    <field name="state" group="True"/>
+                </graph>
+            </field>
+        </record>
+        
+        <act_window name="Jobs Requests Of The Month by Applied Job"
+            domain="[('month','=',time.strftime('%%m')),('state','!=','done'),('state','!=','cancel')]"
+            res_model="report.crm.job.categ"
+            view_type="form"
+            view_mode="graph,tree,form"
+            view_id="view_crm_job_categ_graph"
+            id="act_jobs_categ"/>
+            
+        <record model="ir.ui.view" id="board_crm_hr_statistical_form">
+            <field name="name">CRM - Statistical Dashboard Form</field>
+            <field name="model">board.board</field>
+            <field name="inherit_id" ref="board_crm_configuration.board_crm_statistical_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<form string="Statistics Dashboard">
+                    <hpaned>
+                        <child2>
+							<action
+                                string="Jobs Requests Of The Month by Applied Job"
+                                name="%(act_jobs_categ)d"
+                                colspan="4"/>
+                        </child2>
+                    </hpaned>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>    
\ No newline at end of file
diff --git a/addons/crm_hr/crm_hr.py b/addons/crm_hr/crm_hr.py
new file mode 100644
index 00000000000..7fe2f2c4878
--- /dev/null
+++ b/addons/crm_hr/crm_hr.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+import re
+import os
+
+import mx.DateTime
+import base64
+
+from tools.translate import _
+
+import tools
+from osv import fields,osv,orm
+from osv.orm import except_orm
+
+from crm import crm
+
+
+class crm_job(osv.osv):
+    _name = "crm.job"
+    _description = "Job Cases"
+    _order = "id desc"
+    _inherit ='crm.case'    
+    _columns = {        
+            'date_closed': fields.datetime('Closed', readonly=True),
+            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),            
+            'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.job')]"),
+            'planned_revenue': fields.float('Planned Revenue'),
+            'planned_cost': fields.float('Planned Costs'),
+            'probability': fields.float('Probability (%)'),     
+            'partner_name': fields.char("Employee's Name", size=64),
+            'partner_name2': fields.char('Employee Email', size=64),
+            'partner_phone': fields.char('Phone', size=32),
+            'partner_mobile': fields.char('Mobile', size=32), 
+            'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.job')]"),
+            'type_id': fields.many2one('crm.case.resource.type', 'Type Name', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.job')]"),
+            'duration': fields.float('Duration'),
+            'case_id': fields.many2one('crm.case', 'Related Case'),
+            'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
+            'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
+            'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+            'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                       "the partner mentality in relation to our services.The scale has" \
+                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
+            'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),                                                                            
+
+            
+    }
+    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
+        if not categ:
+            return {'value':{}}
+        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
+        return {'value':{'probability':cat}}
+   
+crm_job()
diff --git a/addons/crm_hr/crm_hr_data.xml b/addons/crm_hr/crm_hr_data.xml
new file mode 100644
index 00000000000..337e9f3af24
--- /dev/null
+++ b/addons/crm_hr/crm_hr_data.xml
@@ -0,0 +1,480 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+
+
+        <!--    CASE CATEGORY(categ_id)        -->
+
+    <record model="crm.case.categ" id="categ_job1">
+        <field name="name">Salesman</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
+    </record>
+
+    <record model="crm.case.categ" id="categ_job2">
+        <field name="name">Junior Developer</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
+    </record>
+
+        <!--    Resource(type_id)        -->
+
+    <record model="crm.case.resource.type" id="type_job1">
+        <field name="name">Graduate</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
+    </record>
+    <record model="crm.case.resource.type" id="type_job2">
+        <field name="name">Licenced</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
+    </record>
+    <record model="crm.case.resource.type" id="type_job3">
+        <field name="name"> > Bac +5</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
+    </record>
+
+         <!--    STAGE(stage_id)    -->
+
+    <record model="crm.case.stage" id="stage_job1">
+        <field name="name">Initial Jobs Demand</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
+    </record>
+    <record model="crm.case.stage" id="stage_job2">
+        <field name="name">First Interview</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
+    </record>
+    <record model="crm.case.stage" id="stage_job3">
+        <field name="name">Second Interview</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
+    </record>
+    <record model="crm.case.stage" id="stage_job4">
+        <field name="name">Contract Proposed</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/>
+    </record>
+    <record model="crm.case.stage" id="stage_job5">
+        <field name="name">Contract Signed</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
+    </record>
+    <record model="crm.case.stage" id="stage_job6">
+        <field name="name">Refused by Employee</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
+    </record>
+    <record model="crm.case.stage" id="stage_job7">
+        <field name="name">Refused by Company</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
+    </record>
+</data>
+
+
+
+<data>
+		<record id="survey_job_0" model="survey">
+			<field name="title">Job Survey</field>
+			<field name="state">draft</field>
+			<field name="max_response_limit">20</field>
+			<field eval="[(6,0,[])]" name="users"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_page_job_0" model="survey.page">
+			<field name="title">Default Section</field>
+			<field name="survey_id" ref="survey_job_0"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_page_job_1" model="survey.page">
+			<field name="title">Education &amp; Activities</field>
+			<field name="survey_id" ref="survey_job_0"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_page_job_2" model="survey.page">
+			<field name="title">Importance</field>
+			<field name="survey_id" ref="survey_job_0"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_job_0" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="1" name="sequence"/>
+			<field name="question">From which university will you graduate?</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">single_textbox</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_job_0"/>
+			<field name="comment_label">Other</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_job_1" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="1" name="sequence"/>
+			<field name="question">Rate the Importance</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">matrix_of_choices_only_one_ans</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_job_2"/>
+			<field name="comment_label">Other</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_job_2" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="1" name="sequence"/>
+			<field name="question">Education</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">comment</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_job_1"/>
+			<field name="comment_label">Other</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_job_3" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="2" name="sequence"/>
+			<field name="question">Knowledge</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">comment</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_job_1"/>
+			<field name="comment_label">Other</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_job_4" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="2" name="sequence"/>
+			<field name="question">What is your gender?</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">multiple_choice_only_one_ans</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_job_0"/>
+			<field name="comment_label">Other</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+
+		<record id="survey_answer_job_70" model="survey.answer">
+			<field name="answer">Male</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_4"/>
+			<field eval="1" name="sequence"/>
+		</record>
+
+		<record id="survey_answer_job_71" model="survey.answer">
+			<field name="answer">Female</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_4"/>
+			<field eval="2" name="sequence"/>
+		</record>
+
+	</data>
+	<data>
+		<record id="survey_question_job_5" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="3" name="sequence"/>
+			<field name="question">What age group do you belong to?</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">multiple_choice_only_one_ans</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_job_0"/>
+			<field name="comment_label">Other</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+
+		<record id="survey_answer_job_81" model="survey.answer">
+			<field name="answer">0 - 15</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_5"/>
+			<field eval="1" name="sequence"/>
+		</record>
+		<record id="survey_answer_job_82" model="survey.answer">
+			<field name="answer">16 - 20</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_5"/>
+			<field eval="2" name="sequence"/>
+		</record>
+		<record id="survey_answer_job_83" model="survey.answer">
+			<field name="answer">21 - 30</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_5"/>
+			<field eval="3" name="sequence"/>
+		</record>
+		<record id="survey_answer_job_84" model="survey.answer">
+			<field name="answer">31 - 40</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_5"/>
+			<field eval="4" name="sequence"/>
+		</record>
+		<record id="survey_answer_job_85" model="survey.answer">
+			<field name="answer">41 - 50</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_5"/>
+			<field eval="5" name="sequence"/>
+		</record>
+		<record id="survey_answer_job_86" model="survey.answer">
+			<field name="answer">51 - 60</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_5"/>
+			<field eval="6" name="sequence"/>
+		</record>
+		<record id="survey_answer_job_87" model="survey.answer">
+			<field name="answer">61 - 70</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_5"/>
+			<field eval="7" name="sequence"/>
+		</record>
+		<record id="survey_answer_job_88" model="survey.answer">
+			<field name="answer">71 +</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_5"/>
+			<field eval="8" name="sequence"/>
+		</record>
+
+	</data>
+	<data>
+		<record id="survey_question_job_6" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="3" name="sequence"/>
+			<field name="question">Exprience</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">comment</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_job_1"/>
+			<field name="comment_label">Other</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_job_7" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="4" name="sequence"/>
+			<field name="question">Activities</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">comment</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_job_1"/>
+			<field name="comment_label">Other</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_job_0" model="survey.question.column.heading">
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="title">Not important</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_job_1"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_job_1" model="survey.question.column.heading">
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="title">Somewhat important</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_job_1"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_job_2" model="survey.question.column.heading">
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="title">Important</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_job_1"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_job_3" model="survey.question.column.heading">
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="title">Very important</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_job_1"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_job_4" model="survey.question.column.heading">
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="title">Most important</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_job_1"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_answer_job_0" model="survey.answer">
+			<field name="answer">Good pay</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_1"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_job_1" model="survey.answer">
+			<field name="answer">Getting on with colleagues</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_1"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_job_2" model="survey.answer">
+			<field name="answer">Office environment (décor, light, space etc)</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_1"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_job_3" model="survey.answer">
+			<field name="answer">Desk space</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_1"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_job_4" model="survey.answer">
+			<field name="answer">State of the art technology</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_1"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_job_5" model="survey.answer">
+			<field name="answer">Office location (proximity to home)</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_1"/>
+			<field eval="6" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_job_6" model="survey.answer">
+			<field name="answer">Good management/boss</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_1"/>
+			<field eval="7" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_job_7" model="survey.answer">
+			<field name="answer">Freebies such as tea, coffee and stationery</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_1"/>
+			<field eval="8" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_job_8" model="survey.answer">
+			<field name="answer">Perks such as free parking, gym passes etc</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_1"/>
+			<field eval="9" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_job_9" model="survey.answer">
+			<field name="answer">No out of hours working</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_1"/>
+			<field eval="10" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_job_10" model="survey.answer">
+			<field name="answer">Dress code</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_1"/>
+			<field eval="11" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_job_11" model="survey.answer">
+			<field name="answer">Regular meetings</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_1"/>
+			<field eval="12" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_job_12" model="survey.answer">
+			<field name="answer">Good social life (office nights out, good Christmas parties etc)</field>
+			<field name="question_id" ref="crm_hr.survey_question_job_1"/>
+			<field eval="13" name="sequence"/>
+		</record>
+	</data>
+
+</openerp>
diff --git a/addons/crm/crm_jobs_demo.xml b/addons/crm_hr/crm_hr_demo.xml
similarity index 79%
rename from addons/crm/crm_jobs_demo.xml
rename to addons/crm_hr/crm_hr_demo.xml
index 28b9c8373b6..fee80a6c761 100644
--- a/addons/crm/crm_jobs_demo.xml
+++ b/addons/crm_hr/crm_hr_demo.xml
@@ -9,19 +9,19 @@
 	<record id="crm_case_salesman0" model="crm.job">
 		<field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
 		<field eval="time.strftime('%Y-%m-03')" name="date_deadline"/>
-		<field name="category2_id" ref="crm.category_job1"/>
+		<field name="type_id" ref="crm_hr.type_job1"/>
 		<field name="partner_id" ref="base.res_partner_asus"/>
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field eval="&quot;Enrique Jones&quot;" name="partner_name"/>
 		<field eval="&quot;draft&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_support0"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="&quot;enrique@rediff.com&quot;" name="partner_name2"/>
 		<field eval="&quot;9963214587&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
 		<field eval="9.0" name="duration"/>
-		<field name="categ_id" ref="crm.categ_job1"/>
-		<field name="stage_id" ref="crm.stage_job1"/>
+		<field name="categ_id" ref="crm_hr.categ_job1"/>
+		<field name="stage_id" ref="crm_hr.stage_job1"/>
 		<field eval="&quot;Salesman&quot;" name="name"/>
 		<field eval="&quot;1236547890&quot;" name="partner_phone"/>
 	</record>
@@ -30,19 +30,19 @@
 		<field name="partner_address_id" ref="base.res_partner_address_14"/>
 		<field name="som" ref="base.som_fury"/>
 		<field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
-		<field name="category2_id" ref="crm.category_job3"/>
+		<field name="type_id" ref="crm_hr.type_job3"/>
 		<field name="partner_id" ref="base.res_partner_15"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field eval="&quot;Marie Justine&quot;" name="partner_name"/>
 		<field eval="&quot;open&quot;" name="state"/>
 		<field eval="5.15" name="duration"/>
-		<field name="section_id" ref="crm.section_support0"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="&quot;marie@gmail.com&quot;" name="partner_name2"/>
 		<field eval="&quot;9988774455&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
-		<field name="categ_id" ref="crm.categ_job2"/>
-		<field name="stage_id" ref="crm.stage_job4"/>
+		<field name="categ_id" ref="crm_hr.categ_job2"/>
+		<field name="stage_id" ref="crm_hr.stage_job4"/>
 		<field eval="&quot;Trainee - MCA&quot;" name="name"/>
 		<field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
 		<field eval="&quot;6633225&quot;" name="partner_phone"/>
@@ -52,26 +52,26 @@
 		<field name="som" ref="base.som_happy"/>
 		<field eval="time.strftime('%Y-%m-15 16:10:00')" name="date"/>
 		<field eval="time.strftime('%Y-%m-18')" name="date_deadline"/>
-		<field name="category2_id" ref="crm.category_job2"/>
+		<field name="type_id" ref="crm_hr.type_job2"/>
 		<field name="partner_id" ref="base.res_partner_5"/>
 		<field eval="&quot;1&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field eval="1.45" name="duration"/>
 		<field eval="&quot;Jose&quot;" name="partner_name"/>
 		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_support0"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="&quot;jose@timesgroup.com&quot;" name="partner_name2"/>
 		<field eval="1" name="active"/>
-		<field name="categ_id" ref="crm.categ_job1"/>
-		<field name="stage_id" ref="crm.stage_job3"/>
+		<field name="categ_id" ref="crm_hr.categ_job1"/>
+		<field name="stage_id" ref="crm_hr.stage_job3"/>
 		<field eval="&quot;Fresher&quot;" name="name"/>
 		<field eval="&quot;999666735&quot;" name="partner_phone"/>
 	</record>
 	<record id="crm_case_yrsexperienceinphp0" model="crm.job">
 		<field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
 		<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-		<field name="categ_id" ref="crm.categ_job2"/>
-		<field name="category2_id" ref="crm.category_job3"/>
+		<field name="categ_id" ref="crm_hr.categ_job2"/>
+		<field name="type_id" ref="crm_hr.type_job3"/>
 		<field name="partner_id" ref="base.res_partner_10"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
@@ -79,46 +79,46 @@
 		<field eval="&quot;Sandra Elvis&quot;" name="partner_name"/>
 		<field eval="&quot;sandra@example.com&quot;" name="partner_name2"/>
 		<field eval="&quot;cancel&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_support0"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
-		<field name="stage_id" ref="crm.stage_job6"/>
+		<field name="stage_id" ref="crm_hr.stage_job6"/>
 		<field eval="&quot;More than 5 yrs Experience in PHP&quot;" name="name"/>
 	</record>
 	<record id="crm_case_marketingjob0" model="crm.job">
 		<field eval="time.strftime('%Y-%m-26 17:15:32')" name="date"/>
 		<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-		<field name="category2_id" ref="crm.category_job2"/>
+		<field name="type_id" ref="crm_hr.type_job2"/>
 		<field name="partner_id" ref="base.res_partner_11"/>
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field eval="2.0" name="duration"/>
 		<field eval="&quot;John Bruno&quot;" name="partner_name"/>
 		<field eval="&quot;done&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_support0"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="&quot;john@market.edu&quot;" name="partner_name2"/>
 		<field eval="&quot;9966332214&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
-		<field name="categ_id" ref="crm.categ_job1"/>
-		<field name="stage_id" ref="crm.stage_job5"/>
+		<field name="categ_id" ref="crm_hr.categ_job1"/>
+		<field name="stage_id" ref="crm_hr.stage_job5"/>
 		<field eval="&quot;Marketing Job&quot;" name="name"/>
 		<field eval="&quot;33968745&quot;" name="partner_phone"/>
 	</record>
 	<record id="crm_case_financejob0" model="crm.job">
 		<field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
 		<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-		<field name="category2_id" ref="crm.category_job2"/>
+		<field name="type_id" ref="crm_hr.type_job2"/>
 		<field name="partner_id" ref="base.res_partner_11"/>
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field eval="&quot;David Armstrong&quot;" name="partner_name"/>
 		<field eval="&quot;done&quot;" name="state"/>
-		<field name="section_id" ref="crm.section_support0"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="&quot;david@market.edu&quot;" name="partner_name2"/>
 		<field eval="&quot;9966332214&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
 		<field eval="2.20" name="duration"/>
-		<field name="categ_id" ref="crm.categ_job1"/>
-		<field name="stage_id" ref="crm.stage_job5"/>
+		<field name="categ_id" ref="crm_hr.categ_job1"/>
+		<field name="stage_id" ref="crm_hr.stage_job5"/>
 		<field eval="&quot;Finance Job&quot;" name="name"/>
 		<field eval="&quot;33968745&quot;" name="partner_phone"/>
 	</record>	
@@ -127,19 +127,19 @@
 		<field name="partner_address_id" ref="base.res_partner_address_14"/>
 		<field name="som" ref="base.som_fury"/>
 		<field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
-		<field name="category2_id" ref="crm.category_job3"/>
+		<field name="type_id" ref="crm_hr.type_job3"/>
 		<field name="partner_id" ref="base.res_partner_15"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field eval="&quot;Tina Augustie&quot;" name="partner_name"/>
 		<field eval="&quot;open&quot;" name="state"/>
 		<field eval="1.15" name="duration"/>
-		<field name="section_id" ref="crm.section_support0"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="&quot;tina_augustie@example.com&quot;" name="partner_name2"/>
 		<field eval="&quot;9898745745&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
-		<field name="categ_id" ref="crm.categ_job2"/>
-		<field name="stage_id" ref="crm.stage_job4"/>
+		<field name="categ_id" ref="crm_hr.categ_job2"/>
+		<field name="stage_id" ref="crm_hr.stage_job4"/>
 		<field eval="&quot;Trainee - MCA&quot;" name="name"/>
 		<field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
 		<field eval="&quot;6630125&quot;" name="partner_phone"/>
diff --git a/addons/crm/crm_jobs_menu.xml b/addons/crm_hr/crm_hr_menu.xml
similarity index 78%
rename from addons/crm/crm_jobs_menu.xml
rename to addons/crm_hr/crm_hr_menu.xml
index 000369ec21a..dde0d11bb39 100644
--- a/addons/crm/crm_jobs_menu.xml
+++ b/addons/crm_hr/crm_hr_menu.xml
@@ -8,9 +8,10 @@
         <field name="name">All Jobs Requests</field>
         <field name="res_model">crm.job</field>
         <field name="view_mode">tree,calendar,form,graph</field>
-        <field name="view_id" ref="crm_case_tree_view_job"/>        
+        <field name="view_id" ref="crm_case_tree_view_job"/>
         <field name="context" eval="{'default_state':'open'}"/>
-        <field name="search_view_id" ref="crm.view_crm_case_jobs_filter"/>        
+        <field name="search_view_id" ref="view_crm_case_jobs_filter"/>       
+
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act_job">
         <field name="sequence" eval="1"/>
@@ -36,15 +37,19 @@
         <field name="view_id" ref="crm_case_graph_view_job"/>
         <field name="act_window_id" ref="crm_case_categ0_act_job"/>
     </record>
-    <menuitem
-        name="Jobs - Hiring Process" 
-        id="menu_crm_case_job_req_main" 
+    <!--<menuitem
+        name="Jobs - Hiring Process"
+        id="menu_crm_case_job_req_main"
+        parent="menu_hr"/>-->
+     <menuitem
+        name="Recruitment"
+        id="menu_crm_case_job_req_main"
         parent="menu_hr"/>
 
- <!-- 
-        ALL JOBS REQUESTS 
+ <!--
+        ALL JOBS REQUESTS
     -->
-    <menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job"/>    
-    
+    <menuitem name="Applicants" parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job"/>
+
 </data>
 </openerp>
diff --git a/addons/crm/crm_jobs_view.xml b/addons/crm_hr/crm_hr_view.xml
similarity index 84%
rename from addons/crm/crm_jobs_view.xml
rename to addons/crm_hr/crm_hr_view.xml
index 0f570e6451a..ca0a7d635d7 100644
--- a/addons/crm/crm_jobs_view.xml
+++ b/addons/crm_hr/crm_hr_view.xml
@@ -1,6 +1,31 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+    
+    # ------------------------------------------------------
+    # Job Categories
+    # ------------------------------------------------------
+
+    <record id="crm_job_categ_action" model="ir.actions.act_window">
+        <field name="name">Job Categories</field>
+        <field name="res_model">crm.case.categ</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>     
+       	<field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+		<field name="context">{'object_id':'crm.job'}</field>            
+    </record>
+    # ------------------------------------------------------ 
+	 # Stage
+	 # ------------------------------------------------------ 
+	    <record id="crm_job_stage_act" model="ir.actions.act_window">
+	        <field name="name">Job Stages</field>
+	        <field name="res_model">crm.case.stage</field>
+	        <field name="view_type">form</field>
+	        <field name="view_id"  ref="crm.crm_case_stage_tree"/>
+       		<field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+			<field name="context">{'object_id':'crm.job'}</field>    	        
+	    </record>
+	  <menuitem action="crm_job_stage_act" id="menu_crm_job_stage_act" parent="crm.menu_crm_case_stage"/>
     # ------------------------------------------------------
     # Jobs
     # ------------------------------------------------------
@@ -21,11 +46,11 @@
                 <field name="priority" string="Appreciation"/>
                 <field name="user_id"/>
                 <field name="state"/>
-                <button name="case_close" string="Candidate Hired" states="open,draft,pending" type="object" icon="terp-partner"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_cancel" string="Candidate Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                 <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+ 				<button name="case_close" string="Hired" states="open,draft,pending" type="object" icon="terp-partner"/>                
+                <button name="case_cancel" string="Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                
             </tree>
         </field>
     </record>
@@ -40,8 +65,6 @@
                     <field name="name" string="Description" colspan="2"/>
                     <field name="section_id" colspan="1" widget="selection"/>
                     <field name="user_id" string="Responsible" select="2"/>
-                	<button string="Schedule a Phone Call"
-                        name="%(wizard_crm_job_reschedule_phone_call)d" icon="gtk-redo" type="action" />
                     <newline/>
                         <label string="Stage: " align="1.0"/>
                         <group colspan="1" col="2">
@@ -51,6 +74,10 @@
                     <field name="date" string="Next Interview"/>
                     <field name="duration" widget="float_time"/>
                     <button name="%(wizard_crm_job_meeting_set)d" string="Schedule Meeting" icon="terp-crm" type="action"/>
+                    <field name="phonecall_id" select="1"/>
+                	<button string="Schedule a Phone Call"
+                        name="%(wizard_crm_job_reschedule_phone_call)d" icon="gtk-redo" type="action"  attrs="{'invisible':[('phonecall_id','!=',False)]}"/>
+   				                                          
                 </group>
                 <notebook colspan="4">
                     <page string="Job Info">
@@ -76,17 +103,17 @@
                         <field name="planned_cost" string="Expected Salary"/>
                         <field name="planned_revenue" string="Proposed Salary"/>
                         <field name="categ_id" string="Applied Job" select="1" on_change="onchange_categ_id(categ_id)"/>
-                        <field name="category2_id" string="Degree" select="1"/>
+                        <field name="type_id" string="Degree" select="1"/>
                         <separator colspan="4" string="Qualication"/>
                         <field name="priority" string="Appreciation" select="2"/>
 
                         <separator colspan="4" string="Status"/>
                         <group col="8" colspan="4">
                             <field name="state" select="1"/>
-                            <button name="case_close" string="Candidate Hired" states="open,draft,pending" type="object" icon="terp-partner"/>
                             <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                            <button name="case_cancel" string="Candidate Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                            <button name="case_close" string="Hired" states="open,draft,pending" type="object" icon="terp-partner"/>
+                            <button name="case_cancel" string="Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                         </group>
                    </page>
diff --git a/addons/crm/crm_job_wizard.xml b/addons/crm_hr/crm_hr_wizard.xml
similarity index 100%
rename from addons/crm/crm_job_wizard.xml
rename to addons/crm_hr/crm_hr_wizard.xml
diff --git a/addons/crm_hr/report/__init__.py b/addons/crm_hr/report/__init__.py
new file mode 100644
index 00000000000..951a5300e93
--- /dev/null
+++ b/addons/crm_hr/report/__init__.py
@@ -0,0 +1,25 @@
+# -*- 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 report_crm_hr
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_hr/report/report_crm_hr.py b/addons/crm_hr/report/report_crm_hr.py
new file mode 100644
index 00000000000..4560f968769
--- /dev/null
+++ b/addons/crm_hr/report/report_crm_hr.py
@@ -0,0 +1,131 @@
+from osv import fields,osv
+import tools
+
+class report_crm_job_user(osv.osv):
+    _name = "report.crm.job.user"
+    _description = "Job by user and section"
+    _auto = False
+    _inherit = "report.crm.case.user"
+    _columns = {
+        'probability': fields.float('Avg. Probability', readonly=True),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'amount_costs': fields.float('Est.Cost', readonly=True),
+        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_job_user')
+        cr.execute("""
+            create or replace view report_crm_job_user as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.state,
+                    c.user_id,
+                    c.section_id,
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    sum(planned_cost) as amount_costs,
+                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
+                    avg(probability)::decimal(16,2) as probability,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_job c
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id
+            )""")
+report_crm_job_user()
+
+class report_crm_job_categ(osv.osv):
+    _name = "report.crm.job.categ"
+    _description = "Jobs by section and category"
+    _auto = False
+    _inherit = "report.crm.case.categ"
+    _columns = {
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.job')]"),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'amount_costs': fields.float('Est.Cost', readonly=True),
+        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'probability': fields.float('Avg. Probability', readonly=True),
+        'delay_close': fields.char('Delay Close', size=20, readonly=True),
+    }
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_job_categ')
+        cr.execute("""
+            create or replace view report_crm_job_categ as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.categ_id,
+                    c.state,
+                    c.section_id,
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    sum(planned_cost) as amount_costs,
+                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
+                    avg(probability)::decimal(16,2) as probability,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_job c
+                group by c.categ_id,to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state,c.section_id
+            )""")
+report_crm_job_categ()
+
+class report_crm_job_section(osv.osv):
+    _name = "report.crm.job.section"
+    _description = "job by Section"
+    _auto = False
+    _inherit = "report.crm.case.section"
+    
+    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+        res = {}
+        state_perc = 0.0
+        avg_ans = 0.0
+        
+        for case in self.browse(cr, uid, ids, context):
+            if field_name != 'avg_answers':
+                state = field_name[5:]
+                cr.execute("select count(*) from crm_job where section_id =%s and state='%s'"%(case.section_id.id,state))
+                state_cases = cr.fetchone()[0]
+                perc_state = (state_cases / float(case.nbr_cases) ) * 100
+                
+                res[case.id] = perc_state
+            else:
+                cr.execute('select count(*) from crm_case_log l  where l.section_id=%s'%(case.section_id.id))
+                logs = cr.fetchone()[0]
+                
+                avg_ans = logs / case.nbr_cases
+                res[case.id] = avg_ans       
+        
+        return res
+    
+    _columns = {
+        '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"),
+        'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+    }
+    _order = 'name desc, section_id'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_job_section')
+        cr.execute("""
+            create or replace view report_crm_job_section as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    count(*) as nbr_cases,
+                    c.section_id as section_id,
+                    0 as avg_answers,
+                    0.0 as perc_done,
+                    0.0 as perc_cancel,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_job c
+                group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id
+            )""")
+report_crm_job_section()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_hr/report_crm_hr_view.xml b/addons/crm_hr/report_crm_hr_view.xml
new file mode 100644
index 00000000000..7359b6ecade
--- /dev/null
+++ b/addons/crm_hr/report_crm_hr_view.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	<!--
+	jobs by user and section
+	-->
+
+        <record id="view_crm_job_user_tree" model="ir.ui.view">
+            <field name="name">report.crm.job.user.tree</field>
+            <field name="model">report.crm.job.user</field>
+            <field name="inherit_id" ref="report_crm.view_crm_case_user_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_crm_job_user_form" model="ir.ui.view">
+            <field name="name">report.crm.job.user.form</field>
+            <field name="model">report.crm.job.user</field>
+            <field name="inherit_id" ref="report_crm.view_crm_case_user_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_crm_job_user_graph" model="ir.ui.view">
+            <field name="name">report.crm.job.user.graph</field>
+            <field name="model">report.crm.job.user</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="jobs by User and Section" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="view_crm_job_user_filter" model="ir.ui.view">
+            <field name="name">report.crm.job.user.select</field>
+            <field name="model">report.crm.job.user</field>
+            <field name="inherit_id" ref="report_crm.view_crm_case_user_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+               </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_job_user_tree" model="ir.actions.act_window">
+            <field name="name">Jobs by User and Section</field>
+            <field name="res_model">report.crm.job.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_crm_job_user_graph"/>
+            <field name="search_view_id" ref="view_crm_job_user_filter"/>
+        </record>
+        <menuitem
+            id="hr.menu_hr_reporting"
+            name="Reporting"
+            parent="hr.menu_hr_root"
+            sequence="40" />
+        <menuitem name="Jobs" id="menu_crm_jobs_tree" parent="hr.menu_hr_reporting"/>
+        <menuitem action="action_report_crm_job_user_tree" id="menu_crm_job_user_tree" parent="menu_crm_jobs_tree"/>
+
+        <!-- # jobs by section and category of case -->
+
+        <record id="view_crm_job_categ_tree" model="ir.ui.view">
+            <field name="name">report.crm.job.categ.tree</field>
+            <field name="model">report.crm.job.categ</field>
+            <field name="inherit_id" ref="report_crm.view_crm_case_categ_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_crm_job_categ_form" model="ir.ui.view">
+            <field name="name">report.crm.job.categ.form</field>
+            <field name="model">report.crm.job.categ</field>
+            <field name="inherit_id" ref="report_crm.view_crm_case_categ_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+
+		<record id="view_crm_job_categ_graph" model="ir.ui.view">
+            <field name="name">report.crm.job.categ.graph</field>
+            <field name="model">report.crm.job.categ</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="jobs by Section and Categories" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="categ_id"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_crm_job_categ_filter" model="ir.ui.view">
+            <field name="name">report.crm.job.categ.select</field>
+            <field name="model">report.crm.job.categ</field>
+			<field name="inherit_id" ref="report_crm.view_crm_case_categ_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+                </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_job_categ_tree" model="ir.actions.act_window">
+            <field name="name">Jobs by Categories and Section</field>
+            <field name="res_model">report.crm.job.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_crm_job_categ_graph"/>
+            <field name="search_view_id" ref="view_crm_job_categ_filter"/>
+        </record>
+        <menuitem action="action_report_crm_job_categ_tree" id="menu_crm_job_categ_tree" parent="menu_crm_jobs_tree"/>
+
+        <!-- jobs by Section  -->
+
+        <record id="view_report_crm_job_section_tree" model="ir.ui.view">
+            <field name="name">report.crm.job.section.tree</field>
+            <field name="model">report.crm.job.section</field>
+            <field name="inherit_id" ref="report_crm.view_report_crm_case_section_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr_cases" position="after">
+	                <field name="avg_answers"/>
+	                <field name="perc_done" select="2"/>
+                    <field name="perc_cancel" select="2"/>
+                    <field name="delay_close"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_report_crm_job_section_graph" model="ir.ui.view">
+            <field name="name">report.crm.job.section.graph</field>
+            <field name="model">report.crm.job.section</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="jobs by Section" type="bar">
+                    <field name="name"/>
+                    <field name="nbr_cases" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_report_crm_job_section_filter" model="ir.ui.view">
+            <field name="name">report.crm.job.section.select</field>
+            <field name="model">report.crm.job.section</field>
+            <field name="inherit_id" ref="report_crm.view_report_crm_case_section_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="nbr_cases" position="before">
+                </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_job_section_tree" model="ir.actions.act_window">
+            <field name="name">Jobs by Section</field>
+            <field name="res_model">report.crm.job.section</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_report_crm_job_section_graph"/>
+            <field name="search_view_id" ref="view_report_crm_job_section_filter"/>
+        </record>
+        <menuitem action="action_report_crm_job_section_tree" id="menu_crm_job_section_tree" parent="menu_crm_jobs_tree"/>
+
+  </data>
+</openerp>
diff --git a/addons/crm_hr/security/crm_hr_security.xml b/addons/crm_hr/security/crm_hr_security.xml
new file mode 100644
index 00000000000..da970de6aa2
--- /dev/null
+++ b/addons/crm_hr/security/crm_hr_security.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="1">
+
+
+    <!--rule for Jobs-->
+    <record model="ir.rule.group" id="crm_job_rule_group">
+        <field name="name">crm.meeting.rule</field>
+        <field name="model_id" search="[('model','=','crm.job')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+    </record>
+	<record id="crm_job_rule" model="ir.rule">
+        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="rule_group" ref="crm_job_rule_group"/>
+    </record>
+
+
+  </data>
+</openerp>
diff --git a/addons/crm_hr/wizard/__init__.py b/addons/crm_hr/wizard/__init__.py
new file mode 100644
index 00000000000..b4b087541e5
--- /dev/null
+++ b/addons/crm_hr/wizard/__init__.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+
+import crm_hr_wizard
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm/wizard/crm_job_wizard.py b/addons/crm_hr/wizard/crm_hr_wizard.py
similarity index 86%
rename from addons/crm/wizard/crm_job_wizard.py
rename to addons/crm_hr/wizard/crm_hr_wizard.py
index 6c078a6fa4b..66736c5ce47 100644
--- a/addons/crm/wizard/crm_job_wizard.py
+++ b/addons/crm_hr/wizard/crm_hr_wizard.py
@@ -58,7 +58,8 @@ class job2phonecall(wizard.interface):
         case = case_obj.browse(cr, uid, data['id'])        
         return {
                 'user_id' : case.user_id and case.user_id.id,
-                'category_id' : categ_id and categ_id[0] or case.categ_id and case.categ_id.id,                
+                'category_id' : categ_id and categ_id[0] or case.categ_id and case.categ_id.id, 
+                'section_id' : case.section_id and case.section_id.id or False,               
                 'note' : case.description
                }
 
@@ -84,17 +85,23 @@ class job2phonecall(wizard.interface):
             #TODO : Take other info from job
             new_phonecall_id = phonecall_case_obj.create(cr, uid, {
                         'name' : job.name,
-                        'case_id' : job.inherit_case_id.id,
                         'user_id' : form['user_id'],
                         'categ_id' : form['category_id'],
                         'description' : form['note'],
                         'date' : form['deadline'], 
-                        'section_id' : form['section_id']
+                        'section_id' : form['section_id'],
+                        'description':job.description,
+                        'partner_id':job.partner_id.id,
+                        'partner_address_id':job.partner_address_id.id,
+                        'partner_phone':job.partner_phone,
+                        'partner_mobile':job.partner_mobile,
+                        'description':job.description,
+                        'date':job.date,
                     }, context=context)
             new_phonecall = phonecall_case_obj.browse(cr, uid, new_phonecall_id)
             vals = {}
             if not job.case_id:
-                vals.update({'case_id' : new_phonecall.inherit_case_id.id})
+                vals.update({'phonecall_id' : new_phonecall.id})
             job_case_obj.write(cr, uid, [job.id], vals)
             job_case_obj.case_cancel(cr, uid, [job.id])
             phonecall_case_obj.case_open(cr, uid, [new_phonecall_id])
@@ -125,43 +132,23 @@ class job2phonecall(wizard.interface):
 job2phonecall('crm.job.reschedule_phone_call')
 
 class job2meeting(wizard.interface):
-    case_form = """<?xml version="1.0"?>
-    <form string="Plan Meeting">
-        <field name="date"/>
-        <field name="duration" widget="float_time"/>
-        <label string="Note that you can also use the calendar view to graphically schedule your next meeting." colspan="4"/>
-    </form>"""
-
-    case_fields = {
-        'date': {'string': 'Meeting date', 'type': 'datetime', 'required': 1},
-        'duration': {'string': 'Duration (Hours)', 'type': 'float', 'required': 1}
-    }
-
-    def _selectPartner(self, cr, uid, data, context):        
-        case_obj = pooler.get_pool(cr.dbname).get('crm.job')
-        case = case_obj.browse(cr, uid, data['id'])
-        return {'date': case.date, 'duration': case.duration or 2.0}
 
     def _makeMeeting(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
         job_case_obj = pool.get('crm.job')
         meeting_case_obj = pool.get('crm.meeting')        
-        for job in job_case_obj.browse(cr, uid, data['ids']):         
-            #TODO : Take other info from job
+        for job in job_case_obj.browse(cr, uid, data['ids']):
             new_meeting_id = meeting_case_obj.create(cr, uid, {
                 'name': job.name,
-                'date': data['form']['date'],
-                'duration': data['form']['duration'],
-                'case_id': job.inherit_case_id.id,
+                'date': job.date,
+                'duration': job.duration,
                 })
             new_meeting = meeting_case_obj.browse(cr, uid, new_meeting_id)
             vals = {}
-            if not job.case_id:
-                vals.update({'case_id' : new_meeting.inherit_case_id.id})
             job_case_obj.write(cr, uid, [job.id], vals)
             job_case_obj.case_cancel(cr, uid, [job.id])
-            meeting_case_obj.case_open(cr, uid, [new_meeting_id])
-
+            meeting_case_obj.case_open(cr, uid, [new_meeting_id]) 
+                      
         data_obj = pool.get('ir.model.data')
         result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
         id = data_obj.read(cr, uid, result, ['res_id'])
@@ -187,13 +174,12 @@ class job2meeting(wizard.interface):
 
     states = {
         'init': {
-            'actions': [_selectPartner],
-            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
-                'state' : [('end', 'Cancel','gtk-cancel'),('order', 'Set Meeting','gtk-go-forward')]}
+            'actions': [],
+            'result': {'type': 'action', 'action': _makeMeeting, 'state': 'order'}
         },
         'order': {
             'actions': [],
-            'result': {'type': 'action', 'action': _makeMeeting, 'state': 'end'}
+            'result': {'type': 'state', 'state': 'end'}
         }
     }
 
diff --git a/addons/crm_profiling/__init__.py b/addons/crm_profiling/__init__.py
index 8b356dc9a51..16035e486e8 100644
--- a/addons/crm_profiling/__init__.py
+++ b/addons/crm_profiling/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/crm_profiling/__terp__.py b/addons/crm_profiling/__terp__.py
index 7cac68cd4dd..b155e806e0f 100644
--- a/addons/crm_profiling/__terp__.py
+++ b/addons/crm_profiling/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -25,12 +25,11 @@
     'version': '1.3',
     'category': 'Generic Modules/CRM & SRM',
     'description': """
-    This module allow users to perform segmentation within partners.
-    It use the profiles criteria from the earlier segmentation module and improve it thanks to the new concept of questionnaire. You can now regroup questions into a questionnaire and directly use it on a partner.
+    This module allows users to perform segmentation within partners.
+    It uses the profiles criteria from the earlier segmentation module and improve it. Thanks to the new concept of questionnaire. You can now regroup questions into a questionnaire and directly use it on a partner.
 
     It also has been merged with the earlier CRM & SRM segmentation tool because they were overlapping.
 
-
     The menu items related are in "CRM & SRM\Configuration\Segmentations"
 
 
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index ebf9d3ac7c5..ece1525590d 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index 1f0c3fa4480..e2ac5c4d1fc 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -22,8 +22,8 @@
 		  <field name="view_type">form</field>
 		  <field name="view_mode">tree,form</field>
 		</record>
-		<menuitem parent="crm.next_id_53" id="menu_segm_questionnaire" 
-				  action="open_questionnaires" />
+<!--		<menuitem parent="crm.next_id_53" id="menu_segm_questionnaire" -->
+<!--				  action="open_questionnaires" />-->
 
 
 		<record model="ir.actions.act_window" id="open_questions">
@@ -32,8 +32,8 @@
 		  <field name="view_type">form</field>
 		  <field name="view_mode">tree,form</field>
 		</record>
-		<menuitem parent="crm.next_id_53" id="menu_segm_answer" 
-				  action="open_questions" />
+<!--		<menuitem parent="crm.next_id_53" id="menu_segm_answer" -->
+<!--				  action="open_questions" />-->
 
 <!--		<record model="ir.actions.act_window" id="open_crm_segmentations">
 		  <field name="name">Profiles</field>
@@ -172,7 +172,7 @@
 					</group>
 				</page>
 				<page string="Sales Purchase">
-					<!-- <field name="sales_purchase_active"/> -->
+					<field name="sales_purchase_active"/>
 					<separator string="State of Mind Computation" colspan="4"/>
 					<field name="som_interval"/>
 					<field name="som_interval_max"/>
@@ -203,7 +203,7 @@
 		<field name="arch" type="xml">
 			<tree string="Partner Profiles">
 				<field name="name"/>
-				
+
 			</tree>
 		</field>
 -->		<field name="name">crm.segmentation.tree</field>
@@ -228,9 +228,9 @@
 	</record>
 -->
 <!--	<menuitem
-		name="Partners/Partners by Profile" 
+		name="Partners/Partners by Profile"
 		sequence="1"
-		action="action_partner_crm_segmentation" 
+		action="action_partner_crm_segmentation"
 		id="menu_partner_crm_segmentation_main"/>
 -->
 <!--	<record model="ir.values" id="ir_action_partner_by_crm_segmentation">
diff --git a/addons/crm_profiling/wizard/__init__.py b/addons/crm_profiling/wizard/__init__.py
index 4584c6f59d9..5ac2051f3bd 100644
--- a/addons/crm_profiling/wizard/__init__.py
+++ b/addons/crm_profiling/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/crm_profiling/wizard/open_questionnaire.py b/addons/crm_profiling/wizard/open_questionnaire.py
index c9e5ebdecf4..0fc50b9186a 100644
--- a/addons/crm_profiling/wizard/open_questionnaire.py
+++ b/addons/crm_profiling/wizard/open_questionnaire.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/crm_project/__init__.py b/addons/crm_project/__init__.py
index 8d8c33424e7..a646cf81ad9 100644
--- a/addons/crm_project/__init__.py
+++ b/addons/crm_project/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -23,4 +23,6 @@
 
 import crm_project_bug
 import crm_project_feature
+
+import report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_project/__terp__.py b/addons/crm_project/__terp__.py
index e4c0ef2adcc..2e05fcc0bae 100644
--- a/addons/crm_project/__terp__.py
+++ b/addons/crm_project/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -30,7 +30,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['crm','project'],
+    'depends': ['crm','project','report_crm'],
     'init_xml': [
         'crm_bugs_data.xml'
     ],
@@ -39,6 +39,7 @@
         'crm_bugs_menu.xml',
         'crm_feature_view.xml',
         'crm_feature_menu.xml',
+        'report_crm_project_bug_view.xml',
         'security/crm_project_security.xml'
      ],
     'demo_xml': ['crm_bugs_demo.xml'],
diff --git a/addons/crm_project/crm_bugs_data.xml b/addons/crm_project/crm_bugs_data.xml
index ba5f5edbf81..ca891949499 100644
--- a/addons/crm_project/crm_bugs_data.xml
+++ b/addons/crm_project/crm_bugs_data.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    <!--
-    Case Sections
-    -->
-    <record model="crm.case.section" id="section_support">
-        <field name="name">Bug Tracking</field>
-        <field name="code">BugSup</field>
-    </record>
-
     <!--
     Case Categories
     -->
@@ -16,28 +8,33 @@
          
     <record model="crm.case.categ" id="categ1">
         <field name="name">Bugs</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>         
     </record>
     <record model="crm.case.categ" id="categ2">
         <field name="name">Patches</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>        
     </record>
     <record model="crm.case.categ" id="categ3">
         <field name="name">Feature Requests</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>        
     </record>
 
     <!--
-    Case Category2
+    Case type_id
     -->
          <!--    For Bugs    -->
-    <record model="crm.case.category2" id="category1">
+    <record model="crm.case.resource.type" id="type1">
         <field name="name">Version 4.2</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>        
     </record>    
-    <record model="crm.case.category2" id="category2">
+    <record model="crm.case.resource.type" id="type2">
         <field name="name">Version 4.4</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>        
     </record>
 
     <!--
@@ -47,31 +44,38 @@
          
     <record model="crm.case.stage" id="stage1">
         <field name="name">Accepted as Bug</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>         
     </record>    
     <record model="crm.case.stage" id="stage2">
         <field name="name">Fixed</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>         
     </record>    
     <record model="crm.case.stage" id="stage3">
         <field name="name">Won't fix</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>         
     </record>    
     <record model="crm.case.stage" id="stage4">
         <field name="name">Invalid</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>         
     </record>    
     <record model="crm.case.stage" id="stage5">
         <field name="name">Awaiting Response</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>         
     </record>    
     <record model="crm.case.stage" id="stage6">
         <field name="name">Works For Me</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>         
     </record>    
     <record model="crm.case.stage" id="stage7">
         <field name="name">Future</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>         
     </record>    
 
 </data>
diff --git a/addons/crm_project/crm_bugs_demo.xml b/addons/crm_project/crm_bugs_demo.xml
index 45797ab61dd..da1bdbdab21 100644
--- a/addons/crm_project/crm_bugs_demo.xml
+++ b/addons/crm_project/crm_bugs_demo.xml
@@ -8,12 +8,12 @@
 	<record id="crm_case_buginaccountsmodule0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_8"/>
 		<field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;5&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_agrolait"/>
 		<field eval="&quot;open&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field name="categ_id" ref="categ1"/>
 		<field name="stage_id" ref="stage1"/>
@@ -32,12 +32,12 @@
 	<record id="crm_case_programnotgivingproperoutput0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_tang"/>
 		<field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
-		<field name="category2_id" ref="category2"/>
+		<field name="type_id" ref="type2"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_asus"/>
 		<field eval="&quot;done&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="3.5" name="duration"/>
 		<field name="categ_id" ref="categ1"/>
@@ -48,12 +48,12 @@
 	<record id="crm_case_outputincorrect0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_9"/>
 		<field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field name="partner_id" ref="base.res_partner_2"/>
 		<field eval="&quot;cancel&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="2.3" name="duration"/>
 		<field name="categ_id" ref="categ1"/>
@@ -64,12 +64,12 @@
 	<record id="crm_case_problemloadingpage0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_13"/>
 		<field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_14"/>
 		<field eval="&quot;cancel&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="4.0" name="duration"/>
 		<field name="categ_id" ref="categ1"/>
@@ -79,12 +79,12 @@
 
 	<record id="crm_case_pagenotfound0" model="crm.project.bug">
 		<field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
 		<field eval="&quot;draft&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="1.0" name="duration"/>
 		<field name="categ_id" ref="categ1"/>
@@ -95,12 +95,12 @@
 	<record id="crm_case_programmingerror0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_10"/>
 		<field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
-		<field name="category2_id" ref="category2"/>
+		<field name="type_id" ref="type2"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_5"/>
 		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="4.0" name="duration"/>
 		<field name="categ_id" ref="categ1"/>
@@ -111,12 +111,12 @@
 	<record id="crm_case_logicalerrorinprogram0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_6"/>
 		<field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_6"/>
 		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="2.0" name="duration"/>
 		<field name="categ_id" ref="categ1"/>
@@ -127,12 +127,12 @@
 	<record id="crm_case_constrainterror0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_6"/>
 		<field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_6"/>
 		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="7.3" name="duration"/>
 		<field name="categ_id" ref="categ1"/>
@@ -143,12 +143,11 @@
 	<record id="crm_case_errorinprogram0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_10"/>
 		<field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
-		<field name="category2_id" ref="category2"/>
+		<field name="type_id" ref="type2"/>
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field name="partner_id" ref="base.res_partner_5"/>
 		<field eval="&quot;open&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
 		<field eval="1" name="active"/>
 		<field eval="1.3" name="duration"/>
 		<field name="categ_id" ref="categ2"/>
@@ -159,12 +158,12 @@
 	<record id="crm_case_patcheserrorinprogram0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_9"/>
 		<field eval="time.strftime('%Y-%m-28  16:30:00')" name="date"/>
-		<field name="category2_id" ref="category2"/>
+		<field name="type_id" ref="type2"/>
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_2"/>
 		<field eval="&quot;open&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="13.0" name="duration"/>
 		<field name="categ_id" ref="categ2"/>
@@ -175,12 +174,12 @@
 	<record id="crm_case_newfeaturestobeadded0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_wong"/>
 		<field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_maxtor"/>
 		<field eval="&quot;open&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="3.2" name="duration"/>
 		<field name="categ_id" ref="categ3"/>
@@ -191,12 +190,12 @@
 	<record id="crm_case_addmenustothemodule0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_1"/>
 		<field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
-		<field name="category2_id" ref="category2"/>
+		<field name="type_id" ref="type2"/>
 		<field eval="&quot;1&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field name="partner_id" ref="base.res_partner_9"/>
 		<field eval="&quot;done&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="3.0" name="duration"/>
 		<field name="categ_id" ref="categ3"/>
@@ -208,12 +207,12 @@
 	<record id="crm_case_includeattendancesheetinproject0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_2"/>
 		<field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_10"/>
 		<field eval="&quot;cancel&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="2.0" name="duration"/>
 		<field name="categ_id" ref="categ3"/>
@@ -227,12 +226,12 @@
 		<field name="partner_address_id" ref="base.res_partner_address_6"/>
 		<field name="som" ref="base.som_happy"/>
 		<field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_6"/>
 		<field eval="&quot;draft&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="2.45" name="duration"/>
 		<field name="categ_id" ref="categ3"/>
@@ -243,12 +242,12 @@
 	<record id="crm_case_improvereportsinhrms0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_15"/>
 		<field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_11"/>
 		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="15.0" name="duration"/>
 		<field name="categ_id" ref="categ3"/>
@@ -259,12 +258,12 @@
 	<record id="crm_case_improvereportsinpms0" model="crm.project.bug">
 		<field name="partner_address_id" ref="base.res_partner_address_15"/>
 		<field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
-		<field name="category2_id" ref="category1"/>
+		<field name="type_id" ref="type1"/>
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field name="partner_id" ref="base.res_partner_11"/>
 		<field eval="&quot;pending&quot;" name="state"/>
-		<field name="section_id" ref="section_support"/>
+		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
 		<field eval="06.15" name="duration"/>
 		<field name="categ_id" ref="categ3"/>
diff --git a/addons/crm_project/crm_bugs_menu.xml b/addons/crm_project/crm_bugs_menu.xml
index fbf98b271d0..627fab57aba 100644
--- a/addons/crm_project/crm_bugs_menu.xml
+++ b/addons/crm_project/crm_bugs_menu.xml
@@ -1,36 +1,42 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    
+
 
     <record model="crm.case.categ" id="categ1">
         <field name="name">Bugs</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
     </record>
     <record model="crm.case.categ" id="categ2">
         <field name="name">Patches</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
     </record>
     <record model="crm.case.categ" id="categ3">
         <field name="name">Feature Requests</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
     </record>
     <record model="crm.case.stage" id="stage2">
         <field name="name">Fixed</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
     </record>
     <record model="crm.case.stage" id="stage5">
         <field name="name">Awaiting Response</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
     </record>    
     <record model="crm.case.stage" id="stage7">
         <field name="name">Future</field>
-        <field name="section_id" ref="section_support"/>
-    </record>    
-    
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>   
+    </record>       
     
+
     ######################## BUG TRACKING (menu) ###########################
-    <!-- 
+    <!--
         ALL BUGS
     -->
     <record model="ir.actions.act_window" id="crm_case_categ_act0">
@@ -40,14 +46,14 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="context" eval="{'default_state':'open'}"/>
-        <field name="search_view_id" ref="view_crm_case_bugs_filter"/>        
+        <field name="search_view_id" ref="view_crm_case_bugs_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_act0"/>
-    </record>    
+    </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
@@ -60,8 +66,8 @@
         <field name="view_id" ref="crm_case_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_act0"/>
     </record>
-    
-    <menuitem id="menu_aftertask" name="Bug" parent="project.menu_main"/>
-    <menuitem name="Bug Tracking" id="menu_crm_case_bug_track"  parent="menu_aftertask" action="crm_case_categ_act0"/>
+
+    <!--<menuitem id="menu_aftertask" name="Bug" parent="project.menu_main" visible="False"/>-->
+    <menuitem name="Issues" id="menu_crm_case_bug_track"  parent="project.menu_project_management" action="crm_case_categ_act0"/>
 </data>
 </openerp>
diff --git a/addons/crm_project/crm_bugs_view.xml b/addons/crm_project/crm_bugs_view.xml
index 0e8535e4140..04f596751f9 100644
--- a/addons/crm_project/crm_bugs_view.xml
+++ b/addons/crm_project/crm_bugs_view.xml
@@ -4,37 +4,31 @@
 <!--    <menuitem name="CRM &amp; SRM" icon="terp-crm" id="menu_crm1"/>    -->
 
     # ------------------------------------------------------
-    # Bug Tracking
+    # Bug Categories
     # ------------------------------------------------------
 
-    <record model="ir.ui.view" id="crm_bug_assign_wizard_form">
-        <field name="name">crm.project.bug.assign_wizard.form</field>
-        <field name="model">crm.project.bug.assign_wizard</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="To Assign">
-                <group col="2">            	
-                    <field name="section_id" select="1" widget="selection"/>
-                    <field name="user_id"/>
-                </group>
-                <newline/>                    
-                <separator colspan="4"/>                             
-                <group col="2" colspan="2">
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="gtk-execute" name="action_create" string="Assign" type="object"/>
-                </group>
-            </form>
-        </field>
-    </record>
-    <record id="action_crm_bug_assign_wizard" model="ir.actions.act_window">
-        <field name="name">To Assign</field>
-        <field name="res_model">crm.project.bug.assign_wizard</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm_bug_assign_wizard_form"/>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
 
+    <record id="crm_bug_categ_action" model="ir.actions.act_window">
+        <field name="name">Bug 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.project.bug')]</field>
+		<field name="context">{'object_id':'crm.project.bug'}</field>     
+    </record>
+    # ------------------------------------------------------ 
+	    # Stage
+	 # ------------------------------------------------------ 
+	    <record id="crm_bug_stage_act" model="ir.actions.act_window">
+	        <field name="name">Bug Stages</field>
+	        <field name="res_model">crm.case.stage</field>
+	        <field name="view_type">form</field>
+	        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+       		<field name="domain">[('object_id.model', '=', 'crm.project.bug')]</field>
+			<field name="context">{'object_id':'crm.project.bug'}</field>     	        
+	    </record>
+	  <menuitem action="crm_bug_stage_act" id="menu_crm_bug_stage_act" parent="crm.menu_crm_case_stage"/>
+	  
     <record model="ir.ui.view" id="crm_case_form_view">
         <field name="name">CRM - Bug Tracker Form</field>
         <field name="model">crm.project.bug</field>
@@ -59,13 +53,9 @@
                     <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
                     <field name="email_from" colspan="2"/>
                     <separator colspan="4"/>
-                    <field name="category2_id" string="Version"/>
+                    <field name="type_id" string="Version"/>
                     <field name="categ_id"  on_change="onchange_categ_id(categ_id)"/>
                     <field name="priority" string="Severity"/>
-                    <group colspan="2">
-                        <field name="case_id" select="1"/>
-                        <button string="Assign" name="%(action_crm_bug_assign_wizard)d"  type="action" />
-                    </group>
                     <newline/>
                     <separator string= "Description" colspan="4"/>
                     <field name="description" nolabel="1" colspan="4"/>
@@ -106,19 +96,6 @@
                         </form>
                     </field>
                 </page>
-                <page string="Events">
-                   <field name="child_ids" colspan="4" nolabel="1">
-                       <tree string="Related Cases">
-                           <field name="id"/>
-                           <field name="date"/>
-                           <field name="name"/>
-                           <field name="partner_id"/>
-                           <field name="user_id"/>
-                           <field name="section_id" widget="selection"/>
-                           <field name="state"/>
-                       </tree>
-                    </field>
-                 </page>
                 <page string="Emails">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
@@ -162,7 +139,7 @@
                 <field name="priority" string="Severity"/>
                 <field name="categ_id"/>
                 <field name="stage_id" string="Resolution"/>
-                <field name="category2_id" string="Version"/>
+                <field name="type_id" string="Version"/>
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
diff --git a/addons/crm_project/crm_feature_menu.xml b/addons/crm_project/crm_feature_menu.xml
index 3cedcabba26..299c441e0cf 100644
--- a/addons/crm_project/crm_feature_menu.xml
+++ b/addons/crm_project/crm_feature_menu.xml
@@ -5,20 +5,24 @@
     
     <record model="crm.case.categ" id="future_patch_categ">
         <field name="name">Patches</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.future')]" model="ir.model"/>          
     </record>
     <record model="crm.case.stage" id="future_fixed_categ">
         <field name="name">Fixed</field>
-        <field name="section_id" ref="section_support"/>
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.future')]" model="ir.model"/>           
     </record>
     <record model="crm.case.stage" id="future_awaiting_categ">
         <field name="name">Awaiting Response</field>
-        <field name="section_id" ref="section_support"/>
-    </record>    
+        <field name="section_id" ref="crm.section_sales_department"/>
+		<field name="object_id" search="[('model','=','crm.project.future')]" model="ir.model"/>           
+    </record>  
     
     
+
     ######################## Future Request (menu) ###########################
-    <!-- 
+    <!--
         ALL BUGS
     -->
     <record model="ir.actions.act_window" id="action_crm_case_future">
@@ -28,14 +32,14 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_future_tree_view"/>
         <field name="context" eval="{'default_state':'open'}"/>
-        <field name="search_view_id" ref="view_crm_case_future_filter"/>        
+        <field name="search_view_id" ref="view_crm_case_future_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_future_tree_view0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_future_tree_view"/>
         <field name="act_window_id" ref="action_crm_case_future"/>
-    </record>    
+    </record>
     <record model="ir.actions.act_window.view" id="action_crm_future_calendar_view0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
@@ -47,8 +51,8 @@
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm_case_future_form_view"/>
         <field name="act_window_id" ref="action_crm_case_future"/>
-    </record>   
-    
-    <menuitem name="Future Requests" id="menu_crm_case_future_request"  parent="menu_aftertask" action="action_crm_case_future"/>
+    </record>
+
+    <menuitem name="Feature Requests" id="menu_crm_case_future_request"  parent="project.menu_project_management" action="action_crm_case_future"/>
 </data>
 </openerp>
diff --git a/addons/crm_project/crm_feature_view.xml b/addons/crm_project/crm_feature_view.xml
index 67616e4fd62..cc73c564dd8 100644
--- a/addons/crm_project/crm_feature_view.xml
+++ b/addons/crm_project/crm_feature_view.xml
@@ -7,33 +7,6 @@
     # Future Request
     # ------------------------------------------------------
 
-    <record model="ir.ui.view" id="crm_future_assign_wizard_form">
-        <field name="name">crm.project.future.assign_wizard.form</field>
-        <field name="model">crm.project.future.assign_wizard</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="To Assign">
-                <group col="2">            	
-                    <field name="section_id" select="1" widget="selection"/>
-                    <field name="user_id"/>
-                </group>
-                <newline/>                    
-                <separator colspan="4"/>                             
-                <group col="2" colspan="2">
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="gtk-execute" name="action_create" string="Assign" type="object"/>
-                </group>
-            </form>
-        </field>
-    </record>
-    <record id="action_crm_future_assign_wizard" model="ir.actions.act_window">
-        <field name="name">To Assign</field>
-        <field name="res_model">crm.project.future.assign_wizard</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm_future_assign_wizard_form"/>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
 
     <record model="ir.ui.view" id="crm_case_future_form_view">
         <field name="name">CRM - Future Request Form</field>
@@ -59,13 +32,9 @@
                     <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
                     <field name="email_from" colspan="2"/>
                     <separator colspan="4"/>
-                    <field name="category2_id" string="Version"/>
+                    <field name="type_id" string="Version"/>
                     <field name="categ_id"  on_change="onchange_categ_id(categ_id)"/>
                     <field name="priority" string="Severity"/>
-                    <group colspan="2">
-                        <field name="case_id" select="1"/>
-                        <button string="Assign" name="%(action_crm_future_assign_wizard)d"  type="action" />
-                    </group>
                     <newline/>
                     <separator string= "Description" colspan="4"/>
                     <field name="description" nolabel="1" colspan="4"/>
@@ -106,19 +75,6 @@
                         </form>
                     </field>
                 </page>
-                <page string="Events">
-                   <field name="child_ids" colspan="4" nolabel="1">
-                       <tree string="Related Cases">
-                           <field name="id"/>
-                           <field name="date"/>
-                           <field name="name"/>
-                           <field name="partner_id"/>
-                           <field name="user_id"/>
-                           <field name="section_id" widget="selection"/>
-                           <field name="state"/>
-                       </tree>
-                    </field>
-                 </page>
                 <page string="Emails">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
@@ -162,7 +118,7 @@
                 <field name="priority" string="Severity"/>
                 <field name="categ_id"/>
                 <field name="stage_id" string="Resolution"/>
-                <field name="category2_id" string="Version"/>
+                <field name="type_id" string="Version"/>
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
diff --git a/addons/crm_project/crm_project_bug.py b/addons/crm_project/crm_project_bug.py
index 16bf0131eb7..fa408b8a570 100644
--- a/addons/crm_project/crm_project_bug.py
+++ b/addons/crm_project/crm_project_bug.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -32,14 +32,36 @@ import tools
 from osv import fields,osv,orm
 from osv.orm import except_orm
 
+from crm import crm
+
+
 class crm_project_bug(osv.osv):
     _name = "crm.project.bug"
     _description = "Project Bug Cases"
     _order = "id desc"
-    _inherits = {'crm.case':"inherit_case_id"}
+    _inherit = 'crm.case'
     _columns = {
-           'inherit_case_id':fields.many2one('crm.case','Case'),
-           'project_id':fields.many2one('project.project', 'Project'),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
+        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'planned_revenue': fields.float('Planned Revenue'),
+        'planned_cost': fields.float('Planned Costs'),
+        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                       "the partner mentality in relation to our services.The scale has" \
+                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
+        'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.bug')]"),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.bug')]"),
+        
+        'partner_name': fields.char("Employee's Name", size=64),
+        'partner_mobile': fields.char('Mobile', size=32),
+        'partner_phone': fields.char('Phone', size=32),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.bug')]"),
+        'project_id':fields.many2one('project.project', 'Project'),
+        'duration': fields.float('Duration') ,
+        'probability': fields.float('Probability (%)'),       
     }
 
     def _get_project(self, cr, uid, context):
@@ -51,122 +73,12 @@ class crm_project_bug(osv.osv):
     _defaults = {
           'project_id':_get_project
           }
-    def _map_ids(self, method, cr, uid, ids, *args, **argv):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        case_data = self.browse(cr, uid, select)
-        new_ids = []
-        for case in case_data:
-            if case.inherit_case_id:
-                new_ids.append(case.inherit_case_id.id)
-        res = getattr(self.pool.get('crm.case'),method)(cr, uid, new_ids, *args, **argv)
-        if isinstance(ids, (str, int, long)) and isinstance(res, list):
-            return res and res[0] or False
-        return res
-
-
-    def onchange_case_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_case_id',cr,uid,ids,*args,**argv)
-    def stage_next(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('stage_next',cr,uid,ids,*args,**argv)
-    def onchange_partner_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_id',cr,uid,ids,*args,**argv)
-    def onchange_partner_address_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_address_id',cr,uid,ids,*args,**argv)
-    def onchange_categ_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_categ_id',cr,uid,ids,*args,**argv)
-    def case_close(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_close',cr,uid,ids,*args,**argv)
-    def case_open(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_open',cr,uid,ids,*args,**argv)
-    def case_cancel(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_cancel',cr,uid,ids,*args,**argv)
-    def case_reset(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_reset',cr,uid,ids,*args,**argv)
-    def case_escalate(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_escalate',cr,uid,ids,*args,**argv)
-    def case_pending(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_pending',cr,uid,ids,*args,**argv)
-
-    def msg_new(self, cr, uid, msg):
-        mailgate_obj = self.pool.get('mail.gateway')
-        msg_body = mailgate_obj.msg_body_get(msg)
-        data = {
-            'name': msg['Subject'],
-            'email_from': msg['From'],
-            'email_cc': msg['Cc'],
-            'user_id': False,
-            'description': msg_body['body'],
-            'history_line': [(0, 0, {'description': msg_body['body'], 'email': msg['From'] })],
-        }
-        res = mailgate_obj.partner_get(cr, uid, msg['From'])
-        if res:
-            data.update(res)
-        res = self.create(cr, uid, data)
-        return res
-
-    def msg_update(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_update',cr, uid, ids, *args, **argv)
-    def emails_get(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('emails_get',cr, uid, ids, *args, **argv)
-    def msg_send(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_send',cr, uid, ids, *args, **argv)
-
-
+    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
+        if not categ:
+            return {'value':{}}
+        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
+        return {'value':{'probability':cat}}    
+    
 
 crm_project_bug()
 
-class crm_bug_assign_wizard(osv.osv_memory):
-    _name = 'crm.project.bug.assign_wizard'
-
-    _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Section', required=True),
-        'user_id': fields.many2one('res.users', 'Responsible'),
-    }
-
-    def _get_default_section(self, cr, uid, context):
-        case_id = context.get('active_id',False)
-        if not case_id:
-            return False
-        case_obj = self.pool.get('crm.project.bug')
-        case = case_obj.read(cr, uid, case_id, ['state','section_id'])
-        if case['state'] in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        return case['section_id']
-
-
-    _defaults = {
-        'section_id': _get_default_section
-    }
-    def action_create(self, cr, uid, ids, context=None):
-        case_obj = self.pool.get('crm.project.bug')
-        case_id = context.get('active_id',[])
-        res = self.read(cr, uid, ids)[0]
-        case = case_obj.browse(cr, uid, case_id)
-        if case.state in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        new_case_id = case_obj.copy(cr, uid, case_id, default=
-                                            {
-                                                'section_id':res.get('section_id',False),
-                                                'user_id':res.get('user_id',False),
-                                                'case_id' : case.inherit_case_id.id
-                                            }, context=context)
-        case_obj.case_close(cr, uid, [case_id])
-
-        data_obj = self.pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm_project', 'view_crm_case_bugs_filter')
-        search_view = data_obj.read(cr, uid, result, ['res_id'])
-        value = {
-            'name': _('Bugs'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.project.bug',
-            'res_id': int(new_case_id),
-            'type': 'ir.actions.act_window',
-            'search_view_id': search_view['res_id']
-        }
-        return value
-
-crm_bug_assign_wizard()
diff --git a/addons/crm_project/crm_project_feature.py b/addons/crm_project/crm_project_feature.py
index 4301cc5ab30..18674cda5db 100644
--- a/addons/crm_project/crm_project_feature.py
+++ b/addons/crm_project/crm_project_feature.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -32,14 +32,35 @@ import tools
 from osv import fields,osv,orm
 from osv.orm import except_orm
 
+from crm import crm
+
 class crm_project_future_request(osv.osv):
     _name = "crm.project.future"
     _description = "Project Future Request"
     _order = "id desc"
-    _inherits = {'crm.case':"inherit_case_id"}
+    _inherit = 'crm.case'    
     _columns = {
-           'inherit_case_id':fields.many2one('crm.case','Case'),
-           'project_id':fields.many2one('project.project', 'Project'),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
+        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'planned_revenue': fields.float('Planned Revenue'),
+        'planned_cost': fields.float('Planned Costs'),
+        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                       "the partner mentality in relation to our services.The scale has" \
+                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
+        'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.future')]"),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.future')]"),
+        
+        'partner_name': fields.char("Employee's Name", size=64),
+        'partner_mobile': fields.char('Mobile', size=32),
+        'partner_phone': fields.char('Phone', size=32),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.future')]"),
+        'project_id':fields.many2one('project.project', 'Project'),
+        'duration': fields.float('Duration') ,
+        'probability': fields.float('Probability (%)'), 
     }
     def _get_project(self, cr, uid, context):
        user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
@@ -50,121 +71,12 @@ class crm_project_future_request(osv.osv):
     _defaults = {
           'project_id':_get_project
           }
-    def _map_ids(self, method, cr, uid, ids, *args, **argv):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        case_data = self.browse(cr, uid, select)
-        new_ids = []
-        for case in case_data:
-            if case.inherit_case_id:
-                new_ids.append(case.inherit_case_id.id)
-        res = getattr(self.pool.get('crm.case'),method)(cr, uid, new_ids, *args, **argv)
-        if isinstance(ids, (str, int, long)) and isinstance(res, list):
-            return res and res[0] or False
-        return res
-
-
-    def onchange_case_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_case_id',cr,uid,ids,*args,**argv)
-    def stage_next(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('stage_next',cr,uid,ids,*args,**argv)
-    def onchange_partner_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_id',cr,uid,ids,*args,**argv)
-    def onchange_partner_address_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_partner_address_id',cr,uid,ids,*args,**argv)
-    def onchange_categ_id(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('onchange_categ_id',cr,uid,ids,*args,**argv)
-    def case_close(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_close',cr,uid,ids,*args,**argv)
-    def case_open(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_open',cr,uid,ids,*args,**argv)
-    def case_cancel(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_cancel',cr,uid,ids,*args,**argv)
-    def case_reset(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_reset',cr,uid,ids,*args,**argv)
-    def case_escalate(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_escalate',cr,uid,ids,*args,**argv)
-    def case_pending(self,cr, uid, ids, *args, **argv):
-        return self._map_ids('case_pending',cr,uid,ids,*args,**argv)
-
-    def msg_new(self, cr, uid, msg):
-        mailgate_obj = self.pool.get('mail.gateway')
-        msg_body = mailgate_obj.msg_body_get(msg)
-        data = {
-            'name': msg['Subject'],
-            'email_from': msg['From'],
-            'email_cc': msg['Cc'],
-            'user_id': False,
-            'description': msg_body['body'],
-            'history_line': [(0, 0, {'description': msg_body['body'], 'email': msg['From'] })],
-        }
-        res = mailgate_obj.partner_get(cr, uid, msg['From'])
-        if res:
-            data.update(res)
-        res = self.create(cr, uid, data)
-        return res
-
-    def msg_update(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_update',cr, uid, ids, *args, **argv)
-    def emails_get(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('emails_get',cr, uid, ids, *args, **argv)
-    def msg_send(self, cr, uid, ids, *args, **argv):
-        return self._map_ids('msg_send',cr, uid, ids, *args, **argv)
-
+    def onchange_categ_id(self, cr, uid, ids, categ, context={}):
+        if not categ:
+            return {'value':{}}
+        cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
+        return {'value':{'probability':cat}}
+       
 
 crm_project_future_request()
 
-class crm_future_request_assign_wizard(osv.osv_memory):
-    _name = 'crm.project.future.assign_wizard'
-
-    _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Section', required=True),
-        'user_id': fields.many2one('res.users', 'Responsible'),
-    }
-
-    def _get_default_section(self, cr, uid, context):
-        case_id = context.get('active_id',False)
-        if not case_id:
-            return False
-        case_obj = self.pool.get('crm.project.future')
-        case = case_obj.read(cr, uid, case_id, ['state','section_id'])
-        if case['state'] in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        return case['section_id']
-
-
-    _defaults = {
-        'section_id': _get_default_section
-    }
-    def action_create(self, cr, uid, ids, context=None):
-        case_obj = self.pool.get('crm.project.future')
-        case_id = context.get('active_id',[])
-        res = self.read(cr, uid, ids)[0]
-        case = case_obj.browse(cr, uid, case_id)
-        if case.state in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
-        new_case_id = case_obj.copy(cr, uid, case_id, default=
-                                            {
-                                                'section_id':res.get('section_id',False),
-                                                'user_id':res.get('user_id',False),
-                                                'case_id' : case.inherit_case_id.id
-                                            }, context=context)
-        case_obj.case_close(cr, uid, [case_id])
-
-        data_obj = self.pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm_project', 'view_crm_case_future_filter')
-        search_view = data_obj.read(cr, uid, result, ['res_id'])
-        value = {
-            'name': _('Future Requests'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.project.future',
-            'res_id': int(new_case_id),
-            'type': 'ir.actions.act_window',
-            'search_view_id': search_view['res_id']
-        }
-        return value
-
-crm_future_request_assign_wizard()
diff --git a/addons/crm_project/report/__init__.py b/addons/crm_project/report/__init__.py
new file mode 100644
index 00000000000..68cd4fa06d3
--- /dev/null
+++ b/addons/crm_project/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 report_crm_project_bug
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_project/report/report_crm_project_bug.py b/addons/crm_project/report/report_crm_project_bug.py
new file mode 100644
index 00000000000..25ef06db7cd
--- /dev/null
+++ b/addons/crm_project/report/report_crm_project_bug.py
@@ -0,0 +1,131 @@
+from osv import fields,osv
+import tools
+
+class report_crm_project_bug_user(osv.osv):
+    _name = "report.crm.project.bug.user"
+    _description = "Project Bug by user and section"
+    _auto = False
+    _inherit = "report.crm.case.user"
+    _columns = {
+        'probability': fields.float('Avg. Probability', readonly=True),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'amount_costs': fields.float('Est.Cost', readonly=True),
+        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_project_bug_user')
+        cr.execute("""
+            create or replace view report_crm_project_bug_user as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.state,
+                    c.user_id,
+                    c.section_id,
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    sum(planned_cost) as amount_costs,
+                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
+                    avg(probability)::decimal(16,2) as probability,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_project_bug c
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id
+            )""")
+report_crm_project_bug_user()
+
+class report_crm_project_bug_categ(osv.osv):
+    _name = "report.crm.project.bug.categ"
+    _description = "Project Bug by section and category"
+    _auto = False
+    _inherit = "report.crm.case.categ"
+    _columns = {
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.bug')]"),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'amount_costs': fields.float('Est.Cost', readonly=True),
+        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'probability': fields.float('Avg. Probability', readonly=True),
+        'delay_close': fields.char('Delay Close', size=20, readonly=True),
+    }
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_project_bug_categ')
+        cr.execute("""
+            create or replace view report_crm_project_bug_categ as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.categ_id,
+                    c.state,
+                    c.section_id,
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    sum(planned_cost) as amount_costs,
+                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
+                    avg(probability)::decimal(16,2) as probability,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_project_bug c
+                group by c.categ_id,to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state,c.section_id
+            )""")
+report_crm_project_bug_categ()
+
+class report_crm_project_bug_section(osv.osv):
+    _name = "report.crm.project.bug.section"
+    _description = "Project bug by Section"
+    _auto = False
+    _inherit = "report.crm.case.section"
+    
+    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+        res = {}
+        state_perc = 0.0
+        avg_ans = 0.0
+        
+        for case in self.browse(cr, uid, ids, context):
+            if field_name != 'avg_answers':
+                state = field_name[5:]
+                cr.execute("select count(*) from crm_project_bug where section_id =%s and state='%s'"%(case.section_id.id,state))
+                state_cases = cr.fetchone()[0]
+                perc_state = (state_cases / float(case.nbr_cases) ) * 100
+                
+                res[case.id] = perc_state
+            else:
+                cr.execute('select count(*) from crm_case_log l  where l.section_id=%s'%(case.section_id.id))
+                logs = cr.fetchone()[0]
+                
+                avg_ans = logs / case.nbr_cases
+                res[case.id] = avg_ans       
+        
+        return res
+    
+    _columns = {
+        '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"),
+        'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+    }
+    _order = 'name desc, section_id'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_project_bug_section')
+        cr.execute("""
+            create or replace view report_crm_project_bug_section as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    count(*) as nbr_cases,
+                    c.section_id as section_id,
+                    0 as avg_answers,
+                    0.0 as perc_done,
+                    0.0 as perc_cancel,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_project_bug c
+                group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id
+            )""")
+report_crm_project_bug_section()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/crm_project/report_crm_project_bug_view.xml b/addons/crm_project/report_crm_project_bug_view.xml
new file mode 100644
index 00000000000..4bd1a24ebcc
--- /dev/null
+++ b/addons/crm_project/report_crm_project_bug_view.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	<!--
+	Project Bug by user and section
+	-->
+
+        <record id="view_crm_project_bug_user_tree" model="ir.ui.view">
+            <field name="name">report.crm.project.bug.user.tree</field>
+            <field name="model">report.crm.project.bug.user</field>
+            <field name="inherit_id" ref="report_crm.view_crm_case_user_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_crm_project_bug_user_form" model="ir.ui.view">
+            <field name="name">report.crm.project.bug.user.form</field>
+            <field name="model">report.crm.project.bug.user</field>
+            <field name="inherit_id" ref="report_crm.view_crm_case_user_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_crm_project_bug_user_graph" model="ir.ui.view">
+            <field name="name">report.crm.project.bug.user.graph</field>
+            <field name="model">report.crm.project.bug.user</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Project Bug by User and Section" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="view_crm_project_bug_user_filter" model="ir.ui.view">
+            <field name="name">report.crm.project.bug.user.select</field>
+            <field name="model">report.crm.project.bug.user</field>
+            <field name="inherit_id" ref="report_crm.view_crm_case_user_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+               </field>
+            </field>
+        </record>
+        
+        <record id="action_report_crm_project_bug_user_tree" model="ir.actions.act_window">
+            <field name="name">Project Bug by User and Section</field>
+            <field name="res_model">report.crm.project.bug.user</field>
+            <field name="view_type">form</field>
+  			<field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_crm_project_bug_user_graph"/>
+            <field name="search_view_id" ref="view_crm_project_bug_user_filter"/>
+        </record>
+        
+        <menuitem id="menu_project_report" name="Reporting" parent="project.menu_main" sequence="50"/>
+        <menuitem name="Project Bug" id="menu_crm_project_bug_tree" parent="menu_project_report"/>
+        <menuitem action="action_report_crm_project_bug_user_tree" id="menu_crm_project_bug_user_tree" parent="menu_crm_project_bug_tree"/>
+        
+        <!-- # Project Bug by section and category of case -->
+
+        <record id="view_crm_project_bug_categ_tree" model="ir.ui.view">
+            <field name="name">report.crm.project.bug.categ.tree</field>
+            <field name="model">report.crm.project.bug.categ</field>
+            <field name="inherit_id" ref="report_crm.view_crm_case_categ_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_crm_project_bug_categ_form" model="ir.ui.view">
+            <field name="name">report.crm.project.bug.categ.form</field>
+            <field name="model">report.crm.project.bug.categ</field>
+            <field name="inherit_id" ref="report_crm.view_crm_case_categ_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+
+		<record id="view_crm_project_bug_categ_graph" model="ir.ui.view">
+            <field name="name">report.crm.project.bug.categ.graph</field>
+            <field name="model">report.crm.project.bug.categ</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="project_bugs by Section and Categories" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="categ_id"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_crm_project_bug_categ_filter" model="ir.ui.view">
+            <field name="name">report.crm.project.bug.categ.select</field>
+            <field name="model">report.crm.project.bug.categ</field>
+			<field name="inherit_id" ref="report_crm.view_crm_case_categ_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+                </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_project_bug_categ_tree" model="ir.actions.act_window">
+            <field name="name">Project Bugs by Categories and Section</field>
+            <field name="res_model">report.crm.project.bug.categ</field>
+            <field name="view_type">form</field>
+  			<field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_crm_project_bug_categ_graph"/>
+            <field name="search_view_id" ref="view_crm_project_bug_categ_filter"/>
+        </record>
+        <menuitem action="action_report_crm_project_bug_categ_tree" id="menu_crm_project_bug_categ_tree" parent="menu_crm_project_bug_tree"/>
+
+       <!-- Project Bug by Section  -->
+
+        <record id="view_report_crm_project_bug_section_tree" model="ir.ui.view">
+            <field name="name">report.crm.project.bug.section.tree</field>
+            <field name="model">report.crm.project.bug.section</field>
+            <field name="inherit_id" ref="report_crm.view_report_crm_case_section_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr_cases" position="after">
+	                <field name="avg_answers"/>
+	                <field name="perc_done" select="2"/>
+                    <field name="perc_cancel" select="2"/>
+                    <field name="delay_close"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_report_crm_project_bug_section_graph" model="ir.ui.view">
+            <field name="name">report.crm.project.bug.section.graph</field>
+            <field name="model">report.crm.project.bug.section</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="project_bugs by Section" type="bar">
+                    <field name="name"/>
+                    <field name="nbr_cases" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_report_crm_project_bug_section_filter" model="ir.ui.view">
+            <field name="name">report.crm.project.bug.section.select</field>
+            <field name="model">report.crm.project.bug.section</field>
+            <field name="inherit_id" ref="report_crm.view_report_crm_case_section_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="nbr_cases" position="before">
+                </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_project_bug_section_tree" model="ir.actions.act_window">
+            <field name="name">Project Bugs by Section</field>
+            <field name="res_model">report.crm.project.bug.section</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_report_crm_project_bug_section_graph"/>
+            <field name="search_view_id" ref="view_report_crm_project_bug_section_filter"/>
+        </record>
+        <menuitem action="action_report_crm_project_bug_section_tree" id="menu_crm_project_bug_section_tree" parent="menu_crm_project_bug_tree"/>        
+  </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/crm_vertical/__init__.py b/addons/crm_vertical/__init__.py
index f0c556d54fa..cc9ed5ba156 100644
--- a/addons/crm_vertical/__init__.py
+++ b/addons/crm_vertical/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/crm_vertical/__terp__.py b/addons/crm_vertical/__terp__.py
index e1ec9b1e8e8..faa2c416dd0 100644
--- a/addons/crm_vertical/__terp__.py
+++ b/addons/crm_vertical/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/crm_vertical/crm_vertical.py b/addons/crm_vertical/crm_vertical.py
index d22909c1883..4f1b0a0284d 100644
--- a/addons/crm_vertical/crm_vertical.py
+++ b/addons/crm_vertical/crm_vertical.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/delivery/__init__.py b/addons/delivery/__init__.py
index e77b62b18dc..850b14fb7eb 100644
--- a/addons/delivery/__init__.py
+++ b/addons/delivery/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/delivery/__terp__.py b/addons/delivery/__terp__.py
index 2ece2a51eda..46b15412d88 100644
--- a/addons/delivery/__terp__.py
+++ b/addons/delivery/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index ebdabcd5097..7e7d31975e5 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/delivery/partner.py b/addons/delivery/partner.py
index e293af59937..386e9d08139 100644
--- a/addons/delivery/partner.py
+++ b/addons/delivery/partner.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index a9f6e38a9e7..0133a263960 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index fb9f8387b10..fcd06265088 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/delivery/wizard/__init__.py b/addons/delivery/wizard/__init__.py
index b32982d4f0d..3b35a3cd51e 100644
--- a/addons/delivery/wizard/__init__.py
+++ b/addons/delivery/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index c3c5f0942d8..c7870e43d85 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document/__init__.py b/addons/document/__init__.py
index f624cfa850b..547205b1313 100644
--- a/addons/document/__init__.py
+++ b/addons/document/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document/__terp__.py b/addons/document/__terp__.py
index edd5ebe83af..a9d7026776b 100644
--- a/addons/document/__terp__.py
+++ b/addons/document/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -27,6 +27,12 @@
     'description': """This is a complete document management system:    
     * User Authentication
     * Document Indexation
+
+    ATTENTION: 
+    - When you install this module in a running company that have already PDF files stored into the database, 
+      you will lose them all. 
+    - After installing this module PDF's are not longer stored into the database, 
+      but in the servers rootpad like /server/bin/filestore.
 """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index b296c623465..dc026887ffe 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document/directory_content.py b/addons/document/directory_content.py
index 0b1b444e83a..2d434712f56 100644
--- a/addons/document/directory_content.py
+++ b/addons/document/directory_content.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document/directory_report.py b/addons/document/directory_report.py
index b5a80adc7ec..aac65cc8e36 100644
--- a/addons/document/directory_report.py
+++ b/addons/document/directory_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/document/document.py b/addons/document/document.py
index 1dffba0453d..e11b2bea9c1 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -140,7 +140,7 @@ class document_file(osv.osv):
         if not len(res):
             return False
         if not self._check_duplication(cr,uid,vals,ids,'write'):
-            raise except_orm(_('ValidateError'), _('File name must be unique!'))
+            raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
         result = super(document_file,self).write(cr,uid,ids,vals,context=context)
         cr.commit()
         return result
@@ -185,7 +185,7 @@ class document_file(osv.osv):
             datas=vals.get('datas',False)
         vals['file_size']= datas and len(datas) or 0
         if not self._check_duplication(cr,uid,vals):
-            raise except_orm(_('ValidateError'), _('File name must be unique!'))
+            raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
         result = super(document_file,self).create(cr, uid, vals, context)
         cr.commit()
         return result
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index d4232caadb2..2623c1f3852 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index 54e4ad3f9cf..d09bc62d325 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -25,6 +25,7 @@ import os
 import tools
 import base64
 from tools.misc import ustr
+from tools.translate import _
 
 from osv.orm import except_orm
 
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index e23b3ac5025..f7df0b84a5b 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -1,7 +1,11 @@
 <openerp>
 <data>
-    <menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
-    <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>
+    <!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
+    <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
+
+    <menuitem name="Knowledge Management" icon="terp-stock" id="menu_document"/>
+    <menuitem name="Configuration" id="menu_document_configuration" parent="menu_document" sequence="50"/>
+    <menuitem name="Document Management" id="menu_document_management_configuration" parent="menu_document_configuration" />
 
     <record model="ir.ui.view" id="view_document_storage_form">
         <field name="name">document.storage</field>
@@ -39,11 +43,11 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-    <menuitem
+   <!-- <menuitem
         name="Storage Media"
         action="action_document_storage_form"
         id="menu_document_storage_media"
-        parent="menu_document_configuration"/>
+        parent="menu_document_configuration"/>-->
 
     <record model="ir.ui.view" id="view_document_directory_form">
         <field name="name">document.directory</field>
@@ -133,7 +137,7 @@
         name="Directories"
         action="action_document_directory_form"
         id="menu_document_directories"
-        parent="menu_document_configuration"/>
+        parent="menu_document_management_configuration"/>
 
 
     <record model="ir.actions.act_window" id="action_document_directory_tree">
@@ -146,7 +150,7 @@
     <menuitem
         action="action_document_directory_tree"
         id="menu_document_directories_tree"
-        parent="menu_document_configuration"/>    
+        parent="menu_document_management_configuration" sequence="5"/>
 
     <record model="ir.ui.view" id="view_document_file_form">
         <field name="name">ir.attachment</field>
@@ -230,11 +234,12 @@
         <field name="res_model">ir.attachment</field>
         <field name="view_type">form</field>
     </record>
+    <menuitem name="Documents" id="menu_document_doc" parent="menu_document" sequence="5"/>
     <menuitem
         name="Search a File"
         action="action_document_file_form"
         id="menu_document_files"
-        parent="menu_document"/>
+        parent="menu_document_doc"/>
 
     <record model="ir.actions.act_window" id="action_document_file_directory_form">
         <field name="type">ir.actions.act_window</field>
@@ -289,7 +294,7 @@
             </field>
         </field>
     </record>
-        
+
         <act_window domain="[('partner_id', '=', active_id)]"
             id="act_res_partner_document" name="Related Documents"
             res_model="ir.attachment"
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index 9880f55f1db..e9abe8734a8 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document/odt2txt.py b/addons/document/odt2txt.py
index 96acc6f7bd1..9ca9b6e596f 100644
--- a/addons/document/odt2txt.py
+++ b/addons/document/odt2txt.py
@@ -3,7 +3,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index a35f1ab615d..bd61c65e16b 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document_caldav/__init__.py b/addons/document_caldav/__init__.py
index 745f90a9b1e..d764dfca72d 100644
--- a/addons/document_caldav/__init__.py
+++ b/addons/document_caldav/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document_caldav/__terp__.py b/addons/document_caldav/__terp__.py
index 9bc22884fee..d7480c734bd 100644
--- a/addons/document_caldav/__terp__.py
+++ b/addons/document_caldav/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document_caldav/document_caldav.py b/addons/document_caldav/document_caldav.py
index c10af2a0a09..01af5d0d345 100644
--- a/addons/document_caldav/document_caldav.py
+++ b/addons/document_caldav/document_caldav.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -36,8 +36,9 @@ class document_directory_content(osv.osv):
             return super(document_directory_content, self).process_write(cr, uid, node, data, context)
         content = self.browse(cr, uid, node.cnt_id, context)
         fobj = self.pool.get(content.object_id.model)
+        if not context:
+            context = {}
         fobj.import_cal(cr, uid, base64.encodestring(data), context=context)
-
         return True
 
     def process_read(self, cr, uid, node, context=None):
diff --git a/addons/document_change/__init__.py b/addons/document_change/__init__.py
new file mode 100644
index 00000000000..2cf5916bbfe
--- /dev/null
+++ b/addons/document_change/__init__.py
@@ -0,0 +1,25 @@
+# -*- 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 document_change
+import document_change_mailgate
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_change/__terp__.py b/addons/document_change/__terp__.py
new file mode 100644
index 00000000000..3e6107367f8
--- /dev/null
+++ b/addons/document_change/__terp__.py
@@ -0,0 +1,50 @@
+# -*- 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': 'Integrated Document Management System',
+    'version': '1.99',
+    'category': 'Generic Modules/Others',
+    'description': """The document_change module allows to track and manage process changes to
+    update documents in directories, and keep track of these updates. You
+    can define control points, phase of changes.
+""",
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'depends': ['base', 'document_ftp','mail_gateway'],
+    'init_xml': ['document_change_data.xml'],
+    'update_xml': [   
+                   'security/document_process_security.xml',
+                   'document_change_view.xml',
+                   'document_change_sequence.xml',
+                   'document_change_workflow.xml',
+                   'document_phase_workflow.xml',
+                   'document_process_workflow.xml',
+                
+    ],
+    'demo_xml': [ ],
+    'installable': True,
+    'active': False,
+    'certificate': None,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
new file mode 100644
index 00000000000..8be097bed4f
--- /dev/null
+++ b/addons/document_change/document_change.py
@@ -0,0 +1,334 @@
+#-*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import tools
+from osv import fields, osv
+import os
+import pooler
+import netsvc
+from tools.translate import _
+import time
+import datetime
+class doucment_change_process_phase_type(osv.osv):
+    _name = "document.change.process.phase.type"
+doucment_change_process_phase_type()
+
+class document_change_type(osv.osv):
+    _name = "document.change.type"
+    _description = "Document Change Type"
+    
+    _columns = {
+        'name': fields.char("Document Change Type", size=64,required=True),
+        'phase_type_ids': fields.many2many('document.change.process.phase.type','document_type_phase_type_rel','document_type_id','phase_type_id','Phase Type'),
+        'directory_id' :fields.many2one('document.directory','Pending Directory'),        
+        'template_document_id':fields.many2one('ir.attachment','Document')
+    }
+document_change_type()
+
+class doucment_change_process_phase_type(osv.osv):
+    _name = "document.change.process.phase.type"
+    _description = "Document Change Process Phase Type"
+    
+    _columns = {
+        'name': fields.char("Document Changed Process Type", size=64),
+        'sequence': fields.integer('Sequence'),
+        'active': fields.boolean('Active'),
+        'document_type_ids': fields.many2many('document.change.type','document_type_phase_type_rel','phase_type_id','document_type_id','Document Type'),
+    }
+    _defaults = {      
+                 'active': lambda *a:1,
+    }
+doucment_change_process_phase_type()
+
+class doucment_change_process(osv.osv):    
+    _name = "document.change.process"
+doucment_change_process()
+
+class doucment_change_process_phase(osv.osv):
+    _name = "document.change.process.phase"
+    _description = "Document Change Process Phase"
+    
+    _columns = {
+        'name': fields.char("Name", size=64, required=True),
+        'process_id':fields.many2one('document.change.process','Process Change'),
+        'sequence': fields.integer('Sequence'),
+        'update_document': fields.selection([('at_endPhase', 'End Phase'),('at_endprocess', 'End Process')], 'Update Document', required=True),        
+        'type': fields.selection([('control_required', 'Control Required'),('no_control', 'No Control')], 'Type'),
+        'date_control': fields.date('Control Date', select=True),        
+        'phase_type_id':fields.many2one('document.change.process.phase.type','Phase Type'),
+        'state': fields.selection([('draft', 'Draft'),('in_process', 'Started'),('to_validate', 'To Validate'),('done', 'Done')], 'State',readonly=True),
+        'phase_document_ids':fields.one2many('ir.attachment','process_phase_id','Documents'),
+    }
+    _defaults = {      
+     'state': lambda *a: 'draft',
+     'update_document': lambda *a:'at_endPhase',
+     'type':lambda *a: 'no_control',
+     }
+    def do_draft(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {'state':'draft'})
+        return True
+
+    def do_confirm(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {'state':'to_validate'})
+        return True
+
+    def do_start(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {'state':'in_process'})
+        return True           
+
+    def do_done(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {'state':'done'})
+        return True 
+    def test_control_request(self, cr, uid, ids, context=None):
+        return all(bool(process.type) =='control_required' for process in self.browse(cr, uid, ids, context=context))
+
+    def test_nocontrol_request(self, cr, uid, ids, context=None):
+        return all(bool(process.type) =='no_control' for process in self.browse(cr, uid, ids, context=context))
+
+doucment_change_process_phase()
+
+class document_change_process_model(osv.osv):
+    _name = "document.change.process.model"
+    _description = "Document Change Process model"
+    
+    _columns = {
+        'name': fields.char("Changed Process Model", size=64,required=True),
+        'sequence': fields.integer('Sequence'),
+        'phase_type_ids':fields.many2many('document.change.process.phase.type','process_model_phase_type_rel','process_model_id','phase_type_id','Phase Type'),
+        }
+document_change_process_model()
+
+class document_change_process_type(osv.osv):
+    _name = "document.change.process.type"
+    _description = "Document Change Process Type"  
+    
+    _columns = {
+        'name': fields.char("Changed Process Type", size=64),
+        }
+document_change_process_type()
+
+class document_change_process_email(osv.osv):
+    _name = "document.change.process.mail"
+    _description = "Document Change Process Email Notification"  
+    
+    _columns = {
+        'name': fields.char("Email", size=64),
+        'type':fields.selection([('start_end', 'Start/End Process '),('change_all', 'Change in All Document')], 'Notification Type'),
+        'process_id':fields.many2one('document.change.process','Process Change'),        
+        }
+document_change_process_email()
+
+class doucment_change_process(osv.osv):
+    
+    _name = "document.change.process"
+    _description = "Document Change Process"
+    
+    def _latestmodification(self, cr, uid, ids, field_name, arg, context={}):
+        res = {}
+        #TODOto calculate latest modified date from all related documents
+        return res
+    def _get_document(self, cr, uid, ids, context={}, *arg):
+        if not ids:
+            return {}
+        res = {}
+        attach = self.pool.get('ir.attachment') 
+        directory_obj = self.pool.get('document.directory') 
+        for process_change in self.browse(cr, uid, ids):
+            res1 = []            
+            for phase_id in  process_change.process_phase_ids:
+                res1 += map(lambda x:x.id, phase_id.phase_document_ids or [])    
+            res[process_change.id] = res1       
+        return res
+
+    
+    def _get_progress(self, cr, uid, ids, field_name, arg, context={}):
+        result = {}
+        progress = 0.0
+        for proc_change in self.browse(cr, uid, ids):
+            update_docs = []
+            result[proc_change.id] = 0.0
+            for doc in proc_change.process_document_ids:
+                if doc.state in ('to_update', 'change_propose'):
+                    update_docs.append(doc)
+                progress = (float(len(update_docs))/float(len(proc_change.process_document_ids)))*100
+                result[proc_change.id] = progress
+        return result
+    
+    def _get_current_phase(self, cr, uid, ids, field_name, arg, context={}):
+        result = {}
+        for proc in self.browse(cr, uid, ids):
+            result[proc.id] = False
+            for phase in proc.process_phase_ids:
+                if phase.state in ('in_process','to_validate'):
+                    result[proc.id] = phase.id
+        return result 
+    
+    _columns = {
+        'name': fields.char("Process Change", size=64, required=True, select=True),
+        'process_type_id' :fields.many2one('document.change.process.type','Type Change'),
+        'description': fields.char("Small Description", size=64),
+        'change_description':fields.text('Changed Description'),
+        'structure_id' :fields.many2one('document.directory','Structure Directory'),
+        'process_model_id':fields.many2one('document.change.process.model','Process Model'),
+        'user_id':fields.many2one('res.users','Change Owner'),
+        'create_date':fields.datetime('Creation',readonly=True),
+        'latest_modified_date':fields.function(_latestmodification, method=True, type='datetime', string="Lastest Modification"), #TODO no year!
+        'date_expected':fields.datetime('Expected Production'), 
+        'state':fields.selection([('draft', 'Draft'),('in_progress', 'In Progress'),('to_validate', 'To Validate'), ('pending', 'Pending'), ('done', 'Done'),('cancel','Cancelled')], 'state', readonly=True),
+        'process_phase_ids':fields.one2many('document.change.process.phase','process_id','Phase'),                
+        'current_phase_id': fields.function(_get_current_phase, method=True, type='many2one', relation='document.change.process.phase', string='Current Phase'),
+        'date_control': fields.related('current_phase_id','date_control', type='date', string='Control Date'), 
+        'progress': fields.function(_get_progress, method=True, type='float', string='Progress'),
+        'process_document_ids': fields.many2many('ir.attachment','document_changed_process_rel','process_id','change_id','Document To Change'),
+        'pending_directory_id' :fields.many2one('document.directory','Pending Directory'),
+    }
+    _defaults = {      
+      'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'document.change.process'),
+      'state': lambda *a: 'draft',
+      }
+    def do_start(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'in_progress'},context=context)              
+        return True
+
+    def do_pending(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'pending'},context=context)                
+        return True             
+    
+    def do_confirm(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'to_validate'},context=context)
+        return True   
+
+    def do_done(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'done'},context=context)
+        return True   
+             
+    def do_cancel(self, cr, uid, ids, context={}):
+        return self.write(cr, uid, ids, {'state':'cancel'},context=context) 
+
+    def generate_phases(self, cr, uid, ids, *args):
+        phase_obj = self.pool.get('document.change.process.phase')
+        directory_obj = self.pool.get('document.directory') 
+        document_obj = self.pool.get('ir.attachment')
+        new_doc_ids = []     
+        for process in self.browse(cr, uid, ids):
+            if process.process_model_id:
+                directory_ids = directory_obj.search(cr, uid, [('parent_id','child_of',process.structure_id and process.structure_id.id)])
+                for phase_type_id in process.process_model_id.phase_type_ids:
+                    for document_type_id in phase_type_id.document_type_ids:
+                        document_ids = document_obj.search(cr, uid, [
+                                                ('parent_id','in',directory_ids),
+                                                ('change_type_id','=',document_type_id.id)])
+                        new_doc_ids = []                        
+                        for document_id in document_ids: 
+                            vals = {}                           
+                            if process.pending_directory_id:
+                                vals.update({'parent_id':process.pending_directory_id.id})
+                            new_doc_ids.append(document_obj.copy(cr, uid, document_id, vals))                            
+                    phase_value = {
+                        'name' : '%s-%s' %(phase_type_id.name, process.name),
+                        'phase_type_id': phase_type_id.id,
+                        'process_id': process.id,
+                        'phase_document_ids': [(6,0,new_doc_ids)]   
+                    }            
+                    phase_obj.create(cr, uid, phase_value)   
+                                     
+        return True
+
+doucment_change_process()
+
+class document_file(osv.osv):
+    _inherit = 'ir.attachment'
+    
+    _columns = {
+        'change_type_id':fields.many2one('document.change.type','Document Type'),
+        'state': fields.selection([('in_production', 'In Production'), ('change_request', 'Change Request'),('change_propose', 'Change Proposed'), ('to_update', 'To Update'), ('cancel', 'Cancel')], 'State'),
+        'target_document_id': fields.many2one('ir.attachment', 'Target Document'),
+        'target':fields.binary('Target'),
+        'process_phase_id' :fields.many2one('document.change.process.phase','Process Phase'),
+        'progress': fields.float('Progress'), #TODO : functio field: calculate progress
+        'change_process_id': fields.related('process_phase_id', 'process_id', type='many2one', relation='document.change.process', string='Change Process'),
+    }
+    _defaults = {      
+        'state': lambda *a: 'in_production',
+     }    
+    
+    def _check_duplication(self, cr, uid, vals, ids=[], op='create'):
+        name=vals.get('name',False)
+        parent_id=vals.get('parent_id',False)
+        res_model=vals.get('res_model',False)
+        res_id=vals.get('res_id',0)
+        type_id=vals.get('change_type_id',False)
+        if op=='write':
+            for file in self.browse(cr,uid,ids):
+                if not name:
+                    name=file.name
+                if not parent_id:
+                    parent_id=file.parent_id and file.parent_id.id or False
+                if not res_model:
+                    res_model=file.res_model and file.res_model or False
+                if not res_id:
+                    res_id=file.res_id and file.res_id or 0
+                res=self.search(cr,uid,[('id','<>',file.id),('name','=',name),('parent_id','=',parent_id),('res_model','=',res_model),('res_id','=',res_id),('change_type_id','=',type_id)])
+                if len(res):
+                    return False
+        if op=='create':
+            res=self.search(cr,uid,[('name','=',name),('parent_id','=',parent_id),('res_id','=',res_id),('res_model','=',res_model),('change_type_id','=',type_id)])
+            if len(res):
+                return False
+        return True
+    
+    def do_change_request(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'change_request'},context=context)              
+        return True
+
+    def do_change_propose(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'change_propose'},context=context)      
+        return True             
+    
+    def do_to_update(self, cr, uid, ids, context={}):
+        for attach in self.browse(cr, uid, ids, context=context):
+            if attach.change_type_id.directory_id.id:
+                attach_ids = self.pool.get('ir.attachment').search(cr,uid, [('id', '=',attach.target_document_id.id)])
+                read_data=self.read(cr,uid, attach_ids,['datas','datas_fname'])
+                self.write(cr, uid, attach_ids, {'state':'to_update','datas':attach.datas,'datas_fname':attach.datas_fname},context=context)
+                res={}
+                for data in read_data:
+                    t=datetime.datetime.now()
+                    file_name=data['datas_fname'].split('.')
+                    new_name=str(file_name[0]+'.old'+time.strftime("%y%m%d")+'.'+file_name[1])
+                    res['name']=attach.name
+                    res['datas']=data['datas'] 
+                    res['datas_fname']=new_name
+                    res['parent_id']=attach.change_type_id.directory_id.id
+                    old_id = self.create(cr, uid, res)
+        self.write(cr, uid, ids, {'state':'to_update'},context=context)            
+        return True   
+
+    def do_production(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'in_production'},context=context)
+        return True   
+             
+    def do_cancel(self, cr, uid, ids, context={}):
+        return self.write(cr, uid, ids, {'state':'cancel'},context=context)        
+    
+    def test_change_request(self, cr, uid, ids, context=None):
+        return all(bool(attch.target_document_id) != False for attch in self.browse(cr, uid, ids, context=context))
+        
+document_file()
diff --git a/addons/document_change/document_change_data.xml b/addons/document_change/document_change_data.xml
new file mode 100644
index 00000000000..f43b36a7361
--- /dev/null
+++ b/addons/document_change/document_change_data.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+	
+	<!-- Structure Data -->
+	<record model="document.directory" id="dir_root">
+        <field name="name">Gosselies</field>
+    </record>
+    <record model="document.directory" id="dir_bat_e">
+        <field name="name">Bat E</field>
+    	<field name="parent_id" ref="dir_root"/>
+    </record>
+    <record model="document.directory" id="dir_bat_z">
+        <field name="name">Bat Z</field>
+    	<field name="parent_id" ref="dir_root"/>
+    </record>
+    
+    <record model="document.directory" id="dir_mq_section">
+        <field name="name">MQ Section</field>
+        <field name="parent_id" ref="dir_bat_e"/>
+    </record>
+    
+    <record model="document.directory" id="dir_section_x">
+        <field name="name">Section X</field>
+        <field name="parent_id" ref="dir_mq_section"/>
+    </record>
+    <record model="document.directory" id="dir_section_y">
+        <field name="name">Section Y</field>
+        <field name="parent_id" ref="dir_mq_section"/>
+    </record>
+    
+    <record model="document.directory" id="dir_ws_1bc">
+        <field name="name">Work Station 1BC</field>
+        <field name="parent_id" ref="dir_section_x"/>
+    </record>
+    <record model="document.directory" id="dir_ws_2bc">
+        <field name="name">Work Station 2BC</field>
+        <field name="parent_id" ref="dir_section_x"/>
+    </record>
+    <record model="document.directory" id="dir_ws_3bc">
+        <field name="name">Work Station 3BC</field>
+        <field name="parent_id" ref="dir_section_y"/>
+    </record>
+    
+    <record model="document.directory" id="dir_family1">
+        <field name="name">Family 1</field>
+        <field name="parent_id" ref="dir_ws_1bc"/>
+    </record>
+    <record model="document.directory" id="dir_family2">
+        <field name="name">Family 2</field>
+        <field name="parent_id" ref="dir_ws_1bc"/>
+    </record>
+    <record model="document.directory" id="dir_family3">
+        <field name="name">Family 3</field>
+        <field name="parent_id" ref="dir_ws_2bc"/>
+    </record>
+    <record model="document.directory" id="dir_family4">
+        <field name="name">Family 4</field>
+        <field name="parent_id" ref="dir_ws_3bc"/>
+    </record>
+    
+    <record model="document.directory" id="dir_vsm">
+        <field name="name">VSM</field>
+        <field name="parent_id" ref="dir_bat_z"/>
+    </record>
+    <record model="document.directory" id="dir_takt_time">
+        <field name="name">Takt Time</field>
+        <field name="parent_id" ref="dir_bat_z"/>
+    </record>
+
+	<!-- Document Templates -->
+	<record model="ir.attachment" id="doc_FIE_template">
+        <field name="name">FIE_template</field>
+        <field name="datas_fname">FIE_template.xls</field>
+        <field name="parent_id" ref="dir_root"/>
+    </record>
+    <record model="ir.attachment" id="doc_SFMEA_template">
+        <field name="name">SFMEA_template</field>
+        <field name="datas_fname">SFMEA_template.xls</field>
+        <field name="parent_id" ref="dir_root"/>
+    </record>
+    <record model="ir.attachment" id="doc_ProjectCharter_Template">
+        <field name="name">ProjectCharter_Template</field>
+        <field name="datas_fname">ProjectCharter_Template.ppt</field>
+        <field name="parent_id" ref="dir_root"/>
+    </record>
+    <record model="ir.attachment" id="doc_TaktTime_template">
+        <field name="name">TaktTime_template</field>
+        <field name="datas_fname">TaktTime_template.xls</field>
+        <field name="parent_id" ref="dir_takt_time"/>
+    </record>
+	
+	<!-- Document Change Types -->
+	<record model="document.change.type" id="type_project_charter">
+        <field name="name">Project Charter</field>
+        <field name="template_document_id" ref="doc_ProjectCharter_Template"/>
+    </record>
+    <record model="document.change.type" id="type_vsm">
+        <field name="name">VSM</field>
+    </record>
+	<record model="document.change.type" id="type_takt_time">
+        <field name="name">Takt Time</field>
+        <field name="template_document_id" ref="doc_TaktTime_template"/>
+    </record>
+    <record model="document.change.type" id="type_FIE">
+        <field name="name">FIE</field>
+        <field name="template_document_id" ref="doc_FIE_template"/>
+    </record>
+    <record model="document.change.type" id="type_SFMEA">
+        <field name="name">SFMEA</field>
+        <field name="template_document_id" ref="doc_SFMEA_template"/>
+    </record>
+
+	<!-- Documents -->
+	<record model="ir.attachment" id="doc_FIE_05466_001">
+        <field name="name">FIE_05466_001</field>
+        <field name="datas_fname">FIE_05466_001.xls</field>
+        <field name="parent_id" ref="dir_family1"/>
+        <field name="change_type_id" ref="type_FIE"/>
+    </record>
+    <record model="ir.attachment" id="doc_SFMEA_0581_001">
+        <field name="name">SFMEA_0581_001</field>
+        <field name="datas_fname">SFMEA_0581_001.xls</field>
+        <field name="parent_id" ref="dir_family1"/>
+        <field name="change_type_id" ref="type_SFMEA"/>
+    </record>
+    <record model="ir.attachment" id="doc_SFMEA_0581_002">
+        <field name="name">SFMEA_0581_002</field>
+        <field name="datas_fname">SFMEA_0581_002.xls</field>
+        <field name="parent_id" ref="dir_family2"/>
+        <field name="change_type_id" ref="type_SFMEA"/>
+    </record>
+    <record model="ir.attachment" id="doc_TaktTime_0549">
+        <field name="name">TaktTime_0549</field>
+        <field name="datas_fname">TaktTime_0549.xls</field>
+        <field name="parent_id" ref="dir_takt_time"/>
+        <field name="change_type_id" ref="type_takt_time"/>
+    </record>
+    
+	<!-- Phase Types -->
+	<record model="document.change.process.phase.type" id="phase_type_concept">
+        <field name="name">Concept</field>
+        <field name="sequence">1</field>
+        <field eval="[(6, 0, [ref('type_project_charter'),ref('type_vsm'),ref('type_takt_time')])]" name="document_type_ids"/>
+    </record>
+    <record model="document.change.process.phase.type" id="phase_type_development">
+        <field name="name">Development</field>
+        <field name="sequence">2</field>
+        <field eval="[(6, 0, [ref('type_FIE'),ref('type_SFMEA')])]" name="document_type_ids"/>
+    </record>
+    <record model="document.change.process.phase.type" id="phase_type_validation">
+        <field name="name">Validation</field>
+        <field name="sequence">3</field>
+        <field eval="[(6, 0, [ref('type_FIE'),ref('type_SFMEA')])]" name="document_type_ids"/>
+    </record>
+
+	<!-- Change of Models Data -->
+	<record model="document.change.process.model" id="model_NPI">
+        <field name="name">NPI</field>
+        <field eval="[(6, 0, [ref('phase_type_concept'),ref('phase_type_development'),ref('phase_type_validation')])]" name="phase_type_ids"/>
+    </record>
+    <record model="document.change.process.model" id="model_minor_change">
+        <field name="name">Minor_change</field>
+        <field eval="[(6, 0, [ref('phase_type_development')])]" name="phase_type_ids"/>
+    </record>
+    
+	<!-- Process Types -->
+    <record model="document.change.process.type" id="process_quality_alert">
+    	<field name="name">Quality Alert</field>
+    </record>
+    <record model="document.change.process.type" id="process_new_product">
+    	<field name="name">New Product</field>
+    </record>
+    <record model="document.change.process.type" id="process_red_risk">
+    	<field name="name">Red Risk</field>
+    </record>
+    <record model="document.change.process.type" id="process_ci_card">
+    	<field name="name">CI Card</field>
+    </record>
+</data>
+</openerp>
diff --git a/addons/document_change/document_change_mailgate.py b/addons/document_change/document_change_mailgate.py
new file mode 100644
index 00000000000..ecc6522004f
--- /dev/null
+++ b/addons/document_change/document_change_mailgate.py
@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+import re
+import os
+
+import mx.DateTime
+import base64
+
+from tools.translate import _
+
+import tools
+from osv import fields,osv,orm
+from osv.orm import except_orm
+
+class document_file(osv.osv):    
+    _inherit = "ir.attachment"
+
+    _columns = {
+        'email_notification_ids':fields.one2many('document.email.notes','document_id','Phase', readonly=True),       
+    }    
+
+    def msg_new(self, cr, uid, msg):
+        raise Exception(_('Sorry, Not Allowed to create document'))                
+        return False
+    
+    def msg_update(self, cr, uid, id, msg, data={}, default_act='pending'):         
+        mailgate_obj = self.pool.get('mail.gateway')
+        msg_actions, body_data = mailgate_obj.msg_act_get(msg) 
+        email_notify_data = {
+            'name' : msg['Subject'],
+            'description' : body_data,
+            'email' : msg['From'],            
+        }          
+        data.update({            
+            'email_notification_ids': [(0, 0, email_notify_data)],
+        })        
+        res = self.write(cr, uid, [id], data)
+        return res
+
+    def emails_get(self, cr, uid, ids, context={}):                
+        res = []
+        if isinstance(ids, (str, int, long)):
+            select = [ids]
+        else:
+            select = ids
+        for document in self.browse(cr, uid, select):
+            user_email = (document.user_id and document.user_id.address_id and document.user_id.address_id.email) or False
+            res += [(user_email, False, False, False)]
+        if isinstance(ids, (str, int, long)):
+            return len(res) and res[0] or False
+        return res
+
+    def msg_send(self, cr, uid, id, *args, **argv):
+        return True 
+
+document_file()
+
+
+class document_email_notes(osv.osv):
+    _name = "document.email.notes"
+    _description = "EMail Conversation Detail"
+
+    def _note_get(self, cursor, user, ids, name, arg, context=None):
+        res = {}
+        for hist in self.browse(cursor, user, ids, context or {}):
+            res[hist.id] = (hist.email or '/') + ' (' + str(hist.create_date) + ')\n'
+            res[hist.id] += (hist.description or '')
+        return res
+
+    _columns = {
+        'name': fields.char("Name", size=64, required=True, select=True),
+        'description': fields.text('Description'),
+        'note': fields.function(_note_get, method=True, string="Description", type="text"),
+        'email': fields.char('Email', size=84),  
+        'create_date': fields.datetime('Created Date'),  
+        'action': fields.char('Action', size=64),
+        'document_id': fields.many2one('ir.attachment','Document', required=True),    
+    }
+document_email_notes()
diff --git a/addons/document_change/document_change_sequence.xml b/addons/document_change/document_change_sequence.xml
new file mode 100644
index 00000000000..111cd2ffa9c
--- /dev/null
+++ b/addons/document_change/document_change_sequence.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<openerp>
+    <data>   
+     	<record id="seq_type_document_change_process" model="ir.sequence.type">
+            <field name="name">Document Change Process</field>
+            <field name="code">document.change.process</field>
+        </record>
+    
+		<record model="ir.sequence" id="seq_document_change_process">
+            <field name="name">Document Change Process</field>
+            <field name="code">document.change.process</field>
+            <field name="prefix">PC</field>
+            <field name="padding">5</field>
+        </record>
+    </data>
+</openerp>
+    
\ No newline at end of file
diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
new file mode 100644
index 00000000000..536f173ba39
--- /dev/null
+++ b/addons/document_change/document_change_view.xml
@@ -0,0 +1,625 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+
+	<menuitem name="Process Changes" icon="terp-stock" id="menu_process_changes"/>
+	
+	<menuitem name="Process Changes" id="menu_document_process_changes" parent="menu_process_changes"/>
+	<menuitem name="Change Control" id="menu_change_control" parent="menu_process_changes"/>
+	<menuitem name="Reporting" id="menu_reporting" parent="menu_process_changes"/>
+	<menuitem name="Configuration" id="menu_configuration" parent="menu_process_changes"/>
+	
+	<!--    
+		Structure
+	-->
+    <record model="ir.ui.view" id="view_document_structure_form">
+        <field name="name">document.directory</field>
+        <field name="model">document.directory</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+        	<form string="Structure">
+	        	<field name="name"/>
+	        	<field name="parent_id"/>
+        	</form>
+        </field>
+    </record>
+    
+    <record model="ir.ui.view" id="view_document_structure_tree">
+        <field name="name">document.directory</field>
+        <field name="model">document.directory</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+        	<tree string="Structure">
+	        	<field name="name"/>
+	        	<field name="parent_id"/>
+	        </tree>
+        </field>
+    </record>
+    
+    <record model="ir.actions.act_window" id="action_document_structure_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">document.directory</field>
+        <field name="name">Structure</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_document_structure_tree"/>
+    </record>
+    <record id="action_document_structure_tree_view" model="ir.actions.act_window.view">
+        <field eval="1" name="sequence"/>
+        <field name="view_mode">tree</field>
+        <field name="act_window_id" ref="action_document_structure_form"/>
+    </record>
+    <record id="action_document_structure_form_view" model="ir.actions.act_window.view">
+        <field eval="2" name="sequence"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_document_structure_form"/>
+        <field name="act_window_id" ref="action_document_structure_form"/>
+    </record>
+    <menuitem name="Structure" id="menu_document_structure_config" parent="menu_configuration"/>
+    <menuitem action="action_document_structure_form" id="menu_structure_form" parent="menu_document_structure_config"/>
+	
+	<act_window domain="[('structure_id', '=', active_id)]" 
+		id="act_structure_process_changes" 
+		name="Process Changes" 
+		res_model="document.change.process" 
+		src_model="document.directory"/>
+	
+	<!-- 
+		Document Types 
+	-->
+	<record model="ir.ui.view" id="view_document_type_form">
+        <field name="name">document.change.type.form</field>
+        <field name="model">document.change.type</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Document Types">
+                <field name="name" select="1"/>
+                <field name="directory_id"/>      
+				<field name ="template_document_id"/>                    
+                <separator string="Associated Phase Types" colspan="4"/>
+                <field name="phase_type_ids" colspan="4" nolabel="1"/>  
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_document_type_tree">
+        <field name="name">document.change.type.tree</field>
+        <field name="model">document.change.type</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Document Types">
+                <field name="name"/>      
+                <field name="directory_id"/>      
+				<field name ="template_document_id"/>                                            
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_document_type_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">document.change.type</field>
+        <field name="name">Document Types</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem name="Documents" id="menu_document_type_config" parent="menu_configuration"/>
+    <menuitem action="action_document_type_form" id="menu_document_type_form" parent="menu_document_type_config"/>
+	    
+    <!-- 
+    	Phase Types 
+    -->
+    <record model="ir.ui.view" id="view_process_phase_type_form">
+        <field name="name">document.change.process.phase.type.form</field>
+        <field name="model">document.change.process.phase.type</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Phase Types">
+            	<group colspan="4" col="6">
+	                <field name="name" select="1" string="Phase Type"/>
+	                <field name="sequence"/>
+	                <field name="active"/>
+	            </group>
+                <separator string="Associated Document Types" colspan="4"/>
+                <field name="document_type_ids" colspan="4" nolabel="1"/>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_process_phase_type_tree">
+        <field name="name">document.change.process.phase.type.tree</field>
+        <field name="model">document.change.process.phase.type</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Phase Types">
+				<field name="sequence"/>
+                <field name="name" string="Phase Type"/>
+                <field name="document_type_ids"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_process_phase_type_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">document.change.process.phase.type</field>
+        <field name="name">Types of Phases</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    
+    <menuitem name="Process Changes" id="menu_process_changes_config" parent="menu_configuration"/>
+    <menuitem action="action_process_phase_type_form" id="menu_phase_type_form" parent="menu_process_changes_config"/>
+    
+    <!-- Document Change Process Type -->
+       <record model="ir.ui.view" id="view_change_process_type_form">
+        <field name="name">document.change.process.type.form</field>
+        <field name="model">document.change.process.type</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Phase Types">
+	                <field name="name" select="1" string="Phase Type"/>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_change_processe_type_tree">
+        <field name="name">document.change.process.type.tree</field>
+        <field name="model">document.change.process.type</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Phase Types">
+                <field name="name" string="Phase Type"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_change_process_type_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">document.change.process.type</field>
+        <field name="name">Type Process</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    
+    <menuitem action="action_change_process_type_form" id="menu_change_process_type_form" parent="menu_process_changes_config"/>
+    
+    <!-- 
+    	Model of Changes 
+    -->
+    <record model="ir.ui.view" id="view_model_change_form">
+        <field name="name">document.change.process.model.form</field>
+        <field name="model">document.change.process.model</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Model of Changes">
+                <field name="name" select="1"/>
+                <field name="sequence"/>
+                <separator string="Phase Type" colspan="4"/>        
+                <field name="phase_type_ids" colspan="4" nolabel="1"/>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_model_change_tree">
+        <field name="name">document.change.process.model.tree</field>
+        <field name="model">document.change.process.model</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Model of Changes">                
+                <field name="sequence"/>
+                <field name="name"/>                
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_model_change_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">document.change.process.model</field>
+        <field name="name">Model of Changes</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem action="action_model_change_form" id="menu_model_change_form" parent="menu_process_changes_config"/>
+    
+	<!-- 
+		Documents 
+	-->
+    <record model="ir.ui.view" id="view_document_form">
+        <field name="name">ir.attachment.form</field>
+        <field name="model">ir.attachment</field>
+        <field name="priority" eval="1"/>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Documents">
+                <group colspan="4" col="6">
+                    <field name="name" select="1" string="Document Name" colspan="4"/>
+                    <field name="parent_id"/>
+                    <newline/>
+                    <field name="datas_fname"/>
+                    <field name="datas" filename="datas_fname" string="Content"/>
+                    <field name="change_type_id"/>
+                </group>
+                <separator string="Change Control" colspan="4"/>
+                <group col="7" colspan="4">
+	                <field name="state" readonly="1"/>
+					<button name="button_propose" states="change_request" string="Propose Change" icon="gtk-apply"/>
+					<button name="button_confirm" states="change_propose" string="To Validate" icon="gtk-apply"/>					
+                    <button name="button_validate" states="to_update" string="In Production" icon="gtk-apply"/>
+					<button name="button_request" states="cancel,in_production" string="Request Change" icon="gtk-media-play"/>
+					<button name="button_cancel" states="change_request,change_propose" string="Cancel"  icon="gtk-cancel"/>
+                </group>
+                <newline/>
+                <field name="target_document_id"/>    
+				<field name="target"/>                            
+                <newline/>
+                <separator string="Change Note" colspan="4"/>
+                <field colspan="4" name="description" nolabel="1"/>
+                <group colspan="2" col="2">
+                    <separator string="Creation" colspan="2"/>
+                    <field name="create_uid" readonly="1"/>
+                    <field name="create_date" readonly="1"/>
+                </group>
+                <group colspan="2" col="2">
+                    <separator string="Latest Modification" colspan="2"/>
+                    <field name="write_date" readonly="1"/>
+                    <field name="write_uid" readonly="1"/>
+                </group>
+                
+        		<field name="email_notification_ids" colspan="4" mode="tree, form" readonly="1" widget="one2many_list" nolabel="1">
+        			<tree string="Notifications">
+        				<field name="email"/>
+        				<field name="create_date"/>
+        			</tree>
+        			<form string="Notifications">
+        				<field name="email"/>
+        				<field name="create_date"/>
+                        <field name="name" string="Subject" colspan="4"/> 
+                        <separator string="Description" colspan="4"/>               			
+                        <field colspan="4" name="description" nolabel="1"/>
+        			</form>
+        		</field>
+                
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_document_tree">
+        <field name="name">ir.attachment.tree</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">
+                <field name="name" string="Document"/>
+                <field name="parent_id" string="Directory"/>
+                <field name="change_type_id" string="Type"/>
+                <field name="state"/>
+                <field name="change_process_id" string="Proc Chg #"/>
+                <field name="user_id" string="Owner"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_document_graph">
+	    <field name="name">ir.attachment.graph</field>
+	    <field name="model">ir.attachment</field>
+	    <field name="type">graph</field>
+	    <field name="arch" type="xml">
+	        <graph string="Documents by type" type="bar" orientation="vertical">
+				<field name="change_type_id"/>
+	            <field name="name" operator="+"/>
+	        </graph>
+	    </field>
+    </record>
+    <record model="ir.ui.view" id="view_document_search">
+        <field name="name">ir.attachment.search</field>
+        <field name="model">ir.attachment</field>
+        <field name="type">search</field>
+        <field name="priority" eval="1"/>
+        <field name="arch" type="xml">
+            <search string="Documents">
+            	<group col="7" colspan="4">
+	                <filter domain="[('state','=','change_request')]" string="To Change" icon="gtk-apply"/>
+	                <filter domain="[('state','=','to_update')]" string="To Validate" icon="gtk-execute"/>
+	            	<field name="change_type_id" string="Type of Documents" select="1"/>
+	            	<field name="parent_id" select="1"/>
+	            	<field name="create_uid" string="Owner" select="1"/>
+	            </group>
+	            <group expand="1" string="Group By..." col="20" colspan="4">
+	            	<filter domain="[]" string="By Owner" icon="terp-hr" context="{'group_by':'create_uid'}" help="Documents by owner"/>
+	            	<filter domain="[]" string="By Directory" icon="terp-hr" context="{'group_by':'parent_id'}" help="Documents by directory"/>
+	            	<filter domain="[]" string="By Type of Documents" icon="terp-hr" context="{'group_by':'change_type_id'}" help="Documents by type"/>
+	            </group>
+            </search>
+        </field>
+    </record>
+
+    <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="name">Documents</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_document_search"/>
+    </record>
+    
+    <record id="action_document_tree_view" model="ir.actions.act_window.view">
+        <field eval="1" name="sequence"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_document_tree"/>
+        <field name="act_window_id" ref="action_document_form"/>
+    </record>
+    <record id="action_document_form_view" model="ir.actions.act_window.view">
+        <field eval="2" name="sequence"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_document_form"/>
+        <field name="act_window_id" ref="action_document_form"/>
+    </record>
+    <record id="action_document_graph_view" model="ir.actions.act_window.view">
+        <field eval="3" name="sequence"/>
+        <field name="view_mode">graph</field>
+        <field name="view_id" ref="view_document_graph"/>
+        <field name="act_window_id" ref="action_document_form"/>
+    </record>
+    <menuitem action="action_document_form" id="menu_documents_form" parent="menu_document_process_changes"/>
+    
+    <record model="ir.actions.act_window" id="action_document_without_type_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">ir.attachment</field>
+        <field name="name">Documents Without Type</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_document_tree"/>
+        <field name="domain">[('change_type_id','=',False)]</field>
+    </record>
+    <menuitem action="action_document_without_type_form" id="menu_documents_without_type_form" parent="menu_change_control"/>
+    
+    <record model="ir.actions.act_window" id="action_document_to_update_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">ir.attachment</field>
+        <field name="name">Documents to Update</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_document_tree"/>
+        <field name="domain">[('state','=','to_update')]</field>    
+        </record>
+    <menuitem action="action_document_to_update_form" id="menu_documents_to_update_form" parent="menu_change_control"/>
+	
+	<!-- 
+		Phases 
+	-->
+	<record model="ir.ui.view" id="view_process_phase_form">
+        <field name="name">document.change.process.phase.form</field>
+        <field name="model">document.change.process.phase</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Phases">
+				<group colspan="4" col="6">            
+	                <field name="name" select="1"/>
+	                <field name="process_id" string="Process Change"/>
+	                <field name="sequence"/>
+	                <newline/>
+	                <field name="update_document" string="Update documents"/>
+	                <field name="type" string="Type"/>
+	                <field name="date_control" string="Control date" attrs="{'required':[('type','=','control_required')], 'invisible': [('type','!=','control_required')]}"/>
+	                <field name="phase_type_id" string="Phase Type"/>
+	            </group>
+				<separator colspan="4" string="Documents"/>
+                <field name="phase_document_ids" colspan="4"  nolabel="1"/>
+                <newline/>
+                <group col="5" colspan="4">
+	                <field name="state"/>
+	                <button name="button_start" states="draft" string="Start" icon="gtk-go-forward"/>
+	                <button name="button_confirm" states="in_process" string="To Validate" icon="gtk-execute"/>
+ 					<button name="button_end" states="to_validate" string="Done" icon="gtk-jump-to"/>	                
+            	</group>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_process_phase_tree">
+        <field name="name">document.change.process.phase.tree</field>
+        <field name="model">document.change.process.phase</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Phases">
+                <field name="sequence"/>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_process_phase_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">document.change.process.phase</field>
+        <field name="name">Phases</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+	<menuitem action="action_process_phase_form" id="menu_phases_form" parent="menu_document_process_changes"/>
+
+	<record model="ir.actions.act_window" id="action_process_phase_form_validate">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">document.change.process.phase</field>
+        <field name="name">Phases to Validate</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('state','=','to_validate')]</field>
+    </record>	
+	<menuitem action="action_process_phase_form_validate" id="menu_phases_to_validate_form" parent="menu_change_control"/>
+	
+	<act_window domain="[('process_phase_id', '=', active_id)]" 
+		id="act_documents_phases" 
+		name="Documents" 
+		res_model="ir.attachment" 
+		src_model="document.change.process.phase"/>
+	
+	<!--
+	Process Change
+	-->
+	<record model="ir.ui.view" id="view_process_form">
+        <field name="name">document.change.process.form</field>
+        <field name="model">document.change.process</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Process Change">            	
+                <group colspan="4" col="6">
+                    <field name="name"/>	                
+                    <field name="structure_id"/> 
+                    <field name="pending_directory_id"/>    
+                </group>                              
+                <group colspan="4" col="5">
+                    <field name="process_type_id" widget="selection"/>	                
+                    <field name="process_model_id" widget="selection"/>
+                    <button name="generate_phases" string="Generate Phases" type="object" icon="gtk-convert" />  
+                </group>
+                <group colspan="4">                                    
+                    <field name="description" colspan="4"/>
+                </group>
+
+                <notebook colspan="4">
+                	<page string="Process Definition">
+                		<group col="2" colspan="2">
+                			<separator string="Responsibles" colspan="2"/>
+                			<field name="user_id"/>
+                		</group>
+                		<group col="2" colspan="2">
+                			<separator string="Dates" colspan="2"/>
+                			<field name="create_date"/>
+                			<field name="latest_modified_date"/>
+                			<field name="date_expected"/>
+                		</group>
+                		<newline />
+                		 <separator colspan="4" string="Change Description"/>
+                		<field name="change_description" colspan="4" nolabel="1"/>
+                		<newline/>
+                		<group col="6" colspan="4">
+                			<field name="state"/>
+                			<button name="button_start" states="draft,pending" string="Start" icon="gtk-go-forward"/>
+                			<button name="button_confirm" states="in_progress" string="Validate" icon="gtk-execute"/>
+                			<button name="button_pending" states="in_progress" string="Pending" icon="gtk-media-pause"/>
+                			<button name="button_done" states="to_validate" string="Done" icon="gtk-jump-to"/>
+                		</group>
+                	</page>
+                	<page string="Phases">
+                		<field name="process_phase_ids" mode="tree,form" widget="one2many_list" nolabel="1">
+                			<tree string="Process Phases" editable="True">
+                				<field name="sequence"/>
+                				<field name="name"/>
+                				<field name="type"/>
+                				<field name="phase_document_ids"/>
+                				<field name="state"/>
+                			</tree>
+                			<form string="Process Phases">
+                				<field name="name"/>
+                				<field name="sequence"/>
+                				<field name="type"/>
+                				<field name="phase_document_ids" colspan="4"/>
+                				<field name="state"/>
+                			</form>
+                		</field>
+                	</page>     
+                    <page string="Documents">
+                		<field name="process_document_ids" mode="tree,form"  widget="one2many_list" nolabel="1">
+                			<tree string="Documents">
+		                		<field name="process_phase_id"/>
+		                		<field name="name" string="Document"/>
+		                		<field name="state"/>
+		                	</tree>
+                			<form string="Documents">
+		                		<field name="process_phase_id"/>
+		                		<field name="name" string="Document"/>
+		                		<field name="state"/>
+		                	</form>		                	
+		                </field>			            			
+                	</page>
+                           	                	
+                </notebook>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_process_tree">
+        <field name="name">document.change.process.tree</field>
+        <field name="model">document.change.process</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Process Change">
+                <field name="structure_id"/>
+                <field name="name" string="Proc Chg #"/>
+                <field name="description" string="Proc Chg Title"/>
+                <field name="user_id" string="Owner"/>
+                <field name="current_phase_id" string="Current Phase"/>
+                <field name="date_control" string="Date Control Point"/>
+                <field name="process_model_id"/>
+                <field name="progress" string="Progress"/>                
+                <field name="process_document_ids" string="# Documents"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_process_graph">
+	    <field name="name">document.change.process.graph</field>
+	    <field name="model">document.change.process</field>
+	    <field name="type">graph</field>
+	    <field name="arch" type="xml">
+	        <graph string="Process changes by month" type="bar" orientation="vertical">
+				<field name="create_date"/>
+	            <field name="process_document_ids" operator="+"/>
+	        </graph>
+	    </field>
+    </record> 
+	<record model="ir.ui.view" id="view_process_serach">
+        <field name="name">document.change.process.search</field>
+        <field name="model">document.change.process</field>
+        <field name="type">search</field>
+        <field name="priority" eval="1"/>
+        <field name="arch" type="xml">
+            <search string="Process Changes">
+            	<group col="8" colspan="4">
+            		<filter domain="[('user_id','=',uid)]" string="My Process Changes" icon="gtk-execute" help="My Process Changes"/>
+	                <filter domain="[('state','=','to_validate')]" string="To Validate" icon="gtk-apply" help="Process Changes to be validated"/>
+	                <filter domain="[('state','=','in_progress')]" string="Late" icon="gtk-execute" help="Process changes having the next Phase to validate that is late"/>
+	            	<field name="name" string="Process Change Title" select="1"/>
+	            	<field name="process_type_id" select="1"/>
+	            	<field name="structure_id" select="1"/>
+	            	<field name="user_id" string="Owner" select="1"/>
+	            </group>
+	            <group expand="1" string="Group By..." col="20" colspan="4">
+	            	<filter domain="[]" string="By Owner" icon="terp-hr" context="{'group_by':'user_id'}" help="Process Changes by owner"/>
+	            	<filter domain="[]" string="By Directory" icon="terp-hr" context="{'group_by':'structure_id'}" help="Process Changes by directory"/>
+	            </group>
+            </search>
+        </field>
+    </record>
+	  
+    <record model="ir.actions.act_window" id="action_process_form">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">document.change.process</field>
+        <field name="name">Process Changes</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form,graph</field>
+        <field name="search_view_id" ref="view_process_serach"/>
+    </record>
+    <menuitem action="action_process_form" id="menu_process_changes_form" parent="menu_document_process_changes"/>
+    
+    <record model="ir.actions.act_window" id="action_process_change_form_validate">
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">document.change.process</field>
+        <field name="name">Process Changes to Validate</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('state','=','to_validate')]</field>
+    </record>	
+	<menuitem action="action_process_change_form_validate" id="menu_process_to_validate_form" parent="menu_change_control"/>
+	
+	<act_window domain="[('process_id', '=', active_id)]" 
+		id="act_phase_change_process" 
+		name="Phases" 
+		res_model="document.change.process.phase" 
+		src_model="document.change.process"/>
+	
+	<act_window domain="[('change_process_id', '=', active_id)]" 
+		id="act_documents_change_process" 
+		name="Documents" 
+		res_model="ir.attachment" 
+		src_model="document.change.process"/>
+	
+</data>
+</openerp>
diff --git a/addons/document_change/document_change_workflow.xml b/addons/document_change/document_change_workflow.xml
new file mode 100644
index 00000000000..61bfd946280
--- /dev/null
+++ b/addons/document_change/document_change_workflow.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="wkf_attachment" model="workflow">
+            <field name="name">ir.attachment.basic</field>
+            <field name="osv">ir.attachment</field>
+            <field name="on_create">True</field>
+        </record>
+        
+		<!-- States -->
+        <record id="act_document_production" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_attachment"/>
+            <field name="flow_start">True</field>
+            <field name="name">in_production</field>
+            <field name="action">do_production()</field>
+            <field name="kind">function</field>            
+        </record>
+        <record id="act_document_request" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_attachment"/>            
+            <field name="name">change_request</field>
+            <field name="action">do_change_request()</field>
+            <field name="kind">function</field>
+        </record>
+        <record id="act_document_propose" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_attachment"/>
+            <field name="name">change_propose</field>
+            <field name="action">do_change_propose()</field>
+            <field name="kind">function</field>
+        </record>
+        <record id="act_document_confirm" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_attachment"/>
+            <field name="name">to_update</field>
+            <field name="action">do_to_update()</field>
+            <field name="kind">function</field>
+        </record>        
+        <record id="act_document_cancel" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_attachment"/>
+            <field name="name">cancel</field>            
+            <field name="action">do_cancel()</field>
+            <field name="kind">function</field>            
+        </record>        
+        
+		<!-- Transitions -->
+        <record id="tran_document_production_to_request" model="workflow.transition">
+            <field name="act_from" ref="act_document_production"/>
+            <field name="act_to" ref="act_document_request"/>
+            <field name="signal">button_request</field>
+        </record>
+        <record id="tran_document_request_to_propose" model="workflow.transition">
+            <field name="act_from" ref="act_document_request"/>
+            <field name="act_to" ref="act_document_propose"/>
+            <field name="condition">test_change_request()</field>
+            <field name="signal">button_propose</field>
+            
+        </record>
+        <record id="tran_document_request_to_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_document_request"/>
+            <field name="act_to" ref="act_document_cancel"/>
+            <field name="signal">button_cancel</field>
+        </record>
+        <record id="tran_document_propose_to_confirm" model="workflow.transition">
+            <field name="act_from" ref="act_document_propose"/>
+            <field name="act_to" ref="act_document_confirm"/>
+            <field name="signal">button_confirm</field>
+        </record>
+        <record id="tran_document_propose_to_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_document_propose"/>
+            <field name="act_to" ref="act_document_cancel"/>
+            <field name="signal">button_cancel</field>
+        </record>
+        <record id="tran_document_cancel_to_request" model="workflow.transition">
+            <field name="act_from" ref="act_document_cancel"/>
+            <field name="act_to" ref="act_document_request"/>
+            <field name="signal">button_request</field>
+        </record>
+        <record id="tran_document_confirm_to_production" model="workflow.transition">
+            <field name="act_from" ref="act_document_confirm"/>
+            <field name="act_to" ref="act_document_production"/>  
+            <field name="signal">button_validate</field>         
+        </record>        
+    </data>
+</openerp>
diff --git a/addons/document_change/document_phase_workflow.xml b/addons/document_change/document_phase_workflow.xml
new file mode 100644
index 00000000000..ea59fc2abe4
--- /dev/null
+++ b/addons/document_change/document_phase_workflow.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="wkf_change_process_phase" model="workflow">
+            <field name="name">document.change.process.phase.basic</field>
+            <field name="osv">document.change.process.phase</field>
+            <field name="on_create">True</field>
+        </record>
+        
+		<!-- States -->
+        <record id="act_phase_draft" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_change_process_phase"/>
+            <field name="flow_start">True</field>
+            <field name="name">draft</field>
+        </record>
+        <record id="act_phase_start" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_change_process_phase"/>
+            <field name="name">in_process</field>
+            <field name="action">do_start()</field>
+            <field name="kind">function</field>
+        </record>
+        <record id="act_phase_confirm" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_change_process_phase"/>
+            <field name="name">to_validate</field>
+            <field name="action">do_confirm()</field>
+            <field name="kind">function</field>
+        </record>
+        <record id="act_phase_end" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_change_process_phase"/>
+            <field name="name">done</field>
+            <field name="action">do_done()</field>
+            <field name="kind">function</field>
+        </record>
+        
+		<!-- Transitions -->
+        <record id="tran_phase_draft_to_start" model="workflow.transition">
+            <field name="act_from" ref="act_phase_draft"/>
+            <field name="act_to" ref="act_phase_start"/>
+            <field name="signal">button_start</field>
+        </record>
+        <record id="tran_phase_start_to_confirm_control" model="workflow.transition">
+            <field name="act_from" ref="act_phase_start"/>
+            <field name="act_to" ref="act_phase_confirm"/>
+            <field name="role_id" ref="role_NPPI" />
+    		<field name="condition">test_control_request()</field>            
+            <field name="signal">button_confirm</field>
+        </record>
+        <record id="tran_phase_start_to_confirm_not_control" model="workflow.transition">
+            <field name="act_from" ref="act_phase_start"/>
+            <field name="act_to" ref="act_phase_confirm"/>
+    		<field name="condition">test_nocontrol_request()</field>            
+            <field name="signal">button_confirm</field>
+        </record>
+        
+        <record id="tran_phase_confirm_to_end" model="workflow.transition">
+            <field name="act_from" ref="act_phase_confirm"/>
+            <field name="act_to" ref="act_phase_end"/>
+            <field name="role_id" ref="role_NPPI" />
+            <field name="signal">button_end</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/document_change/document_process_workflow.xml b/addons/document_change/document_process_workflow.xml
new file mode 100644
index 00000000000..c59d96cd6f8
--- /dev/null
+++ b/addons/document_change/document_process_workflow.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="wkf_change_process" model="workflow">
+            <field name="name">document.change.process.basic</field>
+            <field name="osv">document.change.process</field>
+            <field name="on_create">True</field>
+        </record>
+        
+		<!-- States -->
+        <record id="act_process_draft" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_change_process"/>
+            <field name="flow_start">True</field>
+            <field name="name">draft</field>
+        </record>
+        <record id="act_process_in_progress" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_change_process"/>
+            <field name="name">in_progress</field>
+            <field name="action">do_start()</field>
+            <field name="kind">function</field>
+        </record>
+        <record id="act_process_pending" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_change_process"/>
+            <field name="name">pending</field>
+            <field name="action">do_pending()</field>
+            <field name="kind">function</field>
+        </record>
+        <record id="act_process_confirm" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_change_process"/>
+            <field name="name">to_validate</field>
+            <field name="action">do_confirm()</field>
+            <field name="kind">function</field>
+        </record>
+        <record id="act_process_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_change_process"/>
+            <field name="name">done</field>
+            <field name="action">do_done()</field>
+            <field name="kind">function</field>
+        </record>
+        
+		<!-- Transitions -->
+        <record id="tran_process_draft_to_progress" model="workflow.transition">
+            <field name="act_from" ref="act_process_draft"/>
+            <field name="act_to" ref="act_process_in_progress"/>
+            <field name="signal">button_start</field>
+        </record>
+        <record id="tran_process_progress_to_pending" model="workflow.transition">
+            <field name="act_from" ref="act_process_in_progress"/>
+            <field name="act_to" ref="act_process_pending"/>
+            <field name="signal">button_pending</field>
+        </record>
+        <record id="tran_process_pending_to_progress" model="workflow.transition">
+            <field name="act_from" ref="act_process_pending"/>
+            <field name="act_to" ref="act_process_in_progress"/>
+            <field name="signal">button_start</field>
+        </record>
+        <record id="tran_process_progress_to_confirm" model="workflow.transition">
+            <field name="act_from" ref="act_process_in_progress"/>
+            <field name="act_to" ref="act_process_confirm"/>
+            <field name="signal">button_confirm</field>
+        </record>
+        <record id="tran_process_confirm_to_end" model="workflow.transition">
+            <field name="act_from" ref="act_process_confirm"/>
+            <field name="act_to" ref="act_process_done"/>
+            <field name="signal">button_done</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/document_change/security/document_process_security.xml b/addons/document_change/security/document_process_security.xml
new file mode 100644
index 00000000000..a418d1a90cf
--- /dev/null
+++ b/addons/document_change/security/document_process_security.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+        <record model="res.roles" id="role_NPPI">
+            <field name="name">Document Change/ Phase Manager</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/document_ftp/__init__.py b/addons/document_ftp/__init__.py
index 80328b7dd90..45ec4a6b67f 100644
--- a/addons/document_ftp/__init__.py
+++ b/addons/document_ftp/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document_ftp/__terp__.py b/addons/document_ftp/__terp__.py
index 13da099768c..42561975463 100644
--- a/addons/document_ftp/__terp__.py
+++ b/addons/document_ftp/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document_ftp/doc_conf_wizard.py b/addons/document_ftp/doc_conf_wizard.py
index fe967e107d5..72011c39759 100644
--- a/addons/document_ftp/doc_conf_wizard.py
+++ b/addons/document_ftp/doc_conf_wizard.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -28,11 +28,14 @@ import urlparse
 import os
 
 class document_configuration_wizard(osv.osv_memory):
+
     _name='document.configuration.wizard'
-    _rec_name = 'Auto Directory configuration'
+    _description = 'Auto Directory configuration'
+    _inherit = 'res.config'
+    _rec_name = 'host'
     _columns = {
-        'host': fields.char('Server Address', size=64, help="Put here the server address or IP. " \
-            "Keep localhost if you don't know what to write.", required=True)
+        'host': fields.char('Address', size=64,
+                            help="Server address or IP.", required=True),
     }
 
     def detect_ip_addr(self, cr, uid, context=None):
@@ -73,16 +76,7 @@ class document_configuration_wizard(osv.osv_memory):
         'host': detect_ip_addr,
     }
 
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
-
-    def action_config(self, cr, uid, ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         conf = self.browse(cr, uid, ids[0], context)
         obj=self.pool.get('document.directory')
         objid=self.pool.get('ir.model.data')
@@ -152,12 +146,4 @@ class document_configuration_wizard(osv.osv_memory):
         aid = objid._get_id(cr, uid, 'document_ftp', 'action_document_browse')
         aid = objid.browse(cr, uid, aid, context=context).res_id
         self.pool.get('ir.actions.url').write(cr, uid, [aid], {'url': 'ftp://'+(conf.host or 'localhost')+':8021/'})
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-        }
 document_configuration_wizard()
diff --git a/addons/document_ftp/document_ftp_view.xml b/addons/document_ftp/document_ftp_view.xml
index 793dbfb7dea..135ed2ea151 100644
--- a/addons/document_ftp/document_ftp_view.xml
+++ b/addons/document_ftp/document_ftp_view.xml
@@ -1,36 +1,38 @@
 <openerp>
-<data>    
+  <data>    
     <record model="ir.actions.url" id="action_document_browse">
         <field name="name">Browse Files</field>
         <field name="url">ftp://localhost:8021/</field>
     </record>
     <menuitem
-        name="Browse Files Using FTP"
+        name="Shared Repository (FTP)"
         action="action_document_browse"
         id="menu_document_browse"
         type="url"
         icon="STOCK_EXECUTE"
-        parent="document.menu_document"/>
+        parent="document.menu_document_doc" sequence="1"/>
+
 
-    
-    
 
     <record id="view_auto_config_form" model="ir.ui.view">
         <field name="name">Auto Configure Directory</field>
         <field name="model">document.configuration.wizard</field>
         <field name="type">form</field>
+        <field name="inherit_id" ref="base.res_config_view_base"/>
         <field name="arch" type="xml">
-            <form string="Auto Configure">
-                <separator string="Document Management System." colspan="4"/>
-                <label string="This wizard will automatically configure the document management system according to modules installed on your system." align="0.0" colspan="4"/>
-                <field name="host" colspan="4"/>
-                <separator string="" colspan="4"/>
-                <label string="" colspan="2"/>
-                <group col="4" colspan="2">
-                    <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                    <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
-                </group>
-            </form>
+          <data>
+            <form position="attributes"><attribute name="string">
+              Auto Configure
+            </attribute></form>
+            <group string="res_config_contents" position="replace">
+                <separator string="FTP Server Configuration." colspan="4"/>
+                <label align="0.0" colspan="4"
+                       string="Choose the address and port for the Document
+                               Management System's FTP server."/>
+                <field name="host"/>
+            </group>
+            <xpath expr='//button[@name="action_skip"]' position="replace"/>
+          </data>
         </field>
     </record>
 
@@ -38,19 +40,15 @@
         <field name="name">Auto Configure Directory</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">document.configuration.wizard</field>
+        <field name="view_id" ref="view_auto_config_form"/>
         <field name="view_type">form</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
     </record>
 
     <record model="ir.actions.todo" id="config_auto_directory">
-        <field name="name">Auto Configure Directory</field>
-        <field name="note">This wizard will configure the URL of the server of the document management system.</field>
         <field name="action_id" ref="action_config_auto_directory"/>
     </record>
-
-        
-
-</data>
+  </data>
 </openerp>
 
diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index 3dc1f1b1202..056782e7c1a 100644
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document_ics/__init__.py b/addons/document_ics/__init__.py
index 4c5cacb0f74..386c25fc525 100644
--- a/addons/document_ics/__init__.py
+++ b/addons/document_ics/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document_ics/__terp__.py b/addons/document_ics/__terp__.py
index b7a042ea7c7..4f3326fe635 100644
--- a/addons/document_ics/__terp__.py
+++ b/addons/document_ics/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/document_ics/document_ics.py b/addons/document_ics/document_ics.py
index 69cd4179634..acda761b279 100644
--- a/addons/document_ics/document_ics.py
+++ b/addons/document_ics/document_ics.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -30,6 +30,7 @@ import random
 import tools
 import re
 
+from tools.translate import _
 from document.nodes import node_content
 
 from tools.safe_eval import safe_eval
diff --git a/addons/document_ics/document_ics_config_wizard.py b/addons/document_ics/document_ics_config_wizard.py
index 30b959e1c20..8c35b973c1c 100644
--- a/addons/document_ics/document_ics_config_wizard.py
+++ b/addons/document_ics/document_ics_config_wizard.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -50,6 +50,8 @@ ICS_TAGS = {
 
 class document_ics_crm_wizard(osv.osv_memory):
     _name='document.ics.crm.wizard'
+    _inherit = 'res.config'
+
     _columns = {
         'name':fields.char('Name', size=64),
         'meeting' : fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."),
@@ -69,7 +71,7 @@ class document_ics_crm_wizard(osv.osv_memory):
         'phonecall': lambda *args: True,
     }
 
-    def action_create(self, cr, uid, ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         data=self.read(cr, uid, ids, [])[0]
         dir_obj = self.pool.get('document.directory')
         dir_cont_obj = self.pool.get('document.directory.content')
@@ -79,16 +81,12 @@ class document_ics_crm_wizard(osv.osv_memory):
         else:
             dir_id = dir_obj.create(cr, uid, {'name': 'Calendars' ,'user_id' : uid, 'type': 'directory'})
         for section in ['meeting', 'lead', 'opportunity', 'jobs', 'bugs', 'fund', 'helpdesk', 'claims', 'phonecall']:
-            if (not data[section]):
-                continue
-            else:
+            if data[section]:
                 section_id=self.pool.get('crm.case.section').search(cr, uid, [('name', '=', SECTION_NAME[section])])
-                if not section_id:
-                    continue
-                else:
+                if section_id:
                     object_id=self.pool.get('ir.model').search(cr, uid, [('name', '=', 'Case')])[0]
 
-                    vals_cont={
+                    vals_cont = {
                           'name': SECTION_NAME[section],
                           'sequence': 1,
                           'directory_id': dir_id,
@@ -104,29 +102,12 @@ class document_ics_crm_wizard(osv.osv_memory):
                     ics_obj=self.pool.get('document.directory.ics.fields')
                     for tag in ['description', 'url', 'summary', 'dtstart', 'dtend', 'uid']:
                         field_id =  self.pool.get('ir.model.fields').search(cr, uid, [('model_id.name', '=', 'Case'), ('field_description', '=', ICS_TAGS[tag])])[0]
-                        vals_ics={
-                                'field_id':  field_id ,
-                                'name':  tag ,
-                                'content_id': content_id ,
-                                  }
+                        vals_ics = {
+                            'field_id':  field_id ,
+                            'name':  tag ,
+                            'content_id': content_id ,
+                            }
                         ics_obj.create(cr, uid, vals_ics)
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
-    def action_cancel(self, cr, uid, ids, conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
-
 document_ics_crm_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml
index 9c2132bc89d..2f25ccce5db 100644
--- a/addons/document_ics/document_ics_config_wizard.xml
+++ b/addons/document_ics/document_ics_config_wizard.xml
@@ -1,30 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
-	<record id="view_document_ics_config_directories" model="ir.ui.view">
+        <record id="view_document_ics_config_directories" model="ir.ui.view">
             <field name="name">Configure Calendars for Sections</field>
             <field name="model">document.ics.crm.wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Configure Calendars for CRM Sections">
-                    <separator colspan="4" string="Create Pre-Configured Calendars"/>
-                    <newline/>
-                    <field name="meeting"/>
-                    <field name="opportunity"/>
-                    <field name="phonecall"/>
-                    <field name="lead"/>
-                    <field name="claims"/>
-                    <field name="bugs"/>
-                    <field name="helpdesk"/>
-                    <field name="jobs"/>
-                    <field name="fund"/>
-                    <newline/>
-                    <group col="4" colspan="4">
-                        <button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-forward" name="action_create" string="Next" type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Configure Calendars for CRM Sections
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    OpenERP can create and pre-configure a series of integrated
+                    calendar for you."/>
+                  <separator string="Create Pre-Configured Calendars"
+                             colspan="4"/>
+                  <newline/>
+                  <field name="meeting"/>
+                  <field name="opportunity"/>
+                  <field name="phonecall"/>
+                  <field name="lead"/>
+                  <field name="claims"/>
+                  <field name="bugs"/>
+                  <field name="helpdesk"/>
+                  <field name="jobs"/>
+                  <field name="fund"/>
+                </group>
+                <xpath expr='//button[@name="action_skip"]'
+                       position='replace'/>
+              </data>
             </field>
         </record>
 
@@ -32,19 +38,16 @@
             <field name="name">Configure Calendars for Sections </field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">document.ics.crm.wizard</field>
+            <field name="view_id" ref="view_document_ics_config_directories"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
+
         <!-- register configuration wizard -->
         <record id="config_wizard_step_case_section_menu" model="ir.actions.todo">
-            <field name="name">Create Calendars for CRM Case Section</field>
-            <field name="note">This Configuration step use to create Calendars in document for all Case Sections</field>
             <field name="action_id" ref="action_view_document_ics_config_directories"/>
         </record>
-        
-        
-     </data>  
+     </data>
 </openerp>
-  
+
diff --git a/addons/event/__init__.py b/addons/event/__init__.py
index c082e601bb0..55915834aa9 100644
--- a/addons/event/__init__.py
+++ b/addons/event/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/event/__terp__.py b/addons/event/__terp__.py
index 91acc245be9..04285d4fd3c 100644
--- a/addons/event/__terp__.py
+++ b/addons/event/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/event/event.py b/addons/event/event.py
index d330a0cbec4..cad4d7f23d1 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -25,6 +25,7 @@ import netsvc
 import pooler
 import tools
 from tools.translate import _
+from crm import crm
 
 class crm_case_log(osv.osv):
     _inherit = 'crm.case.log'
@@ -241,6 +242,16 @@ class event_registration(osv.osv):
         "invoice_label":fields.char("Label Invoice",size=128,required=True),
         "tobe_invoiced":fields.boolean("To be Invoiced"),
         "invoice_id":fields.many2one("account.invoice","Invoice"),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
+        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),  
+        'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id)]"),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
+                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
+                                                                       "the partner mentality in relation to our services.The scale has" \
+                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
+                      
     }
     _defaults = {
         'nb_register': lambda *a: 1,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index e663f7b71ab..03110015779 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-
+		<menuitem name="Marketing" id="menu_marketing_event_main" icon="terp-calendar" />
+		<menuitem name="Events Organisation" id="menu_event_main" parent="menu_marketing_event_main" />
 	<!-- EVENTS  -->
-		<menuitem name="Events Organisation" id="menu_event_main" icon="terp-calendar" />
+		<!--<menuitem name="Events Organisation" id="menu_event_main" icon="terp-calendar" />-->
 
 	<!-- EVENTS/CONFIGURATION/TYPE OF EVENTS -->
 		<record model="ir.ui.view" id="view_event_type_form">
@@ -32,7 +33,7 @@
 			<field name="res_model">event.type</field>
 			<field name="view_type">form</field>
 		</record>
-		<menuitem name="Configuration" id="menu_event_config" parent="menu_event_main" />
+		<menuitem name="Configuration" id="menu_event_config" parent="menu_marketing_event_main" sequence="30"/>
 		<menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="menu_event_config"/>
 
 		<!-- The base section for all events -->
@@ -44,7 +45,7 @@
 			<field name="domain" eval="[('parent_id','=',False)]" />
 			<field name="view_type">tree</field>
 		</record>
-		<menuitem name="Events by Categories" id="menu_action_event_categories" action="action_event_categories" parent="menu_event_main"/>
+		<!--<menuitem name="Events by Categories" id="menu_action_event_categories" action="action_event_categories" parent="menu_event_main"/>-->
 
 
 	<!-- Events Organisation/CONFIGURATION/EVENTS  -->
@@ -337,8 +338,9 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,graph</field>
 		</record>
-		<menuitem name="Reporting" id="menu_report_event" parent="menu_event_main"/>
-		<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>
+		<menuitem name="Reporting" id="menu_report_event" parent="menu_marketing_event_main" sequence="20"/>
+		<!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
+		<menuitem parent="menu_event_main" action="action_event_registration" id="menu_report_event_registration" name="Registrations Per Event"/>
 	<!-- end... -->
 
 
diff --git a/addons/event/i18n/hi.po b/addons/event/i18n/hi.po
new file mode 100644
index 00000000000..2f9e59e9ab2
--- /dev/null
+++ b/addons/event/i18n/hi.po
@@ -0,0 +1,622 @@
+# Hindi 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-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-01-13 13:36+0000\n"
+"Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
+"Language-Team: Hindi <hi@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-01-14 04:49+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: event
+#: field:event.event,date_end:0
+#: field:report.event.registration,date_end:0
+msgid "Ending date"
+msgstr "समाप्त होने की तारीख"
+
+#. module: event
+#: field:event.event,register_min:0
+msgid "Minimum Registrations"
+msgstr ""
+
+#. module: event
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_registr:0
+msgid "Registration Email"
+msgstr "पंजीकरण ईमेल"
+
+#. module: event
+#: model:crm.case.section,name:event.event_0_crm_case_section
+msgid "Concert of Bon Jovi"
+msgstr "Bon jovi का समारोह"
+
+#. module: event
+#: field:event.event,mail_confirm:0
+msgid "Confirmation Email"
+msgstr ""
+
+#. module: event
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive sections."
+msgstr "त्रुटि! आप पुनरावर्ती वर्गों नहीं बना सकते."
+
+#. module: event
+#: model:ir.model,name:event.model_event_registration
+msgid "Event Registration"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.wizard,name:event.event_reg_invoice
+msgid "Make Invoice"
+msgstr ""
+
+#. module: event
+#: field:report.event.type.registration,draft_state:0
+msgid "Draft Registrations"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Event on Registration"
+msgstr ""
+
+#. module: event
+#: wizard_button:event.reg_make_invoice,init,end:0
+msgid "Ok"
+msgstr "ठीक"
+
+#. module: event
+#: field:event.event,mail_auto_confirm:0
+msgid "Mail Auto Confirm"
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_1_product_template
+msgid "Ticket for Opera"
+msgstr "ओपेरा के लिए टिकट"
+
+#. module: event
+#: wizard_field:event.reg_make_invoice,init,inv_rejected:0
+msgid "Invoice Rejected"
+msgstr "चालान अस्वीकृत"
+
+#. module: event
+#: view:event.event:0
+msgid "Confirm Event"
+msgstr ""
+
+#. module: event
+#: model:crm.case.section,name:event.event_1_crm_case_section
+msgid "Opera of Verdi"
+msgstr "Verdi के ओपेरा"
+
+#. module: event
+#: field:report.event.registration,draft_state:0
+msgid "Draft Registration"
+msgstr ""
+
+#. module: event
+#: wizard_view:event.reg_make_invoice,init:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: event
+#: model:ir.module.module,description:event.module_meta_information
+msgid ""
+"Organization and management of events.\n"
+"\n"
+"    This module allow you\n"
+"        * to manage your events and their registrations\n"
+"        * to use emails to automatically confirm and send acknowledgements "
+"for any registration to an event\n"
+"        * ...\n"
+"\n"
+"    Note that:\n"
+"    - You can define new types of events in\n"
+"                Events / Configuration / Types of Events\n"
+"    - You can access predefined reports about number of registration per "
+"event or per event category in :\n"
+"                Events / Reporting\n"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Extra Info"
+msgstr "अतिरिक्त जानकारी"
+
+#. module: event
+#: view:event.registration:0
+msgid "Registration"
+msgstr "पंजीकरण"
+
+#. module: event
+#: field:event.type,name:0
+#: model:ir.model,name:event.model_event_type
+msgid "Event type"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: model:ir.model,name:event.model_event_event
+#: model:ir.module.module,shortdesc:event.module_meta_information
+#: field:report.event.registration,name:0
+msgid "Event"
+msgstr ""
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: event
+#: wizard_view:event.confirm_registration,split:0
+msgid "Registration Confirmation"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Dates"
+msgstr "दिनांक"
+
+#. module: event
+#: field:event.event,register_current:0
+#: model:ir.actions.act_window,name:event.action_registration_confirm
+#: model:ir.ui.menu,name:event.menu_action_registration_confirm
+msgid "Confirmed Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.event,mail_auto_registr:0
+msgid "Mail Auto Register"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Badge"
+msgstr ""
+
+#. module: event
+#: field:event.event,section_id:0
+msgid "Case section"
+msgstr ""
+
+#. module: event
+#: field:event.registration,tobe_invoiced:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_event
+msgid "All Events"
+msgstr ""
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_report_event
+msgid "Reporting"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Cancel Registration"
+msgstr ""
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_action_event_categories
+msgid "Events by Categories"
+msgstr ""
+
+#. module: event
+#: wizard_view:event.confirm_registration,split:0
+msgid "The event limit is reached. What do you want to do?"
+msgstr ""
+
+#. module: event
+#: field:report.event.type.registration,confirm_state:0
+msgid "Confirm Registrations"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "References"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_type_registration
+#: model:ir.ui.menu,name:event.menu_report_event_type_registration
+#: view:report.event.type.registration:0
+msgid "Registration By Event Types"
+msgstr ""
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_config
+msgid "Configuration"
+msgstr ""
+
+#. module: event
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: event
+#: wizard_button:event.confirm_registration,split,confirm:0
+msgid "Confirm Anyway"
+msgstr ""
+
+#. module: event
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Parent Category"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Registration Invoiced"
+msgstr ""
+
+#. module: event
+#: field:report.event.type.registration,nbevent:0
+msgid "Number Of Events"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Cancel Event"
+msgstr ""
+
+#. module: event
+#: wizard_field:event.reg_make_invoice,init,inv_rej_reason:0
+msgid "Error Messages"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Mailing"
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_0_product_template
+msgid "Ticket for Concert"
+msgstr ""
+
+#. module: event
+#: field:event.event,register_prospect:0
+#: model:ir.actions.act_window,name:event.action_registration_draft
+#: model:ir.ui.menu,name:event.menu_action_registration_draft
+msgid "Unconfirmed Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.registration,partner_invoice_id:0
+msgid "Partner Invoiced"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Communication history"
+msgstr ""
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Canceled"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Event Done"
+msgstr ""
+
+#. module: event
+#: field:event.registration,badge_name:0
+msgid "Badge Name"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_registration
+#: model:ir.ui.menu,name:event.menu_report_event_registration
+msgid "Events On Registrations"
+msgstr ""
+
+#. module: event
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: event
+#: wizard_field:event.reg_make_invoice,init,inv_created:0
+msgid "Invoice Created"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Statistics"
+msgstr ""
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Event description"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_report_event_type_registration
+msgid "Event type on registration"
+msgstr ""
+
+#. module: event
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: event
+#: field:event.registration,event_id:0
+msgid "Event Related"
+msgstr ""
+
+#. module: event
+#: model:crm.case.section,name:event.case_section_event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_event_view
+msgid "Events"
+msgstr ""
+
+#. module: event
+#: field:event.registration,nb_register:0
+msgid "Number of Registration"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,state:0
+#: view:event.registration:0
+msgid "Status"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_categories
+msgid "Events by section"
+msgstr ""
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_action_registration
+msgid "All Registrations"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_auto_registr:0
+msgid ""
+"Check this box if you want to use the automatic mailing for new registration"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Set To Draft"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: model:ir.actions.wizard,name:event.event_confirm_registration
+#: field:report.event.registration,confirm_state:0
+msgid "Confirm Registration"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "History"
+msgstr ""
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_type
+msgid "Types of Events"
+msgstr ""
+
+#. module: event
+#: field:event.registration,contact_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Confirmation Email"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "General"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Send Reminder"
+msgstr ""
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Done"
+msgstr "हो गया"
+
+#. module: event
+#: field:event.event,date_begin:0
+#: field:report.event.registration,date_begin:0
+msgid "Beginning date"
+msgstr "तिथि की शुरुआत"
+
+#. module: event
+#: field:event.registration,invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_report_event_registration
+msgid "Events on registrations"
+msgstr ""
+
+#. module: event
+#: wizard_button:event.confirm_registration,split,end:0
+msgid "Cancel"
+msgstr "रद्द"
+
+#. module: event
+#: wizard_button:event.reg_make_invoice,init,open:0
+msgid "Open"
+msgstr "खोलो"
+
+#. module: event
+#: field:event.registration,badge_title:0
+msgid "Badge Title"
+msgstr "बिल्ला शीर्षक"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_new_event_form
+#: model:ir.ui.menu,name:event.menu_event_new_event
+msgid "New event"
+msgstr ""
+
+#. module: event
+#: field:event.registration,unit_price:0
+msgid "Unit Price"
+msgstr "यूनिट मूल्य"
+
+#. module: event
+#: model:crm.case.section,name:event.event_2_crm_case_section
+msgid "Conference on ERP Buisness"
+msgstr "ईआरपी व्यापार पर सम्मेलन"
+
+#. module: event
+#: field:event.registration,badge_partner:0
+msgid "Badge Partner"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_view_confirm
+#: model:ir.ui.menu,name:event.menu_event_event_confirm
+msgid "Confirmed Events"
+msgstr ""
+
+#. module: event
+#: field:event.event,register_max:0
+#: field:report.event.registration,register_max:0
+msgid "Maximum Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.event,type:0
+msgid "Type"
+msgstr "प्रकार"
+
+#. module: event
+#: help:event.event,mail_registr:0
+msgid "This email will be sent when someone subscribes to the event."
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_2_product_template
+msgid "Ticket for Conference"
+msgstr ""
+
+#. module: event
+#: field:event.registration,case_id:0
+msgid "Case"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Name"
+msgstr "नाम"
+
+#. module: event
+#: help:event.event,mail_auto_confirm:0
+msgid ""
+"Check this box if you want ot use the automatic confirmation emailing or the "
+"reminder"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_confirm:0
+msgid ""
+"This email will be sent when the event gets confimed or when someone "
+"subscribes to a confirmed event. This is also the email sent to remind "
+"someone about the event."
+msgstr ""
+
+#. module: event
+#: field:event.event,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: event
+#: field:event.registration,invoice_label:0
+msgid "Label Invoice"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Payments"
+msgstr "भुगतान"
+
+#. module: event
+#: view:event.type:0
+#: field:report.event.type.registration,name:0
+msgid "Event Type"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_registration
+#: model:ir.actions.wizard,name:event.wizard_event_registration
+msgid "Registrations"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_view_draft
+#: model:ir.ui.menu,name:event.menu_event_event_draft
+msgid "Draft Events"
+msgstr ""
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_main
+msgid "Events Organisation"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Actions"
+msgstr "क्रियाएं"
+
+#. module: event
+#: model:ir.actions.wizard,name:event.wizard_event_reg_partners
+msgid "List Register Partners"
+msgstr ""
+
+#. module: event
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Registration Email"
+msgstr ""
diff --git a/addons/event/i18n/it.po b/addons/event/i18n/it.po
index 9718af40827..8513aaeea7d 100644
--- a/addons/event/i18n/it.po
+++ b/addons/event/i18n/it.po
@@ -7,95 +7,95 @@ 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:39+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-22 15:14+0000\n"
+"Last-Translator: Carlo <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: 2009-12-16 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-01-23 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:report.event.registration,date_end:0
 msgid "Ending date"
-msgstr ""
+msgstr "Data di Fine"
 
 #. module: event
 #: field:event.event,register_min:0
 msgid "Minimum Registrations"
-msgstr ""
+msgstr "Registrazioni Minime"
 
 #. module: event
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modulo non valido nella definizione dell'azione."
 
 #. module: event
 #: field:event.event,mail_registr:0
 msgid "Registration Email"
-msgstr ""
+msgstr "Email di registrazione"
 
 #. module: event
 #: model:crm.case.section,name:event.event_0_crm_case_section
 msgid "Concert of Bon Jovi"
-msgstr ""
+msgstr "Concerto di Bon Jovi"
 
 #. module: event
 #: field:event.event,mail_confirm:0
 msgid "Confirmation Email"
-msgstr ""
+msgstr "Email di conferma"
 
 #. module: event
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Errore! Non è possibile creare sezioni ricorsive."
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration
 msgid "Event Registration"
-msgstr ""
+msgstr "Registrazione Evento"
 
 #. module: event
 #: model:ir.actions.wizard,name:event.event_reg_invoice
 msgid "Make Invoice"
-msgstr ""
+msgstr "Crea Fattura"
 
 #. module: event
 #: field:report.event.type.registration,draft_state:0
 msgid "Draft Registrations"
-msgstr ""
+msgstr "Bozza Registrazione"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr ""
+msgstr "Evento su Registrazione"
 
 #. module: event
 #: wizard_button:event.reg_make_invoice,init,end:0
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
 msgid "Mail Auto Confirm"
-msgstr ""
+msgstr "Mail di Auto Conferma"
 
 #. module: event
 #: model:product.template,name:event.event_product_1_product_template
 msgid "Ticket for Opera"
-msgstr ""
+msgstr "Biglietti per l'Opera"
 
 #. module: event
 #: wizard_field:event.reg_make_invoice,init,inv_rejected:0
 msgid "Invoice Rejected"
-msgstr ""
+msgstr "Fattura Rifiutata"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirm Event"
-msgstr ""
+msgstr "Conferma Evento"
 
 #. module: event
 #: model:crm.case.section,name:event.event_1_crm_case_section
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index df46ab50f51..9170cade0f5 100644
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/event/wizard/confirm_registration.py b/addons/event/wizard/confirm_registration.py
index 9a32e76a842..3c0cdac180d 100644
--- a/addons/event/wizard/confirm_registration.py
+++ b/addons/event/wizard/confirm_registration.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/event/wizard/event_registration.py b/addons/event/wizard/event_registration.py
index b9efdb5df6d..40d2196b004 100644
--- a/addons/event/wizard/event_registration.py
+++ b/addons/event/wizard/event_registration.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/event/wizard/event_registrations_partner.py b/addons/event/wizard/event_registrations_partner.py
index fafa227ea61..199973d5677 100644
--- a/addons/event/wizard/event_registrations_partner.py
+++ b/addons/event/wizard/event_registrations_partner.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/event/wizard/make_invoice.py b/addons/event/wizard/make_invoice.py
index d67e431d851..7df7fc2b6f0 100644
--- a/addons/event/wizard/make_invoice.py
+++ b/addons/event/wizard/make_invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/event_project/__init__.py b/addons/event_project/__init__.py
index d1dcbf017de..c629a522a8b 100644
--- a/addons/event_project/__init__.py
+++ b/addons/event_project/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/event_project/__terp__.py b/addons/event_project/__terp__.py
index 8d73d8716b2..51be1e29113 100644
--- a/addons/event_project/__terp__.py
+++ b/addons/event_project/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/event_project/event.py b/addons/event_project/event.py
index 055253ef3ec..3bc12572867 100644
--- a/addons/event_project/event.py
+++ b/addons/event_project/event.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/event_project/i18n/hi.po b/addons/event_project/i18n/hi.po
new file mode 100644
index 00000000000..5c600ad6e03
--- /dev/null
+++ b/addons/event_project/i18n/hi.po
@@ -0,0 +1,87 @@
+# Hindi 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-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-01-15 13:24+0000\n"
+"Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
+"Language-Team: Hindi <hi@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-01-16 04:35+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: event_project
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: event_project
+#: model:ir.actions.wizard,name:event_project.wizard_event_task
+msgid "Tasks"
+msgstr "कार्य"
+
+#. module: event_project
+#: wizard_button:event.project,init,done:0
+msgid "Ok"
+msgstr "ठीक"
+
+#. module: event_project
+#: model:ir.module.module,description:event_project.module_meta_information
+msgid ""
+"Organization and management of events.\n"
+"\n"
+"    This module allow you to create retro planning for managing your "
+"events.\n"
+msgstr ""
+"संगठन और घटनाओं का प्रबंधन\n"
+"इस मॉड्यूल से आप अपने घटनाओं के प्रबंधन के लिए रेट्रो की योजना बना सकते "
+"हैं.\n"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Remaining Tasks"
+msgstr "शेष कार्य"
+
+#. module: event_project
+#: model:ir.module.module,shortdesc:event_project.module_meta_information
+msgid "Event - Project"
+msgstr "घटना - परियोजना"
+
+#. module: event_project
+#: field:event.event,project_id:0
+#: wizard_field:event.project,init,project_id:0
+#: model:ir.actions.wizard,name:event_project.event_wiz
+msgid "Project"
+msgstr "परियोजना"
+
+#. module: event_project
+#: field:event.event,task_ids:0
+msgid "Project tasks"
+msgstr "परियोजना के कार्य"
+
+#. module: event_project
+#: wizard_button:event.project,init,end:0
+msgid "Cancel"
+msgstr "रद्द"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Create Retro-Planning"
+msgstr "रेट्रो योजना बनाएँ"
+
+#. module: event_project
+#: wizard_view:event.project,init:0
+msgid "Event"
+msgstr "Event"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Tasks management"
+msgstr "कार्य प्रबंधन"
diff --git a/addons/event_project/wizard/__init__.py b/addons/event_project/wizard/__init__.py
index dbb276bdec2..a6ed912e137 100644
--- a/addons/event_project/wizard/__init__.py
+++ b/addons/event_project/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/event_project/wizard/event_task.py b/addons/event_project/wizard/event_task.py
index 1f687b8cc34..bdf2651e6a4 100644
--- a/addons/event_project/wizard/event_task.py
+++ b/addons/event_project/wizard/event_task.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/event_project/wizard/project_wizard.py b/addons/event_project/wizard/project_wizard.py
index 970a48e0af0..334c56c1c9f 100644
--- a/addons/event_project/wizard/project_wizard.py
+++ b/addons/event_project/wizard/project_wizard.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/google_map/__init__.py b/addons/google_map/__init__.py
index 91329aca3cb..aa250662a11 100644
--- a/addons/google_map/__init__.py
+++ b/addons/google_map/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/google_map/__terp__.py b/addons/google_map/__terp__.py
index 44b4cebb8c1..53a90e65fb5 100644
--- a/addons/google_map/__terp__.py
+++ b/addons/google_map/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/google_map/google_map.py b/addons/google_map/google_map.py
index 827ffd57ba0..2e4b37653ea 100644
--- a/addons/google_map/google_map.py
+++ b/addons/google_map/google_map.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/google_map/wizard/__init__.py b/addons/google_map/wizard/__init__.py
index a38e0c81cff..d276c1debeb 100644
--- a/addons/google_map/wizard/__init__.py
+++ b/addons/google_map/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/google_map/wizard/google_map_launch.py b/addons/google_map/wizard/google_map_launch.py
index e18f81e11d1..12ab32fbf54 100644
--- a/addons/google_map/wizard/google_map_launch.py
+++ b/addons/google_map/wizard/google_map_launch.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr/__init__.py b/addons/hr/__init__.py
index fb89900b095..2551ce843d1 100644
--- a/addons/hr/__init__.py
+++ b/addons/hr/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import hr
+import installer
 import hr_department
 
 import report
diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py
index cbc91de520e..f78bdc4ef18 100644
--- a/addons/hr/__terp__.py
+++ b/addons/hr/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -39,13 +39,14 @@
     'depends': ['base', 'process', 'resource'],
     'init_xml': [],
     'update_xml': [
-        #'security/hr_security.xml',
-        #'security/ir.model.access.csv',
+        'security/hr_security.xml',
+        'security/ir.model.access.csv',
         'hr_view.xml',
         'hr_department_view.xml',
-        'process/hr_process.xml'
+        'process/hr_process.xml',
+        'hr_installer.xml'
     ],
-    'demo_xml': [#'hr_demo.xml', 
+    'demo_xml': ['hr_demo.xml', 
         'hr_department_demo.xml'],
     'installable': True,
     'active': False,
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 4d77cf715b8..a49bad405dc 100755
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -67,8 +67,8 @@ class hr_employee(osv.osv):
 
         'address_id': fields.many2one('res.partner.address', 'Working Address'),
         'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
-        'work_phone': fields.char('Work Phone', size=32),
-        'work_email': fields.char('Work Email', size=128),
+        'work_phone': fields.related('address_id', 'phone', type='char', string='Work Phone'),
+        'work_email': fields.related('address_id', 'email', type='char', string='Work E-mail'),
         'work_location': fields.char('Office Location', size=32),
 
         'notes': fields.text('Notes'),
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 907bc55a435..83c1f7101fd 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -97,7 +97,7 @@ class res_users(osv.osv):
             result[user_id] = parent_ids
         return result
 
-    def _parent_search(self, cr, uid, obj, name, args):
+    def _parent_search(self, cr, uid, obj, name, args, context):
         parent = []
         for arg in args:
             if arg[0] == 'parent_id':
@@ -132,7 +132,7 @@ class res_users(osv.osv):
             result[manager_id] = child_ids
         return result
 
-    def _child_search(self, cr, uid, obj, name, args):
+    def _child_search(self, cr, uid, obj, name, args, context):
         parent = []
         for arg in args:
             if arg[0] == 'child_ids':
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 6c2c6408afe..a8e05a92fab 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -47,10 +47,7 @@
             <field name="view_type">tree</field>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem 
-            action="open_module_tree_department_tree" 
-            id="menu_department_tree" 
-            parent="hr.menu_hr_employee"/>
+       <menuitem action="open_module_tree_department_tree" id="menu_department_tree" parent="base.menu_users"/>
 
         <record id="open_module_tree_department" model="ir.actions.act_window">
             <field name="name">Departments</field>
@@ -58,11 +55,8 @@
             <field name="view_type">form</field>
         </record>
 
-        <menuitem
-            action="open_module_tree_department" 
-            id="menu_department_def" 
-            parent="hr.menu_hr_employee"/>
-
+        <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
+       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_human_resources"/>
         <!-- res.users inherit -->
         <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
new file mode 100644
index 00000000000..4f7c1993963
--- /dev/null
+++ b/addons/hr/hr_installer.xml
@@ -0,0 +1,65 @@
+<openerp>
+  <data>
+    <record id="view_hr_installer" model="ir.ui.view">
+      <field name="name">hr.installer.view</field>
+      <field name="model">hr.installer</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="arch" type="xml">
+        <data>
+          <form position="attributes"><attribute name="string">
+              Human Resources Modules Installation
+          </attribute></form>
+
+          <group string="res_config_contents" position="replace">
+            <separator string="Configure Human Resources" colspan="4"/>
+            <image name="gtk-dialog-info"/>
+            <newline/>
+            <label align="0.0" string=" Lorem ipsum dolor
+                sit amet, consectetur adipiscing elit. Cras metus
+                augue, ultricies et vehicula id, fringilla quis
+                mauris. Vestibulum fringilla ipsum sit amet est
+                adipiscing eget euismod velit semper. Proin non mauris
+                velit. Donec malesuada nisi sed augue viverra commodo
+                sagittis nisi rutrum. Cras vitae libero nunc, a
+                molestie sapien. Proin et augue sit amet est egestas
+                fermentum ut eu lacus. Etiam nisi orci, volutpat
+                aliquam viverra interdum, vehicula iaculis
+                lectus. Mauris ligula sapien, auctor in pharetra non,
+                ultrices quis odio."/>
+            <group>
+              <separator string="Human Resources Management" colspan="4"/>
+              <field name="hr_holidays"/>
+              <field name="hr_expense"/>
+              <field name="hr_jobs"/>
+              <field name="hr_timesheet_sheet"/>
+              <field name="hr_contract"/>
+              <field name="hr_evaluation"/>
+              <field name="hr_attendance"/>
+            </group>
+          </group>
+
+          <xpath expr='//button[@name="action_skip"]' position='replace'/>
+          <xpath expr='//button[@name="action_next"]' position='attributes'>
+            <attribute name='string'>Install Modules</attribute>
+          </xpath>
+        </data>
+      </field>
+    </record>
+
+    <record id="action_hr_installer" model="ir.actions.act_window">
+      <field name="name">Human Resources Modules Installation</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">hr.installer</field>
+      <field name="view_id" ref="view_hr_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="hr_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_hr_installer"/>
+      <field name="sequence">1</field>
+    </record>
+  </data>
+</openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 45d55d8b785..b93e7f658cd 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -1,30 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem
-            icon="terp-hr"
-            id="menu_hr_root"
-            name="Human Resources"/>
-        <menuitem
+        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources"/>
+        <menuitem id="menu_hr_human_resources" sequence="1" name="Human Resources" parent="menu_hr_root"/>
+      <!--  <menuitem
             id="menu_hr_reporting"
             name="Reporting"
             parent="hr.menu_hr_root"
-            sequence="40" />
+            sequence="40" /> -->
         <menuitem
             id="menu_hr_configuration"
             name="Configuration"
             parent="hr.menu_hr_root"
-            sequence="50"/>
-        <menuitem
-            id="menu_hr_employee"
-            sequence="1"
-            name="Human Resources"
-            parent="hr.menu_hr_root"/>
-        <menuitem
+            sequence="50" />
+<!--   <menuitem
             id="menu_hr_time"
             name="Time Tracking"
             parent="hr.menu_hr_root"/>
-
+ -->
+      <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_configuration" name="Employees" sequence="1"/>
         <!--
         ==========
         Employee
@@ -113,11 +107,33 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="False"/>
         </record>
-        <menuitem
+      <!--  <menuitem
             id="menu_open_view_employee_list"
             name="Employees"
             action="open_view_employee_list"
-            parent="hr.menu_hr_root"/>
+            groups="group_hr_manager"
+            parent="menu_hr_human_resources"/>
+        <menuitem
+            action="open_view_employee_tree"
+            id="menu_open_view_employee_tree"
+            parent="menu_open_view_employee_list"/>-->
+
+       <record id="open_view_employee_list_my" model="ir.actions.act_window">
+            <field name="name">All Employees</field>
+            <field name="res_model">hr.employee</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[]</field>
+        </record>
+        <!--<menuitem
+            action="open_view_employee_list_my"
+            id="menu_open_view_employee_list_my"
+            parent="menu_open_view_employee_list"/>-->
+        <menuitem
+        	name="Employees"
+            action="open_view_employee_list_my"
+            id="menu_open_view_employee_list_my"
+            parent="menu_hr_human_resources"/>
 
         <!--
         =======================
@@ -203,16 +219,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem
-            id="menu_hr_configuration_employee"
-            name="Configuration"
-            parent="hr.menu_hr_employee"/>
-
-        <menuitem
-            action="open_view_categ_form"
-            id="menu_view_employee_category_form"
-            parent="hr.menu_hr_configuration_employee"/>
-
+        <menuitem action="open_view_categ_form" id="menu_view_employee_category_form" parent="menu_view_employee_category_configuration_form" sequence="1"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
@@ -239,5 +246,8 @@
             <field eval="'ir.actions.act_window,%d'%hr_employee_normal_action_tree" name="value"/>
             <field eval="True" name="object"/>
         </record>
+
+        <menuitem action="open_view_categ_tree" id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
+
     </data>
 </openerp>
diff --git a/addons/hr/i18n/hi.po b/addons/hr/i18n/hi.po
new file mode 100644
index 00000000000..6ed0a59a14d
--- /dev/null
+++ b/addons/hr/i18n/hi.po
@@ -0,0 +1,493 @@
+# Hindi 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-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-01-15 13:30+0000\n"
+"Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
+"Language-Team: Hindi <hi@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-01-16 04:35+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_openerpuser0
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Openerp user"
+msgstr "Openerp उपयोगकर्ता"
+
+#. 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 "कार्य समय श्रेणियाँ"
+
+#. module: hr
+#: constraint:hr.department:0
+msgid "Error! You can not create recursive departments."
+msgstr "त्रुटि! आप पुनरावर्ती विभागों नहीं बना सकते."
+
+#. module: hr
+#: field:hr.employee,sinid:0
+msgid "SIN No"
+msgstr "SIN नंबर"
+
+#. module: hr
+#: model:ir.module.module,shortdesc:hr.module_meta_information
+#: model:ir.ui.menu,name:hr.menu_hr_root
+msgid "Human Resources"
+msgstr "मानव संसाधन"
+
+#. module: hr
+#: selection:hr.timesheet,dayofweek:0
+msgid "Sunday"
+msgstr "रविवार"
+
+#. module: hr
+#: view:res.users:0
+msgid "Parents"
+msgstr "पैरेन्ट्स"
+
+#. module: hr
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+msgid "Department"
+msgstr "विभाग"
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Contact  of employee"
+msgstr "कर्मचारी के संपर्क"
+
+#. module: hr
+#: field:hr.employee,work_email:0
+msgid "Work Email"
+msgstr "कार्यालय ई-मेल"
+
+#. module: hr
+#: field:hr.timesheet.group,name:0
+msgid "Group name"
+msgstr "समूह का नाम"
+
+#. module: hr
+#: field:hr.department,company_id:0
+#: field:hr.employee,company_id:0
+msgid "Company"
+msgstr "संस्था"
+
+#. module: hr
+#: selection:hr.timesheet,dayofweek:0
+msgid "Friday"
+msgstr "शुक्रवार"
+
+#. module: hr
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr "टिप्पणियाँ"
+
+#. module: hr
+#: field:hr.timesheet,hour_from:0
+msgid "Work from"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action2
+msgid "Employee Hierarchy"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr "कॉन्फ़िगरेशन"
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Unmaried"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Female"
+msgstr "स्त्री"
+
+#. module: hr
+#: view:hr.timesheet.group:0
+msgid "Working Time Category"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Social IDs"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_phone:0
+msgid "Work Phone"
+msgstr "काम का दूरभाष"
+
+#. module: hr
+#: field:hr.employee.category,child_ids:0
+msgid "Child Categories"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_location:0
+msgid "Office Location"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,name:0
+#: model:ir.model,name:hr.model_hr_employee
+#: model:process.node,name:hr.process_node_employee0
+msgid "Employee"
+msgstr ""
+
+#. module: hr
+#: field:hr.timesheet.group,manager:0
+msgid "Workgroup manager"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,member_ids:0
+msgid "Members"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr ""
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid "Fill up contact information"
+msgstr ""
+
+#. module: hr
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Divorced"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee.category,parent_id:0
+msgid "Parent Category"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_module_tree_department
+#: model:ir.actions.act_window,name:hr.open_module_tree_department_tree
+#: model:ir.ui.menu,name:hr.menu_department_def
+#: model:ir.ui.menu,name:hr.menu_department_tree
+msgid "Departments"
+msgstr ""
+
+#. module: hr
+#: model:process.node,name:hr.process_node_employeecontact0
+msgid "Employee Contact"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Maried"
+msgstr ""
+
+#. module: hr
+#: field:hr.timesheet,tgroup_id:0
+msgid "Employee's timesheet group"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Male"
+msgstr ""
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid "Create openerp user"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.category:0
+#: model:ir.model,name:hr.model_hr_employee_category
+msgid "Employee Category"
+msgstr ""
+
+#. module: hr
+#: selection:hr.timesheet,dayofweek:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_department
+msgid "hr.department"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,user_id:0
+msgid "Related User"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,category_id:0
+#: field:hr.employee.category,name:0
+msgid "Category"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,note:0
+msgid "Note"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Contact Information"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Status"
+msgstr ""
+
+#. module: hr
+#: selection:hr.timesheet,dayofweek:0
+msgid "Monday"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_tree
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
+msgid "Categories structure"
+msgstr ""
+
+#. module: hr
+#: field:hr.timesheet,dayofweek:0
+msgid "Day of week"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Birthday"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract Process"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Create OpenERP User"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee Complete Form"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr
+#: selection:hr.timesheet,dayofweek:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Categories of Employee"
+msgstr ""
+
+#. module: hr
+#: field:hr.timesheet,date_from:0
+msgid "Starting date"
+msgstr ""
+
+#. module: hr
+#: field:res.users,parent_id:0
+msgid "Parent Users"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,marital:0
+msgid "Marital Status"
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Personal Information"
+msgstr ""
+
+#. module: hr
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr
+#: selection:hr.timesheet,dayofweek:0
+msgid "Thursday"
+msgstr ""
+
+#. module: hr
+#: field:hr.timesheet,hour_to:0
+msgid "Work to"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Other"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.category:0
+msgid "Employees Categories"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,address_home_id:0
+msgid "Home Address"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+msgid "department"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,country_id:0
+msgid "Nationality"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,otherid:0
+msgid "Other ID"
+msgstr ""
+
+#. module: hr
+#: field:hr.timesheet,name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,gender:0
+msgid "Gender"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr
+#: field:hr.department,name:0
+msgid "Department Name"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,child_ids:0
+msgid "Child Departments"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Job Information"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Fill up employee's contact information"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,manager_id:0
+#: field:hr.employee,parent_id:0
+msgid "Manager"
+msgstr ""
+
+#. 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 ""
+
+#. module: hr
+#: selection:hr.timesheet,dayofweek:0
+msgid "Saturday"
+msgstr ""
+
+#. 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 ""
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
new file mode 100644
index 00000000000..69346199ddb
--- /dev/null
+++ b/addons/hr/installer.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+
+class hr_installer(osv.osv_memory):
+    _name = 'hr.installer'
+    _inherit = 'res.config.installer'
+
+    _columns = {
+        # Human Resources Management
+        'hr_holidays':fields.boolean('Holidays / Leaves Management'),
+        'hr_expense':fields.boolean('Expenses'),
+        'hr_jobs':fields.boolean('Recruitement Process'),
+        'hr_timesheet_sheet':fields.boolean('Timesheets'),
+        'hr_contract':fields.boolean("Employee's Contracts"),
+        'hr_evaluation':fields.boolean('Periodic Evaluations'),
+        'hr_attendance':fields.boolean('Attendances (Sign In/Out)'),
+        }
+    _defaults = {
+        'hr_holidays': True,
+        'hr_expense': True,
+        }
+hr_installer()
diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml
index 8910f767132..5376936afe3 100755
--- a/addons/hr/process/hr_process.xml
+++ b/addons/hr/process/hr_process.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!--
 			Process
 		-->
-    
+
 		<record id="process_process_employeecontractprocess0" model="process.process">
 			<field eval="1" name="active"/>
 			<field name="model_id" ref="hr.model_hr_employee"/>
 			<field eval="&quot;&quot;&quot;Employee Contract&quot;&quot;&quot;" name="name"/>
 		</record>
-		
+
 		<!--
 			Process Node
 		-->
-	
+
 		<record id="process_node_employee0" model="process.node">
-			<field name="menu_id" ref="hr.menu_open_view_employee_list"/>
+			<field name="menu_id" ref="hr.menu_open_view_employee_list_my"/>
 			<field name="model_id" ref="hr.model_hr_employee"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Employee&quot;&quot;&quot;" name="name"/>
@@ -25,9 +25,9 @@
 			<field name="process_id" ref="process_process_employeecontractprocess0"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_employeecontact0" model="process.node">
-			<field name="menu_id" ref="hr.menu_open_view_employee_list"/>
+			<field name="menu_id" ref="hr.menu_open_view_employee_list_my"/>
 			<field name="model_id" ref="hr.model_hr_employee"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Employee Contact&quot;&quot;&quot;" name="name"/>
@@ -35,7 +35,7 @@
 			<field name="process_id" ref="process_process_employeecontractprocess0"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_openerpuser0" model="process.node">
 			<field name="menu_id" ref="base.menu_users"/>
 			<field name="model_id" ref="base.model_res_users"/>
@@ -45,11 +45,11 @@
 			<field name="process_id" ref="process_process_employeecontractprocess0"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<!--
 			Process Transition
 		-->
-		
+
 		<record id="process_transition_employeeuser0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -58,7 +58,7 @@
 			<field model="process.node" name="target_node_id" ref="process_node_openerpuser0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_employee0"/>
 		</record>
-		
+
 		<record id="process_transition_contactofemployee0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -67,6 +67,6 @@
 			<field model="process.node" name="target_node_id" ref="process_node_employeecontact0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_employee0"/>
 		</record>
-		
+
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 67afac38c0a..676a1c36eba 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,10 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_timesheet_group","resource.calendar","model_resource_calendar","hr.group_hr_user",1,0,0,0
 "access_hr_employee_category","hr.employee.category","model_hr_employee_category","hr.group_hr_user",1,0,0,0
 "access_hr_employee","hr.employee","model_hr_employee","hr.group_hr_user",1,1,1,1
-"access_hr_timesheet_manager","hr.timesheet manager","model_hr_timesheet","hr.group_hr_manager",1,1,1,1
-"access_hr_timesheet","hr.timesheet","model_hr_timesheet","hr.group_hr_user",1,1,1,1
 "access_hr_department","hr.department","model_hr_department","hr.group_hr_user",1,0,0,0
-"access_hr_timesheet_group_manager","hr.timesheet.group.manager","model_hr_timesheet_group","hr.group_hr_manager",1,1,1,1
 "access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","hr.group_hr_manager",1,1,1,1
 "access_hr_department_manager","hr.department.manager","model_hr_department","hr.group_hr_manager",1,1,1,1
diff --git a/addons/hr_attendance/__init__.py b/addons/hr_attendance/__init__.py
index 1c4c5d98750..dadb043e016 100644
--- a/addons/hr_attendance/__init__.py
+++ b/addons/hr_attendance/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_attendance/__terp__.py b/addons/hr_attendance/__terp__.py
index cebdf838084..d646f352255 100644
--- a/addons/hr_attendance/__terp__.py
+++ b/addons/hr_attendance/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index b0a331c9ebc..8994f96de4a 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -114,7 +114,11 @@ class hr_employee(osv.osv):
     def attendance_action_change(self, cr, uid, ids, type='action', context={}, dt=False, *args):
         id = False
         warning_sign = 'sign'
-        
+
+        #Special case when button calls this method :type=context
+        if isinstance(type,dict):
+            type = type.get('type','action')
+            
         if type == 'sign_in':
             warning_sign = "Sign In"
         elif type == 'sign_out':
@@ -125,7 +129,7 @@ class hr_employee(osv.osv):
                 raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,))
             
             res = {'action' : type, 'employee_id' : emp['id']}
-            
+
             if dt:
                 res['name'] = dt
                 
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 4e1b4d0a496..a39af8cabf4 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -27,7 +27,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_attendance_who" model="ir.ui.view">
             <field name="name">hr.attendance.tree</field>
             <field name="model">hr.attendance</field>
@@ -48,12 +48,16 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_time"
-            groups="group_hr_attendance"/>
 
+        <!--<menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"
+            groups="group_hr_attendance"/>-->
+        <menuitem
+           id="menu_hr_time_tracking"
+           name="Time Tracking"
+           parent="hr.menu_hr_root" sequence="5"/>
         <menuitem action="open_view_attendance" id="menu_open_view_attendance"
-            parent="menu_hr_attendance" groups="hr.group_hr_manager"/>
-        
+            parent="menu_hr_time_tracking" groups="hr.group_hr_manager"/>
+
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
             <field name="model">hr.action.reason</field>
@@ -84,8 +88,9 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
-        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_hr_configuration"/>
-        
+        <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
+        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_config"/>
+
         <record id="hr_attendance_employee" model="ir.ui.view">
             <field name="name">hr.employee.form1</field>
             <field name="model">hr.employee</field>
@@ -94,11 +99,11 @@
             <field name="arch" type="xml">
                 <field name="parent_id" position="after">
                     <field name="state"/>
-                    <button name="sign_in" states="absent" string="Sign In" type="object" icon="gtk-go-back"/>
-                    <button name="sign_out" states="present" string="Sign Out" type="object" icon="gtk-go-forward"/>
+                    <button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}"/>
+                    <button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}"/>
                 </field>
             </field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
index f7b655efa00..dcfadeb105b 100644
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>		
- 		
+    <data>
+
  		<wizard id="si_so" model="hr.employee" name="hr.si_so" string="Sign in / Sign out"/>
 		<wizard id="wizard_attendance_error" keyword="client_print_multi" model="hr.employee" name="hr.attendance.report" string="Print Attendance Error Report"/>
 
 		<wizard id="print_week" keyword="client_print_multi" model="hr.employee" name="hr.attendance.print_week" string="Print Timesheet by week"/>
 		<wizard id="print_month" keyword="client_print_multi" model="hr.employee" name="hr.attendance.print_month" string="Print Timesheet by month"/>
 
-        <menuitem action="si_so" id="menu_si_so" parent="hr.menu_hr_time" type="wizard"
+
+        <menuitem action="si_so" id="menu_si_so" parent="menu_hr_time_tracking" type="wizard" sequence="1"
             groups="group_hr_attendance"/>
-        
+
     </data>
 </openerp>
diff --git a/addons/hr_attendance/report/__init__.py b/addons/hr_attendance/report/__init__.py
index 0d5f7f4d82f..9b27aeb24ae 100644
--- a/addons/hr_attendance/report/__init__.py
+++ b/addons/hr_attendance/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py
index 5969b7a5859..77b3b5ba438 100644
--- a/addons/hr_attendance/report/attendance_errors.py
+++ b/addons/hr_attendance/report/attendance_errors.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_attendance/report/bymonth.py b/addons/hr_attendance/report/bymonth.py
index 5ef00f36e37..8f9b0eae59e 100644
--- a/addons/hr_attendance/report/bymonth.py
+++ b/addons/hr_attendance/report/bymonth.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index a07022b1923..f5af46d8c43 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_attendance/wizard/__init__.py b/addons/hr_attendance/wizard/__init__.py
index 188736883de..a216c879285 100644
--- a/addons/hr_attendance/wizard/__init__.py
+++ b/addons/hr_attendance/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_attendance/wizard/print_attendance_error.py b/addons/hr_attendance/wizard/print_attendance_error.py
index 79c103c79cf..cdddcaa0ddb 100644
--- a/addons/hr_attendance/wizard/print_attendance_error.py
+++ b/addons/hr_attendance/wizard/print_attendance_error.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -22,6 +22,7 @@
 import wizard
 import time
 import pooler
+from tools.translate import _
 
 _date_form = '''<?xml version="1.0"?>
 <form string="Select a time span">
diff --git a/addons/hr_attendance/wizard/print_bymonth.py b/addons/hr_attendance/wizard/print_bymonth.py
index 45f50c2cf0e..a20f5258a7c 100644
--- a/addons/hr_attendance/wizard/print_bymonth.py
+++ b/addons/hr_attendance/wizard/print_bymonth.py
@@ -2,7 +2,7 @@
 ###############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_attendance/wizard/print_byweek.py b/addons/hr_attendance/wizard/print_byweek.py
index 91a57552409..8922cef8a97 100644
--- a/addons/hr_attendance/wizard/print_byweek.py
+++ b/addons/hr_attendance/wizard/print_byweek.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_attendance/wizard/sign_in_out.py b/addons/hr_attendance/wizard/sign_in_out.py
index 9b318d8a6f7..e67b886758e 100644
--- a/addons/hr_attendance/wizard/sign_in_out.py
+++ b/addons/hr_attendance/wizard/sign_in_out.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_contract/__init__.py b/addons/hr_contract/__init__.py
index 6a312b79f62..36375675bda 100644
--- a/addons/hr_contract/__init__.py
+++ b/addons/hr_contract/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_contract/__terp__.py b/addons/hr_contract/__terp__.py
index 5f3ec3ed897..d47b3b687cb 100644
--- a/addons/hr_contract/__terp__.py
+++ b/addons/hr_contract/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 393f1e355b4..7eea1133a6b 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 47e966d3e5d..ecc4be6bd11 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
             <field name="name">hr.contract.wage.type.period.view.form</field>
             <field name="model">hr.contract.wage.type.period</field>
@@ -13,8 +13,8 @@
                 </form>
             </field>
         </record>
-        
-        
+
+
         <record id="hr_hr_employee_marital_status_form" model="ir.ui.view">
             <field name="name">hr.hr.employee.marital.status</field>
             <field name="model">hr.employee.marital.status</field>
@@ -26,7 +26,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="hr_contract_wage_type_view_form" model="ir.ui.view">
             <field name="name">hr.contract.wage.type.view.form</field>
             <field name="model">hr.contract.wage.type</field>
@@ -41,7 +41,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="hr_contract_wage_type_view_tree" model="ir.ui.view">
             <field name="name">hr.contract.wage.type.view.tree</field>
             <field name="model">hr.contract.wage.type</field>
@@ -60,10 +60,9 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
         </record>
-        <menuitem
-            id="next_id_56" 
-            name="Contracts" 
-            parent="hr.menu_hr_configuration"/>
+
+        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="5"/>
+
         <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>
 
         <record id="action_hr_contract_wage_type_period" model="ir.actions.act_window">
@@ -71,10 +70,11 @@
             <field name="res_model">hr.contract.wage.type.period</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem
-            action="action_hr_contract_wage_type_period" 
-            id="hr_menu_contract_wage_type_period" 
-            parent="hr_contract.next_id_56"/>
+        <menuitem 
+                action="action_hr_contract_wage_type_period" 
+                id="hr_menu_contract_wage_type_period" 
+                parent="hr_contract.next_id_56"/>
+
 
         <record id="hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
@@ -93,7 +93,7 @@
                                 <field name="wage_type_id"/>
                                 <field name="wage"/>
                             </tree>
-                            
+
                             <form string="Contract">
                                 <separator colspan="4" string="Generalities"/>
                                 <field colspan="4" name="name" select="1"/>
@@ -103,11 +103,11 @@
                                 <field name="working_hours_per_day_id"/>
                                 <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"/>
                             </form>
@@ -124,7 +124,7 @@
                 </notebook>
             </field>
         </record>
-        
+
         <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>
@@ -136,18 +136,19 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="action_hr_marital_status" model="ir.actions.act_window">
             <field name="name">Marital Status</field>
             <field name="res_model">hr.employee.marital.status</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        
-        <menuitem
-            action="action_hr_marital_status"
-            id="hr_menu_marital_status"
-            parent="hr.menu_hr_configuration_employee"/>
+
+        <menuitem 
+                action="action_hr_marital_status" 
+                id="hr_menu_marital_status" 
+                parent="hr.menu_view_employee_category_configuration_form" sequence="3"/>
+
         <record id="hr_contract_view_form" model="ir.ui.view">
             <field name="name">hr.contract.view.form</field>
             <field name="model">hr.contract</field>
@@ -159,13 +160,13 @@
                     <field name="employee_id" select="1"/>
                     <field name="function"/>
                     <newline/>
-                    
+
                     <separator colspan="4" string="Contract Duration"/>
                     <field name="date_start" select="1"/>
                     <field name="date_end" select="1"/>
                     <field name="working_hours_per_day_id"/>
                     <newline/>
-                    
+
                     <separator colspan="4" string="Remuneration"/>
                     <field name="wage_type_id"/>
                     <field name="wage"/>
@@ -174,7 +175,7 @@
                 </form>
             </field>
         </record>
-        
+
         <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>
@@ -185,7 +186,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="hr_contract_view_tree" model="ir.ui.view">
             <field name="name">hr.contract.view.tree</field>
             <field name="model">hr.contract</field>
@@ -203,7 +204,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="action_hr_contract" model="ir.actions.act_window">
             <field name="name">Contract</field>
             <field name="res_model">hr.contract</field>
@@ -212,7 +213,10 @@
             <field name="domain">[]</field>
         </record>
 
-        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_employee"/>
 
+     <!--   <menuitem name="Contract" id="menu_hr_contract" parent="hr.menu_hr_human_resources"/>-->
+     <!--   <menuitem action="action_hr_contract" id="hr_menu_contract" parent="menu_hr_contract"/>-->
+     <menuitem  id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/>
+      <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr_menu_contract_main" name="Contracts"/>
     </data>
 </openerp>
diff --git a/addons/hr_contract/i18n/hi.po b/addons/hr_contract/i18n/hi.po
new file mode 100644
index 00000000000..9617979af42
--- /dev/null
+++ b/addons/hr_contract/i18n/hi.po
@@ -0,0 +1,253 @@
+# Hindi 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-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-01-25 07:27+0000\n"
+"Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
+"Language-Team: Hindi <hi@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-01-26 04:52+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_contract
+#: view:hr.contract.wage.type:0
+msgid "Hourly cost computation"
+msgstr "प्रति घंटा की लागत की गणना"
+
+#. module: hr_contract
+#: selection:hr.contract.wage.type,type:0
+msgid "Gross"
+msgstr ""
+
+#. module: hr_contract
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.employee:0
+msgid "Generalities"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee,children:0
+msgid "Number of children"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract.wage.type:0
+msgid "Wage Types"
+msgstr ""
+
+#. module: hr_contract
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_contract
+#: selection:hr.contract.wage.type,type:0
+msgid "Net"
+msgstr "नेट"
+
+#. module: hr_contract
+#: model:ir.module.module,shortdesc:hr_contract.module_meta_information
+msgid "Human Resources Contracts"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract.wage.type.period,factor_days:0
+msgid "Hours in the period"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,function:0
+msgid "Function"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee,marital_status:0
+#: view:hr.employee.marital.status:0
+#: field:hr.employee.marital.status,name:0
+#: model:ir.actions.act_window,name:hr_contract.action_hr_marital_status
+#: model:ir.ui.menu,name:hr_contract.hr_menu_marital_status
+msgid "Marital Status"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Miscelleanous"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.employee:0
+#: field:hr.employee,contract_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,type:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,wage_type_id:0
+#: view:hr.contract.wage.type:0
+#: model:ir.model,name:hr_contract.model_hr_contract_wage_type
+msgid "Wage Type"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract.wage.type.period,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model,name:hr_contract.model_hr_employee_marital_status
+msgid "Employee Marital Status"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee,medic_exam:0
+msgid "Medical examination date"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,name:0
+msgid "Wage Type Name"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,working_hours_per_day:0
+msgid "Working hours per day"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Salary"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,date_end:0
+msgid "End Date"
+msgstr ""
+
+#. module: hr_contract
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,notes:0
+#: view:hr.employee:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.employee:0
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract
+#: model:ir.model,name:hr_contract.model_hr_contract
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract
+#: model:ir.ui.menu,name:hr_contract.next_id_56
+msgid "Contract"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract.type:0
+msgid "Contract Type"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract.wage.type,period_id:0
+#: model:ir.model,name:hr_contract.model_hr_contract_wage_type_period
+msgid "Wage Period"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee,audiens_num:0
+msgid "AUDIENS Number"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Remuneration"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,name:0
+msgid "Contract Name"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
+msgid "Contract Wage Type"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee,manager:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract.wage.type.period:0
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period
+msgid "Wage period"
+msgstr ""
+
+#. module: hr_contract
+#: help:hr.contract.wage.type,factor_type:0
+#: help:hr.contract.wage.type.period,factor_days:0
+msgid ""
+"This field is used by the timesheet system to compute the price of an hour "
+"of work wased on the contract of the employee"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee.marital.status,description:0
+msgid "Status Description"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.employee:0
+msgid "Contract Duration"
+msgstr ""
diff --git a/addons/hr_evaluation/__init__.py b/addons/hr_evaluation/__init__.py
new file mode 100644
index 00000000000..7fe03d1245a
--- /dev/null
+++ b/addons/hr_evaluation/__init__.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import hr_evaluation
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_evaluation/__terp__.py b/addons/hr_evaluation/__terp__.py
new file mode 100644
index 00000000000..27e55d16cf7
--- /dev/null
+++ b/addons/hr_evaluation/__terp__.py
@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    "name" : "Human Resources Evaluation",
+    "version" : "0.1",
+    "author" : "Tiny",
+    "category" : "Generic Modules/Human Resources",
+    "website" : "http://www.openerp.com",
+    "depends" : ["hr",'crm_hr'],
+    "description": "Ability to create employees evaluation.",
+    "init_xml" : [],
+    "demo_xml" : ["hr_evaluation_demo.xml"],
+    "update_xml" : [
+#                    "security/ir.model.access.csv",
+                    "hr_evaluation_view.xml",
+                    "hr_evaluation_data.xml"],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
new file mode 100644
index 00000000000..41056d70dbc
--- /dev/null
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -0,0 +1,142 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from osv import fields, osv
+
+class hr_evaluation_plan(osv.osv):
+    _name = "hr_evaluation.plan"
+    _description = "Evaluation Plan"
+    _columns = {
+        'name': fields.char("Evaluation Plan", size=64, required=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'phase_ids' : fields.one2many('hr_evaluation.plan.phase', 'plan_id', 'Evaluation Phases'),
+        'month_first': fields.integer('First Evaluation After'),
+        'month_next': fields.integer('Next Evaluation After'),
+        'active': fields.boolean('Active')
+    }
+    _defaults = {
+        'active' : lambda *a: True,
+    }
+hr_evaluation_plan()
+
+class hr_evaluation_plan_phase(osv.osv):
+    _name = "hr_evaluation.plan.phase"
+    _description = "Evaluation Plan Phase"
+    _order = "sequence"
+    _columns = {
+        'name': fields.char("Phase", size=64, required=True),
+        'sequence': fields.integer("Sequence"),
+        'company_id': fields.related('plan_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
+        'plan_id': fields.many2one('hr_evaluation.plan','Evaluation Plan', required=True, ondelete='cascade'),
+        'action': fields.selection([
+            ('top-down','Top-Down Appraisal Requests'),
+            ('bottom-up','Bottom-Up Appraisal Requests'),
+            ('self','Self Appraisal Requests'),
+            ('final','Final Interview')], 'Action', required=True),
+        'survey_id': fields.many2one('survey','Appraisal Form',required=True),
+        'send_answer_manager': fields.boolean('All Answers',
+            help="Send all answers to the manager"),
+        'send_answer_employee': fields.boolean('All Answers',
+            help="Send all answers to the employee"),
+        'send_anonymous_manager': fields.boolean('Anonymous Summary',
+            help="Send an anonymous summary to the manager"),
+        'send_anonymous_employee': fields.boolean('Anonymous Summary',
+            help="Send an anonymous summary to the employee"),
+        'wait': fields.boolean('Wait Previous Phases',
+            help="Check this box if you want to wait that all preceeding phases " +
+              "are finished before launching this phase.")
+
+    }
+    _defaults = {
+        'sequence' : lambda *a: 1,
+    }
+hr_evaluation_plan_phase()
+
+class hr_employee(osv.osv):
+    _inherit="hr.employee"
+    _columns = {
+        'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Evaluation Plan'),
+        'evaluation_date': fields.date('Next Evaluation', help="Date of the next evaluation"),
+    }
+    def onchange_evaluation_plan_id(self, *args):
+        # return the right evaluation date
+        pass
+hr_employee()
+
+class hr_evaluation(osv.osv):
+    _name = "hr_evaluation.evaluation"
+    _description = "Employee Evaluation"
+    _rec_name = 'employee_id'
+    _columns = {
+        'date': fields.date("Evaluation Deadline", required=True),
+        'employee_id': fields.many2one('hr.employee', "Employee", required=True),
+        'manager_id': fields.many2one('res.users', "Manager", required=True),
+        'note_summary': fields.text('Evaluation Summary'),
+        'note_action': fields.text('Action Plan',
+            help="If the evaluation does not meet the expectations, you can propose"+
+              "an action plan"),
+        'rating': fields.selection([
+            ('0','Significantly bellow expectations'),
+            ('1','Did not meet expectations'),
+            ('2','Meet expectations'),
+            ('3','Exceeds expectations'),
+            ('4','Significantly exceeds expectations'),
+        ], "Overall Rating", help="This is the overall rating on that summarize the evaluation"),
+        'survey_request_ids': fields.many2many('survey.request',
+            'hr_evaluation_evaluation_requests',
+            'evaluation_id',
+            'survey_id',
+            'Appraisal Forms'),
+        'plan_id': fields.many2one('hr_evaluation.plan', 'Plan'),
+        'phase_id': fields.many2one('hr_evaluation.plan.phase', 'Phase'),
+        'state': fields.selection([
+            ('draft','Draft'),
+            ('wait','Plan In Progress'),
+            ('progress','Final Validation'),
+            ('done','Done'),
+            ('cancel','Cancelled'),
+        ], 'State', required=True,readonly=True)
+    }
+    _defaults = {
+        'date' : lambda *a: time.strftime('%Y-%m-%d'),
+        'state' : lambda *a: 'draft',
+    }
+
+    def button_plan_in_progress(self,cr, uid, ids, context):
+        self.write(cr,uid,ids,{'state':'wait'})
+        return True
+
+    def button_final_validation(self,cr, uid, ids, context):
+        self.write(cr,uid,ids,{'state':'progress'})
+        return True
+
+    def button_done(self,cr, uid, ids, context):
+        self.write(cr,uid,ids,{'state':'done'})
+        return True
+
+    def button_cancel(self,cr, uid, ids, context):
+        self.write(cr,uid,ids,{'state':'cancel'})
+        return True
+
+hr_evaluation()
+
+
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
new file mode 100644
index 00000000000..2a3d72d3ccd
--- /dev/null
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -0,0 +1,1384 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+		<record id="survey_2" model="survey">
+			<field name="title">EMPLOYEE EVALUATION</field>
+			<field name="max_response_limit">20</field>
+			<field eval="[(6,0,[])]" name="users"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_3" model="survey">
+			<field name="title">EMPLOYEE OPINION</field>
+			<field name="max_response_limit">20</field>
+			<field eval="[(6,0,[])]" name="users"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_page_1" model="survey.page">
+			<field name="title">EMPLOYEE EVALUATION FORM</field>
+			<field name="survey_id" ref="survey_2"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_page_2" model="survey.page">
+			<field name="title">PROCESS</field>
+			<field name="survey_id" ref="survey_3"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_page_5" model="survey.page">
+			<field name="title">WORK PLAN</field>
+			<field name="survey_id" ref="survey_2"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_page_6" model="survey.page">
+			<field name="title">EMPLOYEE PERFORMANCE IN KEY AREAS</field>
+			<field name="survey_id" ref="survey_2"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+
+
+	<data>
+		<record id="survey_page_10" model="survey.page">
+			<field name="title">SURVEY</field>
+			<field name="survey_id" ref="survey_3"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+
+
+
+	<data>
+		<record id="survey_question_0" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="1" name="sequence"/>
+			<field name="question">Employee Details</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">multiple_textboxes</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_2"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_question_2" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="1" name="sequence"/>
+			<field name="question">Employee Information</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">multiple_textboxes</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_1"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_3" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="1" name="sequence"/>
+			<field name="question">ENGAGEMENT</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">matrix_of_choices_only_one_ans</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_10"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_4" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="1" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="1" name="sequence"/>
+			<field name="question">SUBJECT</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">matrix_of_choices_only_one_ans</field>
+			<field name="column_name">RECOMMENDATIONS / EVALUATIONS</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_6"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_question_6" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="2" name="sequence"/>
+			<field name="question">LEADERSHIP</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">matrix_of_choices_only_one_ans</field>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_10"/>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+	<data>
+		<!--record id="survey_question_7" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="2" name="sequence"/>
+			<field name="question">PROCESS</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">comment</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_2"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record-->
+	</data>
+	<data>
+		<record id="survey_question_8" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="1" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="2" name="sequence"/>
+			<field name="question">Supervisors only : </field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">matrix_of_choices_only_one_ans</field>
+			<field name="column_name">RECOMMENDATIONS / EVALUATIONS </field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_6"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_question_9" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="1" name="sequence"/>
+			<field name="question">WORK PLAN</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">table</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_5"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+			<field eval="5" name="no_of_rows"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_question_10" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="3" name="sequence"/>
+			<field name="question">EFFECTIVENESS</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">matrix_of_choices_only_one_ans</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_10"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+
+
+
+	<data>
+		<record id="survey_question_14" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="4" name="sequence"/>
+			<field name="question">CONTINUOUS IMPROVEMENT</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">matrix_of_choices_only_one_ans</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_10"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+
+
+	<data>
+		<record id="survey_question_17" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="2" name="sequence"/>
+			<field name="question">Additional comments : </field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">comment</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_5"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_18" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="5" name="sequence"/>
+			<field name="question">OPENNESS</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">matrix_of_choices_only_one_ans</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_10"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+
+
+
+	<data>
+		<record id="survey_question_23" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="3" name="sequence"/>
+			<field name="question">OVERALL PERFORMANCE SUMMARY RATING</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">descriptive_text</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field name="descriptive_text">including the project evaluation form (if any)</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="hr_evaluation.survey_page_6"/>
+			<field name="comment_label">Other</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_question_39" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="2" name="sequence"/>
+			<field name="question">OVERALL PURPOSE OF EMPLOYEE APPRAISAL</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">descriptive_text</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field name="descriptive_text">* To initiate a clear and open communication of performance expectations
+
+* To assist employees in their professional growth, through the identification of strengths and opportunities for development</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="hr_evaluation.survey_page_1"/>
+			<field name="comment_label">Other</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_40" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="6" name="sequence"/>
+			<field name="question">MISCELLANEOUS</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">matrix_of_choices_only_one_ans</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_10"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_41" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="7" name="sequence"/>
+			<field name="question">Additional comments :</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">comment</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_10"/>
+			<field name="comment_label">Other</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_question_42" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="3" name="sequence"/>
+			<field name="question">At the outset of the appraisal time period</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">descriptive_text</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field name="descriptive_text">* It is the joint responsibility of the employee and the supervisor (appraiser) to establish a feasible work plan for the coming year, including major employee responsibilities and corresponding benchmarks against which results will be evaluated.
+
+* Critical or key elements of performance and professional development needs (if any), should also be noted at this time</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="hr_evaluation.survey_page_1"/>
+			<field name="comment_label">Other</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_question_43" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="4" name="sequence"/>
+			<field name="question">At the conclusion of the appraisal time period</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">descriptive_text</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field name="descriptive_text">* The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-evaluation and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
+Once the form had been filled, the employee send it to his supervisor.
+
+* It is the primary responsibility of the supervisor to gather the necessary input from 	the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with Tiny Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager.
+
+* The supervisor synthesizes and integrates all input into the completed appraisal. He motivates his evaluation in the ad hoc fields.
+
+* The employee may choose to offer comments or explanation regarding the completed review.
+
+* The supervisor send the form to the HR department in India and in Belgium. </field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="hr_evaluation.survey_page_1"/>
+			<field name="comment_label">Other</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_question_21" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="2" name="sequence"/>
+			<field name="question">At the supervisor's appraisal date </field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">descriptive_text</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field name="descriptive_text">* His direct reports will be invited through OpenERP to express a feedback on their supervisor's leadership and to give their opinion about their own engagement and effectiveness, the continuous improvement and openness in action in the company, ...
+
+* The employees will send back their anonymous answers to OpenERP. The data will be handled by the HR manager and a  brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor.</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="survey_page_2"/>
+			<field name="comment_label">Other</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data>
+
+
+	<!--data>
+		<record id="survey_question_42" model="survey.question">
+			<field name="validation_type">do_not_validate</field>
+			<field name="comment_valid_type">do_not_validate</field>
+			<field name="make_comment_field_err_msg">Please enter a comment.</field>
+			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+			<field eval="0" name="comment_column"/>
+			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field name="req_error_msg">This question requires an answer.</field>
+			<field eval="3" name="sequence"/>
+			<field name="question">EVALUATION PROCESS</field>
+			<field eval="0" name="is_require_answer"/>
+			<field name="type">descriptive_text</field>
+			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+			<field name="descriptive_text">1). At the outset of the appraisal time period:
+
+     * It is the joint responsibility of the employee and the supervisor (appraiser) to establish a feasible work plan for the coming year, including major employee responsibilities and corresponding benchmarks against which results will be evaluated.
+
+     * Critical or key elements of performance and professional development needs (if any), should also be noted at this time
+
+2). At the conclusion of the appraisal time period:
+
+     * The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-evaluation and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
+Once the form had been filled, the employee send it to his supervisor.
+
+     * It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with Tiny Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager.
+
+     * The supervisor synthesizes and integrates all input into the completed appraisal. He motivates his evaluation in the ad hoc fields.
+
+     * The employee may choose to offer comments or explanation regarding the completed review.
+
+     * The supervisor send the form to the HR department in India and in Belgium.
+</field>
+			<field eval="0" name="make_comment_field"/>
+			<field eval="1" name="in_visible_menu_choice"/>
+			<field name="page_id" ref="hr_evaluation.survey_page_1"/>
+			<field name="comment_label">Other</field>
+			<field eval="1" name="in_visible_rating_weight"/>
+			<field eval="0" name="allow_comment"/>
+		</record>
+	</data-->
+
+
+
+	<data>
+		<record id="survey_question_column_heading_4" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">1</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_4"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_5" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">2</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_4"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_6" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">3</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_4"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_7" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">4</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_4"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_8" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">5</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_4"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_9" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">1</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_8"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_10" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">2</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_8"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_11" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">3</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_8"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_12" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">4</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_8"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_13" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">5</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_8"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_14" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">1</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_3"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_15" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">2</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_3"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_16" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">3</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_3"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_17" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">4</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_3"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_18" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">5</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_3"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_19" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">1</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_6"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_20" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">2</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_6"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_21" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">3</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_6"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_22" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">4</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_6"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_23" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">5</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_6"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_24" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">1</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_10"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_25" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">2</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_10"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_26" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">3</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_10"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_27" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">4</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_10"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_28" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">5</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_10"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_29" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">1</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_14"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_30" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">2</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_14"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_31" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">3</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_14"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_32" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">4</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_14"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_33" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">5</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_14"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_34" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">1</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_18"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_35" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">2</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_18"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_36" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">3</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_18"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_37" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">4</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_18"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_38" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">5</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_18"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_39" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">1</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_40"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_40" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">2</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_40"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_41" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">3</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_40"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_42" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">4</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_40"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_43" model="survey.question.column.heading">
+			<field eval="0" name="in_visible_menu_choice"/>
+			<field name="title">5</field>
+			<field eval="0" name="in_visible_rating_weight"/>
+			<field name="question_id" ref="survey_question_40"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_answer_0" model="survey.answer">
+			<field name="answer">Demonstrates genuine concern for me as a person. </field>
+			<field name="question_id" ref="survey_question_6"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_1" model="survey.answer">
+			<field name="answer">Name</field>
+			<field name="question_id" ref="survey_question_2"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_2" model="survey.answer">
+			<field name="answer">I'm efficient at work and my achievements are successful.</field>
+			<field name="question_id" ref="survey_question_10"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_3" model="survey.answer">
+			<field name="answer">I am proud to tell others I work here. </field>
+			<field name="question_id" ref="survey_question_3"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_4" model="survey.answer">
+			<field name="answer">Name of your direct supervisor</field>
+			<field name="question_id" ref="survey_question_0"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_5" model="survey.answer">
+			<field name="answer">Actions by Executive management show genuine interest in the well-being of employees.</field>
+			<field name="question_id" ref="survey_question_40"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_6" model="survey.answer">
+			<field name="answer">I know the company's values and live them.</field>
+			<field name="question_id" ref="survey_question_18"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_7" model="survey.answer">
+			<field name="answer">My work contributes towards the continuous improvement of the company, our services or products. </field>
+			<field name="question_id" ref="survey_question_14"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_8" model="survey.answer">
+			<field name="answer">I have enough work.</field>
+			<field name="question_id" ref="survey_question_10"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_9" model="survey.answer">
+			<field name="answer">Date</field>
+			<field name="question_id" ref="survey_question_0"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_10" model="survey.answer">
+			<field name="answer">Position Title</field>
+			<field name="question_id" ref="survey_question_2"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_11" model="survey.answer">
+			<field name="answer">I consistently acquire new knowledge, skills or understanding through contact with my supervisor. He helps me growing my compete</field>
+			<field name="question_id" ref="survey_question_6"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_12" model="survey.answer">
+			<field name="answer">My job provides me with a sense of personal accomplishment.</field>
+			<field name="question_id" ref="survey_question_3"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_13" model="survey.answer">
+			<field name="answer">What I did several months ago is still of use to the company, the services or the products today. </field>
+			<field name="question_id" ref="survey_question_14"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_14" model="survey.answer">
+			<field name="answer">My best achievements have been communicated to the community, internally or to customers. </field>
+			<field name="question_id" ref="survey_question_18"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_15" model="survey.answer">
+			<field name="answer">I have the same opportunity to succeed as others with similar experiences, performance and educational background. </field>
+			<field name="question_id" ref="survey_question_40"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_16" model="survey.answer">
+			<field name="answer">Compared to similar jobs in other companies where I could work, my total compensation is:
+(Scale: Well below others, Below othe</field>
+			<field name="question_id" ref="survey_question_40"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_17" model="survey.answer">
+			<field name="answer">Overall, I believe the quality of products and/or services my workgroup delivers is improving.</field>
+			<field name="question_id" ref="survey_question_14"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_18" model="survey.answer">
+			<field name="answer">I would prefer to remain with this company even if a comparable job were available in another company. </field>
+			<field name="question_id" ref="survey_question_3"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_19" model="survey.answer">
+			<field name="answer">Listens and takes into account all ideas and do his best to put in place the best of these. </field>
+			<field name="question_id" ref="survey_question_6"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_20" model="survey.answer">
+			<field name="answer">Appraisal for Period</field>
+			<field name="question_id" ref="survey_question_2"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_21" model="survey.answer">
+			<field name="answer">I mostly work on value-added tasks for the company, the products or the services. (Value-added task : significant improvement pe</field>
+			<field name="question_id" ref="survey_question_10"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_22" model="survey.answer">
+			<field name="answer">Our workgroup identifies and reduces waste of time in our activities and processes. </field>
+			<field name="question_id" ref="survey_question_14"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_23" model="survey.answer">
+			<field name="answer">Taking everything into account, how satisfied are you with your current job? </field>
+			<field name="question_id" ref="survey_question_3"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_24" model="survey.answer">
+			<field name="answer">I understand the company strategy and how my workgroup supports it. </field>
+			<field name="question_id" ref="survey_question_40"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_25" model="survey.answer">
+			<field name="answer">Date of Review</field>
+			<field name="question_id" ref="survey_question_2"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_26" model="survey.answer">
+			<field name="answer">Time management :  projects/tasks are completed on time</field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_27" model="survey.answer">
+			<field name="answer">Results of the bottom-up survey and mitigation actions  to face technical, organizational, structural and/or relational issues</field>
+			<field name="question_id" ref="survey_question_8"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+
+
+
+	<data>
+		<record id="survey_answer_31" model="survey.answer">
+			<field name="answer">Delegation : Ability to efficiently assign tasks to other people</field>
+			<field name="question_id" ref="survey_question_8"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+
+
+	<data>
+		<record id="survey_answer_43" model="survey.answer">
+			<field name="answer">Appraiser</field>
+			<field name="question_id" ref="survey_question_2"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_44" model="survey.answer">
+			<field name="answer">Ability to cope with multidisciplinary of team</field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_45" model="survey.answer">
+			<field name="answer">Enthusiasm &amp; implication toward projects/assignments</field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_46" model="survey.answer">
+			<field name="answer">Compliance to internal rules and processes (timesheets completion, etc.)</field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_47" model="survey.answer">
+			<field name="answer">Team spirit : ability to work efficiently with peers,  manage the conflicts with diplomacy</field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_48" model="survey.answer">
+			<field name="answer">Leadership: create a challenging and motivating work environment aligned with the company's strategy</field>
+			<field name="question_id" ref="survey_question_8"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_49" model="survey.answer">
+			<field name="answer">Leadership: sustain  subordinates in their professional growth</field>
+			<field name="question_id" ref="survey_question_8"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_50" model="survey.answer">
+			<field name="answer">Ability to manage  planning resources, risks, budgets and deadlines</field>
+			<field name="question_id" ref="survey_question_8"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_51" model="survey.answer">
+			<field name="answer">I am willing to put in a great deal of effort beyond what is expected to help my workgroup succeed.</field>
+			<field name="question_id" ref="survey_question_3"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_52" model="survey.answer">
+			<field name="answer">I believe the information that I get from the person I report to. </field>
+			<field name="question_id" ref="survey_question_6"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_answer_67" model="survey.answer">
+			<field name="answer">Initiative and self autonomy</field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_68" model="survey.answer">
+			<field name="answer">Ability to follow and complete work as instructed</field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_69" model="survey.answer">
+			<field name="answer">Decision making</field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_70" model="survey.answer">
+			<field name="answer">At the conclusion of the appraisal time period:</field>
+			<field name="question_id" ref="survey_question_42"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_71" model="survey.answer">
+			<field name="answer">At the outset of the appraisal time period:</field>
+			<field name="question_id" ref="survey_question_42"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_72" model="survey.answer">
+			<field name="answer">Customer commitment</field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_73" model="survey.answer">
+			<field name="answer">Communication skills ( written &amp; verbally): clearness, concision, exactitude </field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_74" model="survey.answer">
+			<field name="answer">Technical skills regarding to the job requirements</field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_75" model="survey.answer">
+			<field name="answer">Analytical and synthetic mind</field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_76" model="survey.answer">
+			<field name="answer">Promptness and attendance record</field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_77" model="survey.answer">
+			<field name="answer">Adaptability : Ability to adapt oneself to organizational changes while keeping efficiency</field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_78" model="survey.answer">
+			<field name="answer">Creativity and forward looking aptitude</field>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_answer_98" model="survey.answer">
+			<field name="answer">Title</field>
+			<field name="question_id" ref="survey_question_2"/>
+			<field eval="6" name="sequence"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_tbl_column_heading_objectives0" model="survey.question.column.heading">
+			<field name="title">Objectives</field>
+			<field name="question_id" ref="survey_question_9"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_tbl_column_heading_results0" model="survey.question.column.heading">
+			<field name="title">Results</field>
+			<field name="question_id" ref="survey_question_9"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_tbl_column_heading_comments0" model="survey.question.column.heading">
+			<field name="title">Comments</field>
+			<field name="question_id" ref="survey_question_9"/>
+		</record>
+	</data>
+
+
+	<data noupdate="1">
+		<record id="survey_request_1" model="survey.request">
+			<field name="state">waiting_answer</field>
+			<field name="survey_id" ref="hr_evaluation.survey_2"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field name="email">fp@tinyerp.com</field>
+			<field name="date_deadline">2010-02-21</field>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="hr_evaluation_plan_managersevaluationplan0" model="hr_evaluation.plan">
+			<field eval="1" name="active"/>
+			<field eval="6" name="month_next"/>
+			<field name="name">Manager's Evaluation Plan</field>
+			<field eval="3" name="month_first"/>
+			<field name="company_id" ref="base.main_company"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="hr_evaluation_plan_phase_sendtosubordinates0" model="hr_evaluation.plan.phase">
+			<field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+			<field name="name">Send to Subordinates</field>
+			<field eval="0" name="send_anonymous_manager"/>
+			<field eval="1" name="sequence"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="action">bottom-up</field>
+			<field eval="0" name="send_anonymous_employee"/>
+			<field eval="0" name="send_answer_employee"/>
+			<field name="survey_id" ref="hr_evaluation.survey_2"/>
+			<field eval="0" name="send_answer_manager"/>
+			<field eval="0" name="wait"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="hr_evaluation_plan_phase_sendtomanagers0" model="hr_evaluation.plan.phase">
+			<field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+			<field name="name">Send to Managers</field>
+			<field eval="0" name="send_anonymous_manager"/>
+			<field eval="2" name="sequence"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="action">top-down</field>
+			<field eval="0" name="send_anonymous_employee"/>
+			<field eval="0" name="send_answer_employee"/>
+			<field name="survey_id" ref="hr_evaluation.survey_2"/>
+			<field eval="0" name="send_answer_manager"/>
+			<field eval="0" name="wait"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="hr_evaluation_plan_phase_sendtoemployee0" model="hr_evaluation.plan.phase">
+			<field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+			<field name="name">Send to Employee</field>
+			<field eval="0" name="send_anonymous_manager"/>
+			<field eval="3" name="sequence"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="action">self</field>
+			<field eval="0" name="send_anonymous_employee"/>
+			<field eval="0" name="send_answer_employee"/>
+			<field name="survey_id" ref="hr_evaluation.survey_2"/>
+			<field eval="0" name="send_answer_manager"/>
+			<field eval="0" name="wait"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="hr_evaluation_plan_phase_finalinterviewwithmanager0" model="hr_evaluation.plan.phase">
+			<field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+			<field name="name">Final Interview With Manager</field>
+			<field eval="0" name="send_anonymous_manager"/>
+			<field eval="4" name="sequence"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="action">final</field>
+			<field eval="0" name="send_anonymous_employee"/>
+			<field eval="0" name="send_answer_employee"/>
+			<field name="survey_id" ref="crm_hr.survey_job_0"/>
+			<field eval="0" name="send_answer_manager"/>
+			<field eval="1" name="wait"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="hr_evaluation_evaluation_0" model="hr_evaluation.evaluation">
+			<field name="rating">0</field>
+			<field name="employee_id" ref="hr.employee1"/>
+			<field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
+			<field name="state">draft</field>
+			<field eval="[(6,0,[ref('survey_request_1')])]" name="survey_request_ids"/>
+			<field name="date">2010-01-21</field>
+			<field name="phase_id" ref="hr_evaluation_plan_phase_sendtomanagers0"/>
+			<field name="manager_id" ref="base.user_root"/>
+		</record>
+	</data>
+
+
+</openerp>
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
new file mode 100644
index 00000000000..89c072e6eb3
--- /dev/null
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<openerp>
+	<data noupdate="1">
+
+	</data>
+</openerp>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
new file mode 100644
index 00000000000..58aa5f4a3fc
--- /dev/null
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+		<record model="ir.ui.view" id="view_hr_evaluation_plan_form">
+			<field name="name">hr_evaluation.plan.form</field>
+			<field name="model">hr_evaluation.plan</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Evaluation Plan">
+					<group col="6" colspan="4">
+						<field name="name" select="1"/>
+						<field name="company_id" select="1" widget="selection"/>
+						<field name="active"/>
+						<field name="month_first"/>
+						<field name="month_next"/>
+						<label string="(months)" align="0.0"/>
+					</group>
+					 <notebook colspan="4">
+					 	<page string="Evaluation Phases">
+                            <field name="phase_ids" nolabel="1" colspan="4"/>
+                     	</page>
+                     </notebook>
+				</form>
+			</field>
+		</record>
+		<record model="ir.ui.view" id="view_hr_evaluation_plan_tree">
+			<field name="name">hr_evaluation.plan.form</field>
+			<field name="model">hr_evaluation.plan</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Evaluation Plan">
+					<field name="name"/>
+					<field name="month_first"/>
+					<field name="month_next"/>
+					<field name="company_id"/>
+				</tree>
+			</field>
+		</record>
+		<record model="ir.actions.act_window" id="open_view_hr_evaluation_plan_tree">
+			<field name="res_model">hr_evaluation.plan</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+		</record>
+		<menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="3"/>
+		<!--menuitem name="HR Responsible" parent="menu_eval_hr" id="menu_resp_hr"/-->
+		<menuitem
+			name="Evaluation Plan" parent="menu_eval_hr"
+			id="menu_open_view_hr_evaluation_plan_tree"
+			action="open_view_hr_evaluation_plan_tree"/>
+
+		<record model="ir.ui.view" id="view_hr_evaluation_plan_phase_form">
+			<field name="name">hr_evaluation.plan.phase.form</field>
+			<field name="model">hr_evaluation.plan.phase</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Evaluation Plan Phase">
+					<field name="plan_id" invisible="1"/>
+					<group col="6" colspan="4">
+						<field name="name"/>
+						<field name="wait"/>
+						<field name="sequence"/>
+					</group>
+					<group col="4" colspan="4">
+						<separator string="Action to Perform" colspan="4"/>
+						<field name="action"/>
+						<field name="survey_id" widget="selection"/>
+					</group>
+					<group col="4" colspan="4">
+						<group col="4" colspan="2">
+							<separator string="Send to Managers" colspan="2"/>
+							<newline/>
+							<field name="send_answer_manager"/>
+							<newline/>
+							<field name="send_anonymous_manager"/>
+						</group>
+						<group col="4" colspan="2">
+							<separator string="Send to Employees" colspan="2"/>
+							<newline/>
+							<field name="send_answer_employee"/>
+							<newline/>
+							<field name="send_anonymous_employee"/>
+						</group>
+					</group>
+				</form>
+			</field>
+		</record>
+		<record model="ir.ui.view" id="view_hr_evaluation_plan_phase_tree">
+			<field name="name">hr_evaluation.plan.phase.form</field>
+			<field name="model">hr_evaluation.plan.phase</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Evaluation Plan Phase" editable="bottom" >
+					<field name="sequence"/>
+					<field name="name"/>
+					<field name="action"/>
+					<field name="survey_id" widget="selection"/>
+					<field name="wait"/>
+				</tree>
+			</field>
+		</record>
+
+		<record id="hr_hr_employee_view_form" model="ir.ui.view">
+            <field name="name">hr.hr.employee.view.form</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="Evaluation">
+                    	<field name="evaluation_plan_id"/>
+						<field name="evaluation_date"/>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_hr_evaluation_form">
+			<field name="name">hr_evaluation.evaluation.form</field>
+			<field name="model">hr_evaluation.evaluation</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Evaluation">
+					<group col="4" colspan="4">
+						<field name="date" select="1"/>
+						<field name="rating"/>
+						<field name="employee_id" select="1"/>
+						<field name="manager_id" select="1"/>
+						<field name="plan_id"/>
+						<field name="phase_id" domain="[('plan_id', '=', plan_id)]"/>
+					</group>
+					<notebook colspan="4">
+			            <page string="Appraisal">
+	                    	<field name="survey_request_ids" nolabel="1" colspan="4"/>
+					    </page>
+					    <page string="Action Plan">
+	                    	<field name="note_action" colspan="4" nolabel="1"/>
+					    </page>
+					    <page string="Summary">
+	        				<field name="note_summary" colspan="4" nolabel="1"/>
+					    </page>
+                	</notebook>
+                	<newline/>
+					<group col="6" colspan="4">
+					<field name="state"/>
+                	<button name="button_plan_in_progress"
+                			string="Plan In Progress"
+                            states="draft"
+                            type="object"/>
+                    <button name="button_final_validation"
+                			string="Final Validation"
+                            states="wait"
+                            type="object"/>
+                    <button name="button_done"
+                			string="Done"
+                            states="progress"
+                            type="object"/>
+                    <button name="button_cancel"
+                			string="Cancel"
+                            states="draft,wait,progress"
+                            type="object"/>
+                    </group>
+              </form>
+			</field>
+		</record>
+		<record model="ir.ui.view" id="view_hr_evaluation_tree">
+			<field name="name">hr_evaluation.evaluation.form</field>
+			<field name="model">hr_evaluation.evaluation</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Evaluation">
+					<field name="date"/>
+					<field name="employee_id"/>
+					<field name="manager_id"/>
+				</tree>
+			</field>
+		</record>
+		<record model="ir.actions.act_window" id="open_view_hr_evaluation_tree">
+			<field name="res_model">hr_evaluation.evaluation</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+		</record>
+		<menuitem
+			name="Evaluation" parent="menu_eval_hr"
+			id="menu_open_view_hr_evaluation_tree"
+			action="open_view_hr_evaluation_tree"/>
+	</data>
+</openerp>
diff --git a/addons/hr_evaluation/i18n/fr_BE.po b/addons/hr_evaluation/i18n/fr_BE.po
new file mode 100644
index 00000000000..b9d296c1d40
--- /dev/null
+++ b/addons/hr_evaluation/i18n/fr_BE.po
@@ -0,0 +1,275 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_evaluation
+#
+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 12:18:06+0000\n"
+"PO-Revision-Date: 2009-11-25 12:18:06+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_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/hr_evaluation.pot b/addons/hr_evaluation/i18n/hr_evaluation.pot
new file mode 100644
index 00000000000..b9d296c1d40
--- /dev/null
+++ b/addons/hr_evaluation/i18n/hr_evaluation.pot
@@ -0,0 +1,275 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_evaluation
+#
+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 12:18:06+0000\n"
+"PO-Revision-Date: 2009-11-25 12:18:06+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_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/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
new file mode 100644
index 00000000000..440bcfb9e6d
--- /dev/null
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -0,0 +1,9 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_evaluation_evaluation","hr_evaluation.evaluation","model_hr_evaluation_evaluation",hr.group_hr_user,1,0,0,0
+"access_hr_evaluation_type","hr_evaluation.type","model_hr_evaluation_type",hr.group_hr_user,1,0,0,0
+"access_hr_evaluation_type_value","hr_evaluation.type.value","model_hr_evaluation_type_value",hr.group_hr_user,1,0,0,0
+"access_hr_evaluation_quote","hr_evaluation.quote","model_hr_evaluation_quote",hr.group_hr_user,1,0,0,0
+"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation","model_hr_evaluation_evaluation",hr.group_hr_manager,1,1,1,1
+"access_hr_evaluation_type_manager","hr_evaluation.type","model_hr_evaluation_type",hr.group_hr_manager,1,1,1,1
+"access_hr_evaluation_type_value_manager","hr_evaluation.type.value","model_hr_evaluation_type_value",hr.group_hr_manager,1,1,1,1
+"access_hr_evaluation_quote_manager","hr_evaluation.quote","model_hr_evaluation_quote",hr.group_hr_manager,1,1,1,1
\ No newline at end of file
diff --git a/addons/hr_evaluation/specifications/evaluation_plan.png b/addons/hr_evaluation/specifications/evaluation_plan.png
new file mode 100644
index 00000000000..bd00ceca0e9
Binary files /dev/null and b/addons/hr_evaluation/specifications/evaluation_plan.png differ
diff --git a/addons/hr_expense/__init__.py b/addons/hr_expense/__init__.py
index b51bd53e36c..06f78648101 100644
--- a/addons/hr_expense/__init__.py
+++ b/addons/hr_expense/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_expense/__terp__.py b/addons/hr_expense/__terp__.py
index c2b826f91f4..6cdf8acdd3a 100644
--- a/addons/hr_expense/__terp__.py
+++ b/addons/hr_expense/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 4c2ca16ce0c..f0c566fbf16 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 68b61f9c2f6..59452ff7cc8 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
         <!-- Expenses -->
-        
+
         <record id="view_expenses_line_tree" model="ir.ui.view">
             <field name="name">hr.expense.line.tree</field>
             <field name="type">tree</field>
@@ -20,7 +20,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_expenses_tree" model="ir.ui.view">
             <field name="name">hr.expense.expense.tree</field>
             <field name="model">hr.expense.expense</field>
@@ -36,8 +36,8 @@
                 </tree>
             </field>
         </record>
-        
-        
+
+
         <record id="view_expenses_form" model="ir.ui.view">
             <field name="name">hr.expense.form</field>
             <field name="type">form</field>
@@ -96,8 +96,8 @@
                 </form>
             </field>
         </record>
-        
-        
+
+
         <record id="view_hr_expense_filter" model="ir.ui.view">
             <field name="name">hr.expense.expense.filter</field>
             <field name="model">hr.expense.expense</field>
@@ -118,29 +118,31 @@
                  </search>
             </field>
         </record>
-        
+
         <record id="expense_all" model="ir.actions.act_window">
             <field name="name">All expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        
-        <menuitem id="menu_expenses" name="Expenses"
-            parent="hr.menu_hr_root"/>
-        <menuitem action="expense_all" id="menu_expense_all"
-            parent="menu_expenses" groups="hr.group_hr_manager"/>
+
+        <menuitem id="next_id_49" name="Expenses" sequence="6"
+        	parent="hr.menu_hr_root"/>
+
+        <menuitem action="expense_all" id="menu_expense_all" name="Expenses"
+        	parent="next_id_49" groups="hr.group_hr_manager"/>
+
         <record id="view_product_hr_expense_form" model="ir.ui.view">
-            <field name="name">product.product.expense.form</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field groups="base.group_extended" name="rental" position="after">
-                    <field name="hr_expense_ok"/>
-                </field>
-            </field>
-        </record>
+			<field name="name">product.product.expense.form</field>
+			<field name="model">product.product</field>
+			<field name="inherit_id" ref="product.product_normal_form_view"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field groups="base.group_extended" name="rental" position="after">
+					<field name="hr_expense_ok"/>
+				</field>
+			</field>
+		</record>
 
     </data>
 </openerp>
diff --git a/addons/hr_expense/report/__init__.py b/addons/hr_expense/report/__init__.py
index 9fc0194ae68..f55bc86bc12 100644
--- a/addons/hr_expense/report/__init__.py
+++ b/addons/hr_expense/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_expense/report/expense.py b/addons/hr_expense/report/expense.py
index ceb8c3a543f..ae368e8ef8e 100644
--- a/addons/hr_expense/report/expense.py
+++ b/addons/hr_expense/report/expense.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_holidays/__init__.py b/addons/hr_holidays/__init__.py
index 976694dc2cc..441f7d252a9 100644
--- a/addons/hr_holidays/__init__.py
+++ b/addons/hr_holidays/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
index 2aaec93c781..7e11b7557e0 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__terp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -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/>.
 #
 ##############################################################################
 
@@ -47,7 +47,7 @@
 """,
     'author': 'Tiny & Axelor',
     'website': 'http://www.openerp.com',
-    'depends': ['hr', 'crm', 'process'],
+    'depends': ['hr', 'crm', 'process','hr_attendance'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr.py
index ff33621cbe0..3d07e506ea1 100755
--- a/addons/hr_holidays/hr.py
+++ b/addons/hr_holidays/hr.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##################################################################################
 #
-# Copyright (c) 2005-2006 Axelor SARL. (http://www.axelor.com)
-# and 2004-2009 Tiny SPRL (<http://tiny.be>).
+# Copyright (c) 2005-2006 Axelor SARL. (http://www.axelor.com) 
+# and 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 # $Id: hr.py 4656 2006-11-24 09:58:42Z Cyp $
 #
@@ -164,24 +164,6 @@ class hr_holidays(osv.osv):
     }
     _order = 'date_from desc'
 
-    def create(self, cr, uid, vals, context={}):
-        if context:
-            if context.has_key('type'):
-                vals['type'] = context['type']
-            if context.has_key('allocation_type'):
-                vals['allocation_type'] = context['allocation_type']
-        return super(osv.osv,self).create(cr, uid, vals, context)
-
-    #~ def _check_date(self, cr, uid, ids):
-        #~ if ids:
-             #~ cr.execute('select number_of_days from hr_holidays where id in ('+','.join(map(str, ids))+')')
-             #~ res = cr.fetchall()
-             #~ if res and res[0][0] <= 0:
-                 #~ return False
-        #~ return True
-
-    #_constraints = [(_check_date, 'Start date should not be greater than end date! ', ['number_of_days'])]
-
     def onchange_date_from(self, cr, uid, ids, date_to, date_from):
         result = {}
         if date_to and date_from:
@@ -197,6 +179,51 @@ class hr_holidays(osv.osv):
         }
         return result
 
+    def _update_user_holidays(self, cr, uid, ids):
+        for record in self.browse(cr, uid, ids):
+            if record.state=='validate':
+                holiday_id=self.pool.get('hr.holidays.per.user').search(cr, uid, [('employee_id','=', record.employee_id.id),('holiday_status','=',record.holiday_status.id)])
+                if holiday_id:
+                    obj_holidays_per_user=self.pool.get('hr.holidays.per.user').browse(cr, uid,holiday_id[0])
+                    self.pool.get('hr.holidays.per.user').write(cr,uid,obj_holidays_per_user.id,{'leaves_taken':obj_holidays_per_user.leaves_taken - record.number_of_days})
+                if record.case_id:
+                    if record.case_id.state <> 'draft':
+                        raise osv.except_osv(_('Warning !'),
+                    _('You can not cancel this holiday request. first You have to make its case in draft state.'))
+                    else:
+                        self.pool.get('crm.case').unlink(cr,uid,[record.case_id.id])
+                        
+    def _check_date(self, cr, uid, ids):
+        if ids:
+            cr.execute('select number_of_days from hr_holidays where id in ('+','.join(map(str, ids))+')')
+            res =  cr.fetchall()
+            if res and res[0][0] < 0:
+                return False
+        return True
+
+    _constraints = [(_check_date, 'Start date should not be larger than end date! ', ['number_of_days'])]
+
+    def create(self, cr, uid, vals, *args, **kwargs):
+        id_holiday = super(hr_holidays, self).create(cr, uid, vals, *args, **kwargs)
+        self._create_holiday(cr, uid, [id_holiday])
+        return id_holiday
+    
+    def unlink(self, cr, uid, ids, context={}):
+        self._update_user_holidays(cr, uid, ids)
+        return super(hr_holidays, self).unlink(cr, uid, ids, context)
+
+    def _create_holiday(self, cr, uid, ids):
+        holidays_user_obj = self.pool.get('hr.holidays.per.user')
+        holidays_data = self.browse(cr, uid, ids[0])
+        list_holiday = []
+        ids_user_hdays = holidays_user_obj.search(cr, uid, [('employee_id', '=', holidays_data.employee_id.id),('holiday_status', '=', holidays_data.holiday_status.id)])
+        for hdays in holidays_user_obj.browse(cr, uid, ids_user_hdays):
+            for req in hdays.holiday_ids:
+                list_holiday.append(req.id)
+        list_holiday.append(ids[0])
+        holidays_user_obj.write(cr, uid, ids_user_hdays, {'holiday_ids': [(6, 0, list_holiday)]})
+        return True
+
     def onchange_date_to(self, cr, uid, ids, date_from, date_to):
         result = {}
         if date_from and date_to:
@@ -290,16 +317,7 @@ class hr_holidays(osv.osv):
         return True
 
     def holidays_cancel(self, cr, uid, ids, *args):
-        for record in self.browse(cr, uid, ids):
-            if record.state=='validate':
-                if record.case_id:
-                    self.pool.get('crm.case').unlink(cr,uid,[record.case_id.id])
-                if record.linked_request_ids:
-                    list_ids = []
-                    for id in record.linked_request_ids:
-                        list_ids.append(id.id)
-                    self.holidays_cancel(cr,uid,list_ids)
-                    self.unlink(cr,uid,list_ids)
+        self._update_user_holidays(cr, uid, ids)
         self.write(cr, uid, ids, {
             'state':'cancel'
             })
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index 58b5b7355ba..ce5014773b0 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -1,23 +1,26 @@
 <?xml version="1.0" ?>
 <openerp>
-    <data>
-    <wizard string="Print Summary of Holidays"
-          name="hr.holidays.summary"
-          id="holidays_summary"/>
+	<data>
+	  <menuitem
+            id="hr.menu_hr_reporting"
+            name="Reporting"
+            parent="hr.menu_hr_root"
+            sequence="40" />
+	<wizard string="Print Summary of Holidays"
+		  name="hr.holidays.summary"
+		  id="holidays_summary"/>
+	<menuitem name="Print Summary of Holidays" parent="hr.menu_hr_reporting"
+		 action="holidays_summary"
+		 type="wizard"
+		 id="menu_holidays_summary" sequence="20"/>
 
-    <menuitem name="Print Summary of Holidays"
-        parent="hr.menu_hr_reporting"
-        action="holidays_summary"
-        type="wizard"
-        id="menu_holidays_summary"/>
+	 <!-- restrict menu access to HR Manager -->
+	 <record model='ir.ui.menu' id="menu_holidays_summary">
+		 <field eval="[(6,0,[ref('hr.group_hr_manager')])]" name="groups_id"/>
+  	 </record>
 
-     <!-- restrict menu access to HR Manager -->
-     <record model='ir.ui.menu' id="menu_holidays_summary">
-         <field eval="[(6,0,[ref('hr.group_hr_manager')])]" name="groups_id"/>
-     </record>
-
-    <wizard string="Print Summary of Employee's Holidays"
-        model="hr.employee" name="hr.holidays.summary.employee"
-        keyword="client_print_multi" id="wizard_holidays_summary" />
-    </data>
+	<wizard string="Print Summary of Employee's Holidays"
+		model="hr.employee" name="hr.holidays.summary.employee"
+		keyword="client_print_multi" id="wizard_holidays_summary" />
+ 	</data>
 </openerp>
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index dedad68b7fd..b8e6c2af47e 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-
+          <!--<menuitem
+            id="menu_hr_reporting"
+            name="Reporting"
+            parent="hr.menu_hr_root"
+            sequence="40" />-->
         <!-- Menu Items -->
 
         <record id="view_hr_holidays_filter" model="ir.ui.view">
@@ -145,11 +149,15 @@
         </record>
 
 
-        <menuitem
-            name="Leaves"
+
+       <!-- <menuitem
+          name="Holidays Management"
+            parent="hr.menu_hr_root"
+            id="menu_open_ask_holidays"/>-->
+	   <menuitem
+          name="Leaves" sequence="7"
             parent="hr.menu_hr_root"
             id="menu_open_ask_holidays"/>
-
         <record model="ir.actions.act_window" id="open_ask_holidays">
             <field name="name">Leave Request(s)</field>
             <field name="res_model">hr.holidays</field>
@@ -173,22 +181,28 @@
         <field name="act_window_id" ref="open_ask_holidays"/>
     </record>
 
-    <menuitem
+
+   <!--  <menuitem
+          name="Holidays Requests"
+            parent="menu_open_ask_holidays"
+            id="menu_open_ask_holidays_new"
+            action="open_ask_holidays"/>-->
+       <menuitem
           name="Leaves Requests"
-          parent="menu_open_ask_holidays"
-          id="menu_open_ask_holidays_new"
-          action="open_ask_holidays"/>
+            parent="menu_open_ask_holidays"
+            id="menu_open_ask_holidays_new"
+            action="open_ask_holidays"/>
 
-    <record model="ir.actions.act_window" id="open_allocation_holidays">
-        <field name="name">Allocation Request(s)</field>
-        <field name="res_model">hr.holidays</field>
-        <field name="view_type">form</field>
-        <field name="context">{'type':'add'}</field>
-        <field name="domain">[('type','=','add')]</field>
-        <field name="view_id" ref="allocation_leave_new" />
-    </record>
+        <record model="ir.actions.act_window" id="open_allocation_holidays">
+        	<field name="name">Allocation Request(s)</field>
+            <field name="res_model">hr.holidays</field>
+            <field name="view_type">form</field>
+            <field name="context">{'type':'add'}</field>
+            <field name="domain">[('type','=','add')]</field>
+            <field name="view_id" ref="allocation_leave_new" />
+        </record>
 
-    <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
+	<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="view_holiday"/>
@@ -202,11 +216,12 @@
         <field name="act_window_id" ref="open_allocation_holidays"/>
     </record>
 
-     <menuitem
-          name="Recuperation Days Requests"
-          parent="menu_open_ask_holidays"
-          id="menu_open_allocation_holidays"
-          action="open_allocation_holidays"/>
+
+    <!-- <menuitem
+          name="Allocation Requests"
+            parent="menu_open_ask_holidays"
+            id="menu_open_allocation_holidays"
+            action="open_allocation_holidays"/>-->
 
         <!-- holidays status -->
         <record model="ir.ui.view" id="edit_holiday_status_form">
@@ -243,15 +258,15 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem
-            name="Leaves"
-            id="menu_leaves_config"
-            parent="hr.menu_hr_configuration"/>
-
-        <menuitem
+        <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
+		<!--<menuitem
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
-            parent="menu_leaves_config"/>
+            parent="hr.menu_hr_configuration"/>-->
+        <menuitem name="Leaves Statuses"
+            action="open_view_holiday_status"
+            id="menu_open_view_holiday_status"
+            parent="hr.menu_open_view_attendance_reason_config"/>
 
     <!--  Shortcuts -->
         <act_window name="My Holiday Requests"
diff --git a/addons/hr_holidays/migrations/1.5/post-00-change-requests-signs.py b/addons/hr_holidays/migrations/1.5/post-00-change-requests-signs.py
index a1d7a4f3826..9e4a5a45cb1 100644
--- a/addons/hr_holidays/migrations/1.5/post-00-change-requests-signs.py
+++ b/addons/hr_holidays/migrations/1.5/post-00-change-requests-signs.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py b/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
index 1d074a6f979..5ee6e894cf5 100644
--- a/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
+++ b/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_holidays/report/__init__.py b/addons/hr_holidays/report/__init__.py
index 25a40d603d5..39882f6cd59 100644
--- a/addons/hr_holidays/report/__init__.py
+++ b/addons/hr_holidays/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index 6349e207b35..e0cb697b3b9 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_holidays/wizard/__init__.py b/addons/hr_holidays/wizard/__init__.py
index bd4f91683b1..310328a15c1 100644
--- a/addons/hr_holidays/wizard/__init__.py
+++ b/addons/hr_holidays/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_holidays/wizard/holidays_summary.py b/addons/hr_holidays/wizard/holidays_summary.py
index 23a126ee92e..d60fc3b0873 100644
--- a/addons/hr_holidays/wizard/holidays_summary.py
+++ b/addons/hr_holidays/wizard/holidays_summary.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #    $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/hr_holidays/wizard/holidays_summary_employees.py b/addons/hr_holidays/wizard/holidays_summary_employees.py
index 1c6a607af36..a621e6d5912 100644
--- a/addons/hr_holidays/wizard/holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/holidays_summary_employees.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet/__init__.py b/addons/hr_timesheet/__init__.py
index ecb9b8c5fcb..f29aca0a003 100644
--- a/addons/hr_timesheet/__init__.py
+++ b/addons/hr_timesheet/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet/__terp__.py b/addons/hr_timesheet/__terp__.py
index 5ab88ac86d6..976242edc0c 100644
--- a/addons/hr_timesheet/__terp__.py
+++ b/addons/hr_timesheet/__terp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -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/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 61dfba9914b..9358cd085e9 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index a07afd0551c..4f6c32bbdce 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -1,31 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+      <menuitem
+            id="hr.menu_hr_reporting"
+            name="Reporting"
+            parent="hr.menu_hr_root"
+            sequence="40" />
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
-        
+
         <wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>
-        <menuitem id="next_id_48" name="Timesheet" parent="hr.menu_hr_reporting"/>
-        <menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="next_id_48" type="wizard"
+
+        <!--<menuitem id="next_id_48" name="Timesheet" parent="hr.menu_hr_reporting"/>-->
+       <!-- <menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="next_id_48" type="wizard"
+            groups="hr.group_hr_manager"/>-->
+        <menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="hr.menu_hr_reporting" type="wizard"
+
             groups="hr.group_hr_manager"
             />
-        
         <wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print My Timesheet"/>
         <menuitem
-            action="wizard_hr_timesheet_my" 
-            id="menu_wizard_hr_timesheet_my" 
-            parent="hr_timesheet.next_id_48"
+            action="wizard_hr_timesheet_my"
+            id="menu_wizard_hr_timesheet_my"
+            parent="hr.menu_hr_reporting"
             type="wizard"
             groups="hr.group_hr_user"
             />
-        
+
         <report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
-        
+
         <wizard id="wizard_hr_timesheet_users" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet"/>
-        <menuitem 
-            action="wizard_hr_timesheet_users" 
-            id="menu_wizard_hr_timesheet_users" 
+        <menuitem
+            action="wizard_hr_timesheet_users"
+            id="menu_wizard_hr_timesheet_users"
             groups="hr.group_hr_manager"
-            parent="hr_timesheet.next_id_48" type="wizard"/>
-        
+            parent="hr.menu_hr_reporting" type="wizard"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index a204dd867f2..9144d3b0ca3 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
+
     <data>
         <record id="hr_timesheet_line_tree" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.tree</field>
@@ -33,7 +34,7 @@
                     <newline/>
                     <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
-                    
+
                     <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" select="1"/>
                     <field name="amount" select="2"/>
                     <field name="general_account_id" select="2"/>
@@ -41,7 +42,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="hr_timesheet_line_search" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.search</field>
             <field name="model">hr.analytic.timesheet</field>
@@ -51,30 +52,42 @@
                     <group col='8' colspan='4'>
 	                    <filter icon="terp-hr" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
 	                    <filter icon="terp-hr" domain="[('user_id','=',uid)]" string="My Work" help="My Work"/>
-	                    <separator orientation="vertical"/>                    
+	                    <separator orientation="vertical"/>
 	                    <field name="user_id" select="1" widget="selection"/>
-	                    <field name="account_id" select="1" widget="selection"/>                    
+	                    <field name="account_id" select="1" widget="selection"/>
 	                    <field name="date" select="1"/>
                     </group>
                 </search>
             </field>
-        </record>        
 
-        <menuitem id="menu_act_hr_timesheet_line_today_form" parent="hr.menu_hr_time" name="Working Hours" />
-        
+        </record>
+
+      <!-- <menuitem id="menu_act_hr_timesheet_line_today_form" parent="hr.menu_hr_root" name="Working Hours" />-->
+
+        <record id="act_hr_timesheet_line_me_all_form" model="ir.actions.act_window">
+            <field name="name">My Working Hours</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.analytic.timesheet</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('user_id','=',uid)]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="hr_timesheet_line_search"/>
+        </record>
+
         <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
             <field name="name">Working Hours</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.analytic.timesheet</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="hr_timesheet_line_search"/>            
+            <field name="search_view_id" ref="hr_timesheet_line_search"/>
         </record>
-        <menuitem
+      <!--  <menuitem
             action="act_hr_timesheet_line_evry1_all_form"
             id="menu_act_hr_timesheet_line_evry1_all_form"
             parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"
-            groups="hr.group_hr_manager"/>
+            groups="hr.group_hr_manager"/>-->
 
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
@@ -89,5 +102,7 @@
                 </notebook>
             </field>
         </record>
+
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_wizard.xml b/addons/hr_timesheet/hr_timesheet_wizard.xml
index bed128a839e..b5f270fe0e8 100644
--- a/addons/hr_timesheet/hr_timesheet_wizard.xml
+++ b/addons/hr_timesheet/hr_timesheet_wizard.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <wizard id="si_so" model="hr.employee" name="hr_timesheet.si_so" string="Sign in / Sign out by project"/>
-        <menuitem action="si_so"  id="menu_si_so" parent="hr.menu_hr_time" type="wizard"/>
+       <!-- <menuitem action="si_so"  id="menu_si_so" parent="hr_attendance.menu_hr_attendance" type="wizard"/>-->
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/report/__init__.py b/addons/hr_timesheet/report/__init__.py
index 82db62d5833..156a4b83c63 100644
--- a/addons/hr_timesheet/report/__init__.py
+++ b/addons/hr_timesheet/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index cbe0489c351..8dbda07ea76 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index 9d284ef8bff..c179c3d3fff 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet/wizard/__init__.py b/addons/hr_timesheet/wizard/__init__.py
index b52c86321dd..88b1cb40415 100644
--- a/addons/hr_timesheet/wizard/__init__.py
+++ b/addons/hr_timesheet/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet/wizard/sign_in_out.py b/addons/hr_timesheet/wizard/sign_in_out.py
index 69be06a4b88..4aea035f829 100644
--- a/addons/hr_timesheet/wizard/sign_in_out.py
+++ b/addons/hr_timesheet/wizard/sign_in_out.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet/wizard/wizard_print_timesheet.py b/addons/hr_timesheet/wizard/wizard_print_timesheet.py
index 3acbb0e3e07..ba11d301762 100644
--- a/addons/hr_timesheet/wizard/wizard_print_timesheet.py
+++ b/addons/hr_timesheet/wizard/wizard_print_timesheet.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet/wizard/wizard_print_timesheet_users.py b/addons/hr_timesheet/wizard/wizard_print_timesheet_users.py
index 8e7205cb7f4..a00ddd00084 100644
--- a/addons/hr_timesheet/wizard/wizard_print_timesheet_users.py
+++ b/addons/hr_timesheet/wizard/wizard_print_timesheet_users.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet_invoice/__init__.py b/addons/hr_timesheet_invoice/__init__.py
index a0d0d5317e1..223ee7ea0c6 100644
--- a/addons/hr_timesheet_invoice/__init__.py
+++ b/addons/hr_timesheet_invoice/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet_invoice/__terp__.py b/addons/hr_timesheet_invoice/__terp__.py
index 8c39069a096..cbb2ace596a 100644
--- a/addons/hr_timesheet_invoice/__terp__.py
+++ b/addons/hr_timesheet_invoice/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 453076cdccf..41e65e2d8fc 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -72,7 +72,7 @@ account_analytic_account()
 class account_analytic_line(osv.osv):
     _inherit = 'account.analytic.line'
     _columns = {
-        'invoice_id': fields.many2one('account.invoice', 'Invoice'),
+        'invoice_id': fields.many2one('account.invoice', 'Invoice', ondelete="set null"),                
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing'),
     }
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index 3f48aa3b642..4b6f2c3d91d 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
+        <menuitem
+            id="hr.menu_hr_reporting"
+            name="Reporting"
+            parent="hr.menu_hr_root"
+            sequence="40" />
         <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
 
         <wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger.report" string="Cost Ledger"/>
@@ -23,8 +27,8 @@
             string="Timesheet Profit"
             groups="account.group_account_manager"/>
 
-       <menuitem action="account_analytic_profit" 
-           id="print_account_analytic_profit" 
+       <menuitem action="account_analytic_profit"
+           id="print_account_analytic_profit"
            parent="hr.menu_hr_reporting"
            type="wizard"
            groups="hr.group_hr_manager"/>
diff --git a/addons/hr_timesheet_invoice/report/__init__.py b/addons/hr_timesheet_invoice/report/__init__.py
index 0ffa8564276..9d87b1fdd1c 100644
--- a/addons/hr_timesheet_invoice/report/__init__.py
+++ b/addons/hr_timesheet_invoice/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.py b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
index ec7f6cd26bf..c9873f07f18 100644
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet_invoice/report/cost_ledger.py b/addons/hr_timesheet_invoice/report/cost_ledger.py
index 6541ac494af..9bde3837790 100644
--- a/addons/hr_timesheet_invoice/report/cost_ledger.py
+++ b/addons/hr_timesheet_invoice/report/cost_ledger.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -87,7 +87,7 @@ class account_analytic_cost_ledger(report_sxw.rml_parse):
             revenue = 0.0
             if lines[id].amount < 0 and lines[id].product_id and lines[id].product_uom_id and lines[id].account_id.pricelist_id:
                 ctx = {'uom': lines[id].product_uom_id.id}
-                price = price_obj.price_get(self.cr, self.uid, [lines[id].pricelist_id.id], lines[id].product_id.id, lines[id].unit_amount, ctx)[lines[id].pricelist_id.id]
+                price = price_obj.price_get(self.cr, self.uid, [lines[id].account_id.pricelist_id.id], lines[id].product_id.id, lines[id].unit_amount, ctx)[lines[id].account_id.pricelist_id.id]
                 revenue = round(price * lines[id].unit_amount, 2)
             r['revenue'] = revenue
             self.sum_revenue[account_id] += revenue
diff --git a/addons/hr_timesheet_invoice/wizard/__init__.py b/addons/hr_timesheet_invoice/wizard/__init__.py
index fc3c3407b9f..e1948e45406 100644
--- a/addons/hr_timesheet_invoice/wizard/__init__.py
+++ b/addons/hr_timesheet_invoice/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
index 572c117eafb..c2d4aecd171 100644
--- a/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -22,6 +22,7 @@
 import wizard
 import datetime
 import pooler
+from tools.translate import _
 
 form='''<?xml version="1.0"?>
 <form string="Choose">
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 78a8a620c41..9f3a3ae4486 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 225b55be9c5..a7a0a4b6a51 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -35,6 +35,13 @@ class invoice_create(wizard.interface):
     def _get_accounts(self, cr, uid, data, context):
         if not len(data['ids']):
             return {}
+        #Checking whether the analytic line is invoiced or not
+        pool = pooler.get_pool(cr.dbname)
+        analytic_line_obj = pool.get('account.analytic.line').browse(cr, uid, data['ids'], context)
+        for obj_acc in analytic_line_obj:
+            if obj_acc.invoice_id and obj_acc.invoice_id.state !='cancel':
+                raise wizard.except_wizard(_('Warning'),_('The analytic entry "%s" is already invoiced!')%(obj_acc.name,))
+        
         cr.execute("SELECT distinct(account_id) from account_analytic_line where id IN (%s)"% (','.join(map(str,data['ids'])),))
         account_ids = cr.fetchall()
         return {'accounts': [x[0] for x in account_ids]}
diff --git a/addons/hr_timesheet_invoice/wizard/wizard_account_analytic_cost_ledger_report.py b/addons/hr_timesheet_invoice/wizard/wizard_account_analytic_cost_ledger_report.py
index 2f502abe3bb..632f7f84268 100644
--- a/addons/hr_timesheet_invoice/wizard/wizard_account_analytic_cost_ledger_report.py
+++ b/addons/hr_timesheet_invoice/wizard/wizard_account_analytic_cost_ledger_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet_sheet/__init__.py b/addons/hr_timesheet_sheet/__init__.py
index e3041fd18f8..46961316bb4 100644
--- a/addons/hr_timesheet_sheet/__init__.py
+++ b/addons/hr_timesheet_sheet/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__terp__.py
index 7cc7044e473..68a4db8f82d 100644
--- a/addons/hr_timesheet_sheet/__terp__.py
+++ b/addons/hr_timesheet_sheet/__terp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -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/>.
 #
 ##############################################################################
 
@@ -45,7 +45,7 @@ The validation can be configured in te company:
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process'],
+    'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process','hr_attendance'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 1ec0b0bc9a2..c63e19bd582 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -319,9 +319,12 @@ class hr_timesheet_sheet(osv.osv):
                     context, load='_classic_write')]
 
     def unlink(self, cr, uid, ids, context=None):
-        sheets = self.read(cr, uid, ids, ['state'])
-        if any(s['state'] in ('confirm', 'done') for s in sheets):
-            raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sheet(s) which are already confirmed !'))
+        sheets = self.read(cr, uid, ids, ['state','total_attendance'])
+        for sheet in sheets:
+            if sheet['state'] in ('confirm', 'done'):
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sheet(s) which are already confirmed !'))
+            elif sheet['total_attendance'] <> 0.00:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sheet(s) which have attendance entries encoded !'))
         return super(hr_timesheet_sheet, self).unlink(cr, uid, ids, context=context)
 
 hr_timesheet_sheet()
@@ -362,7 +365,7 @@ class hr_timesheet_line(osv.osv):
                 res[line_id] = False
         return res
 
-    def _sheet_search(self, cursor, user, obj, name, args):
+    def _sheet_search(self, cursor, user, obj, name, args, context):
         if not len(args):
             return []
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
@@ -639,8 +642,10 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
                             from
                                 hr_attendance a
                                 LEFT JOIN (hr_timesheet_sheet_sheet s
-                                    LEFT JOIN hr_employee e
-                                    ON (s.user_id = e.user_id))
+                                    LEFT JOIN resource_resource r
+                                        LEFT JOIN hr_employee e
+                                        ON (e.resource_id = r.id)
+                                    ON (s.user_id = r.user_id))
                                 ON (a.employee_id = e.id
                                     AND s.date_to >= date_trunc('day',a.name)
                                     AND s.date_from <= a.name)
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index da5d1695bea..6e3c8c39004 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -46,7 +46,7 @@
                 </tree>
             </field>
         </record>
-
+<!-- 
         <record id="hr_timesheet_day_form" model="ir.ui.view">
             <field name="name">hr.timesheet.day.form</field>
             <field name="model">hr_timesheet_sheet.sheet.day</field>
@@ -61,7 +61,7 @@
                 </form>
             </field>
         </record>
-
+ 
         <record id="hr_timesheet_day_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.day.tree</field>
             <field name="model">hr_timesheet_sheet.sheet.day</field>
@@ -76,7 +76,7 @@
                 </tree>
             </field>
         </record>
-
+-->
         <record id="hr_timesheet_sheet_form" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.form</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
@@ -200,9 +200,9 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
-        <menuitem 
-            action="act_hr_timesheet_sheet_form" 
-            id="menu_act_hr_timesheet_sheet_form" parent="hr.menu_hr_time"/>
+        <!--<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>-->
+        <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
+            groups="hr.group_hr_manager"/>
 
         <!--
             Company inheritancy
@@ -266,7 +266,7 @@
         </record>
 
         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_day" name="Timesheet by Account" res_model="hr_timesheet_sheet.sheet.account" src_model="hr_timesheet_sheet.sheet"/>
-        <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_account" name="Timesheet by Day" res_model="hr_timesheet_sheet.sheet.day" src_model="hr_timesheet_sheet.sheet"/>
+<!--         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_account" name="Timesheet by Day" res_model="hr_timesheet_sheet.sheet.day" src_model="hr_timesheet_sheet.sheet"/>  -->
 
 
         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet" name="Timesheet Lines" res_model="hr.analytic.timesheet" src_model="hr_timesheet_sheet.sheet"/>
diff --git a/addons/hr_timesheet_sheet/wizard/__init__.py b/addons/hr_timesheet_sheet/wizard/__init__.py
index ae8cde79a68..f6fba6021af 100644
--- a/addons/hr_timesheet_sheet/wizard/__init__.py
+++ b/addons/hr_timesheet_sheet/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py
index d5a7a00e082..8613df3bc82 100644
--- a/addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py
+++ b/addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/hr_timesheet_sheet/wizard/wizard_timesheet_department.py b/addons/hr_timesheet_sheet/wizard/wizard_timesheet_department.py
index 3528e1261c1..93aa12045ba 100644
--- a/addons/hr_timesheet_sheet/wizard/wizard_timesheet_department.py
+++ b/addons/hr_timesheet_sheet/wizard/wizard_timesheet_department.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/idea/__init__.py b/addons/idea/__init__.py
index 98e01736675..2aa68d00eff 100644
--- a/addons/idea/__init__.py
+++ b/addons/idea/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -20,5 +20,6 @@
 ##############################################################################
 
 import idea
+import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/idea/__terp__.py b/addons/idea/__terp__.py
index e7f145df346..c56d89e669a 100644
--- a/addons/idea/__terp__.py
+++ b/addons/idea/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -30,10 +30,11 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
+        'idea_wizard.xml',
         'idea_view.xml',
         'idea_workflow.xml',
         'security/idea_security.xml',
-        'security/ir.model.access.csv'
+        'security/ir.model.access.csv',        
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/idea/i18n/el.po b/addons/idea/i18n/el.po
new file mode 100644
index 00000000000..3ff44e1c7c0
--- /dev/null
+++ b/addons/idea/i18n/el.po
@@ -0,0 +1,383 @@
+# Greek 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-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-01-18 19:17+0000\n"
+"Last-Translator: spyros <Unknown>\n"
+"Language-Team: Greek <el@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-01-19 04:41+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: idea
+#: field:idea.category,name:0
+#: field:idea.idea,category_id:0
+msgid "Category"
+msgstr "Κατηγορία"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Very Good"
+msgstr "Πολύ Καλό"
+
+#. module: idea
+#: view:idea.idea:0
+#: field:idea.idea,stat_vote_ids:0
+msgid "Statistics"
+msgstr "Στατιστικά"
+
+#. module: idea
+#: 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 "Οι ιδέες μου"
+
+#. module: idea
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ιδέα"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Not Voted"
+msgstr "Δεν έχει ψήφους"
+
+#. 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 ""
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_idea
+#: model:ir.ui.menu,name:idea.menu_ideas
+#: model:ir.ui.menu,name:idea.menu_ideas1
+msgid "Ideas"
+msgstr "Ιδέες"
+
+#. module: idea
+#: field:idea.category,child_ids:0
+msgid "Child Categories"
+msgstr "Παράγωγες Κατηγορίες"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "New Idea"
+msgstr "Νέα Ιδέα"
+
+#. 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 "Ιδέες Ανά Κατηγορία"
+
+#. module: idea
+#: field:idea.vote,score:0
+#: field:idea.vote.stat,score:0
+msgid "Score"
+msgstr "Βαθμολογία"
+
+#. module: idea
+#: selection:idea.idea,state:0
+msgid "Draft"
+msgstr "Πρόχειρο"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_vote
+msgid "Idea's vote"
+msgstr "Βαθμολογία Ιδέας"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_vote_stat
+msgid "Statistics on Votes"
+msgstr "Στατιστικά Βαθμολογίας"
+
+#. module: idea
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και δεν πρέπει να περιέχει "
+"ειδικούς χαρακτήρες!"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_category
+msgid "Category for an idea"
+msgstr "Κατηγορία Για Μια Ιδέα"
+
+#. module: idea
+#: model:ir.module.module,shortdesc:idea.module_meta_information
+msgid "Idea Manager"
+msgstr "Διαχείρηση Ιδεών"
+
+#. module: idea
+#: model:ir.ui.menu,name:idea.menu_idea_vote_stat
+msgid "Vote Statistics"
+msgstr "Στατιστικά ψήφων"
+
+#. module: idea
+#: selection:idea.idea,state:0
+msgid "Opened"
+msgstr "Ανοιχτές"
+
+#. module: idea
+#: field:idea.idea,state:0
+msgid "Status"
+msgstr "Κατάσταση"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Good"
+msgstr "Καλή."
+
+#. module: idea
+#: field:idea.idea,description:0
+msgid "Description"
+msgstr "Περιγραφή"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Normal"
+msgstr "Κανονική"
+
+#. module: idea
+#: model:ir.ui.menu,name:idea.menu_reporting
+msgid "Reporting"
+msgstr "Αναφορές"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_vote_stat
+msgid "Idea Votes Statistics"
+msgstr "Στατιστικά Ψήφων Ιδέας"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_vote
+msgid "idea.vote"
+msgstr ""
+
+#. module: idea
+#: field:idea.comment,user_id:0
+#: field:idea.vote,user_id:0
+msgid "User"
+msgstr "Χρήστης"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Your comment"
+msgstr "Τα σχόλιά σας"
+
+#. module: idea
+#: model:ir.ui.menu,name:idea.menu_config
+msgid "Configuration"
+msgstr "Παραμετροποίηση"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_category
+#: model:ir.ui.menu,name:idea.menu_idea_category
+msgid "Categories"
+msgstr ""
+
+#. module: idea
+#: view:idea.stat:0
+msgid "stat"
+msgstr ""
+
+#. module: idea
+#: field:idea.idea,my_vote:0
+msgid "My Vote"
+msgstr ""
+
+#. module: idea
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: idea
+#: view:idea.vote:0
+msgid "Votes"
+msgstr ""
+
+#. module: idea
+#: model:ir.module.module,description:idea.module_meta_information
+msgid ""
+"This module allows your user to easily and efficiently participate in the "
+"innovation of the enterprise. It allows everybody to express ideas about "
+"different subjects. Then, others users can comment these ideas and vote for "
+"particular ideas. Each idea as a score based on the different votes. The "
+"managers can obtain an easy view on best ideas from all the users. Once "
+"installed, check the menu 'Ideas' in the 'Tools' main menu."
+msgstr ""
+
+#. module: idea
+#: field:idea.comment,create_date:0
+#: field:idea.idea,create_date:0
+msgid "Creation date"
+msgstr ""
+
+#. module: idea
+#: field:idea.idea,count_votes:0
+msgid "Count of votes"
+msgstr ""
+
+#. module: idea
+#: field:idea.vote.stat,nbr:0
+msgid "Number of Votes"
+msgstr ""
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_idea
+msgid "idea.idea"
+msgstr ""
+
+#. 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 ""
+
+#. module: idea
+#: field:idea.idea,vote_ids:0
+msgid "Vote"
+msgstr ""
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Bad"
+msgstr ""
+
+#. module: idea
+#: view:idea.idea:0
+#: model:ir.ui.menu,name:idea.menu_idea_idea
+msgid "All Ideas"
+msgstr ""
+
+#. module: idea
+#: view:idea.comment:0
+#: view:idea.idea:0
+#: field:idea.idea,comment_ids:0
+#: model:ir.model,name:idea.model_idea_comment
+msgid "Comments"
+msgstr ""
+
+#. module: idea
+#: field:idea.idea,count_comments:0
+msgid "Count of comments"
+msgstr ""
+
+#. module: idea
+#: field:idea.idea,title:0
+msgid "Idea Summary"
+msgstr ""
+
+#. module: idea
+#: view:idea.category:0
+msgid "Category of ideas"
+msgstr ""
+
+#. module: idea
+#: field:idea.category,summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
+#: 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 ""
+
+#. module: idea
+#: view:idea.idea:0
+#: view:idea.vote.stat:0
+msgid "vote_stat of ideas"
+msgstr ""
+
+#. module: idea
+#: view:idea.comment:0
+#: field:idea.comment,content:0
+#: view:idea.idea:0
+msgid "Comment"
+msgstr ""
+
+#. module: idea
+#: field:idea.category,parent_id:0
+msgid "Parent Categories"
+msgstr ""
+
+#. module: idea
+#: field:idea.idea,user_id:0
+msgid "Creator"
+msgstr ""
+
+#. module: idea
+#: model:ir.ui.menu,name:idea.menu_tools
+msgid "Tools"
+msgstr ""
+
+#. module: idea
+#: field:idea.comment,idea_id:0
+#: view:idea.idea:0
+#: field:idea.vote,idea_id:0
+#: field:idea.vote.stat,idea_id:0
+msgid "Idea"
+msgstr ""
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Very Bad"
+msgstr ""
+
+#. module: idea
+#: selection:idea.idea,state:0
+msgid "Canceled"
+msgstr ""
+
+#. module: idea
+#: model:ir.ui.menu,name:idea.menu_idea_vote
+msgid "All Votes"
+msgstr ""
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Cancel"
+msgstr ""
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Close"
+msgstr ""
+
+#. module: idea
+#: field:idea.idea,vote_avg:0
+msgid "Average Score"
+msgstr ""
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Open"
+msgstr ""
+
+#. module: idea
+#: help:idea.idea,description:0
+msgid "Content of the idea"
+msgstr ""
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 915420f070d..195140e99ba 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -174,6 +174,7 @@ class idea_vote(osv.osv):
         'score': fields.selection( VoteValues, 'Score', required=True)
     }
     _defaults = {
+        #'user_id': lambda self, cr, uid, context: uid,
         'score': lambda *a: DefaultVoteValue,
     }
 idea_vote()
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 1dd97ab5f9b..fb705f820ca 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    <menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES" />
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" />
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
             <field name="model">idea.category</field>
@@ -32,8 +32,10 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-    <menuitem name="Configuration" parent="menu_tools" id="menu_config"/>
-    <menuitem name="Ideas" parent="menu_config" id="menu_ideas"/>
+    <menuitem name="Configuration" parent="base.menu_tools"
+         id="base.menu_lunch_survey_root" sequence="6"/>
+<!--    <menuitem name="Configuration" parent="menu_tools" id="menu_config"/>-->
+    <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas"/>
     <menuitem name="Categories" parent="menu_ideas" id="menu_idea_category" action="action_idea_category"/>
 
     <record model="ir.actions.act_window" id="action_idea_category_tree">
@@ -42,10 +44,10 @@
         <field name="view_type">tree</field>
         <field name="domain">[('parent_id','=',False)]</field>
     </record>
-    <menuitem name="Ideas" parent="menu_tools" id="menu_ideas1"/>
-    <menuitem 
-        name="Ideas by Categories" parent="menu_ideas1" 
-        id="menu_idea_category_tree" 
+    <menuitem name="Ideas" parent="base.menu_tools" id="menu_ideas1" sequence="4"/>
+    <menuitem
+        name="Ideas by Categories" parent="menu_ideas1"
+        id="menu_idea_category_tree"
         action="action_idea_category_tree"/>
 
 
@@ -113,7 +115,7 @@
                     <field name="title" select="1" />
                     <field name="category_id" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="my_vote"/>
+                    <!--<field name="my_vote"/>-->
                     <field name="vote_avg" />
                     <field name="description" colspan="4" select="2" widget="text_wiki"/>
                     <field name="state" select="2"/>
@@ -131,6 +133,9 @@
                         </form>
                     </field>
                 </page>
+                <page string="Vote">
+                    <field name="vote_ids" nolabel="1" colspan="4" />
+                </page>
                 <page string="Statistics">
                     <field name="stat_vote_ids" colspan="4" mode="graph,tree" nolabel="1">
                         <graph string="vote_stat of ideas" type="bar">
@@ -155,16 +160,17 @@
         <field name="arch" type="xml">
         <tree string="All Ideas">
             <field name="category_id" />
-            <field name="create_date"/> 
+            <field name="create_date"/>
             <field name="user_id" />
             <field name="title"/>
             <field name="vote_avg" />
             <field name="count_comments" />
             <field name="count_votes" />
+            <button name="%(wizard_idea_post_vote)d" icon="gtk-execute" type="action" states="draft,open" string="Vote"/>
         </tree>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="view_idea_idea_search">
         <field name="name">idea.idea.search</field>
         <field name="model">idea.idea</field>
@@ -204,7 +210,7 @@
         <field name="view_mode">tree,form</field>
         <field name="search_view_id" ref="view_idea_idea_search"/>
     </record>
-    <menuitem name="All Ideas" parent="menu_ideas1" id="menu_idea_idea" action="action_idea_idea"/>
+    <menuitem name="Ideas" parent="menu_ideas1" id="menu_idea_idea" action="action_idea_idea"/>
 
     <record model="ir.actions.act_window" id="action_idea_idea_open">
         <field name="name">Open Ideas</field>
@@ -212,7 +218,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state','=','open')]</field>
-        <field name="filter" eval="True"/>        
+        <field name="filter" eval="True"/>
     </record>
 
         <record model="ir.ui.view" id="view_idea_vote_stat_graph">
@@ -258,8 +264,10 @@
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
     </record>
-    <menuitem name="Reporting" parent="menu_ideas1" id="menu_reporting"/>
-    <menuitem name="Vote Statistics" parent="menu_reporting" id="menu_idea_vote_stat" action="action_idea_vote_stat"/>
+	<menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="5"/>
+<!--    <menuitem name="Reporting" parent="menu_ideas1" id="menu_reporting"/>-->
+	<menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting"/>
+    <menuitem name="Vote Statistics" parent="menu_idea_reporting" id="menu_idea_vote_stat" action="action_idea_vote_stat"/>
 
 
     <record model="ir.actions.act_window" id="action_idea_vote">
diff --git a/addons/idea/idea_wizard.xml b/addons/idea/idea_wizard.xml
new file mode 100644
index 00000000000..206be1dfcaf
--- /dev/null
+++ b/addons/idea/idea_wizard.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <wizard
+            id="wizard_idea_post_vote"
+            model="idea.idea"
+            name="idea.post.vote"
+			menu="True"
+            string="Vote"/>
+
+       
+    </data>
+</openerp>
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 522560a0bb5..6fd4b290086 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-		<record id="idea.menu_config" model="ir.ui.menu">
-			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>
-		</record>
-
-		<record id="idea.menu_reporting" model="ir.ui.menu">
-			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>
-		</record>
+<!--		<record id="idea.menu_config" model="ir.ui.menu">-->
+<!--			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>-->
+<!--		</record>-->
+<!---->
+<!--		<record id="idea.menu_reporting" model="ir.ui.menu">-->
+<!--			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>-->
+<!--		</record>-->
 	</data>
 </openerp>
 
diff --git a/addons/idea/wizard/__init__.py b/addons/idea/wizard/__init__.py
new file mode 100644
index 00000000000..2db6aa6982c
--- /dev/null
+++ b/addons/idea/wizard/__init__.py
@@ -0,0 +1,22 @@
+# -*- 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 idea_vote
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/idea/wizard/idea_vote.py b/addons/idea/wizard/idea_vote.py
new file mode 100644
index 00000000000..c040aa45be5
--- /dev/null
+++ b/addons/idea/wizard/idea_vote.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import wizard
+import ir
+from mx.DateTime import now
+import pooler
+import netsvc
+
+vote_form = """<?xml version="1.0" ?>
+<form string="Create Tasks">
+    <field name="vote"/>
+</form>"""
+
+vote_fields = {
+      'vote': {'string': 'Post Vote', 'type': 'selection',
+        'selection': [('-1','Not Voted'),('0','Very Bad'),('25', 'Bad'),('50','Normal'),('75','Good'),('100','Very Good') ]},
+}
+
+
+
+class idea_vote(wizard.interface):
+    def _do_vote(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        vote_obj = pool.get('idea.vote')
+        score=str(data['form']['vote'])
+        dic={'idea_id' : data['id'], 'user_id' : uid, 'score' : score }
+        vote=vote_obj.create(cr,uid,dic)
+        return True
+
+    states = {
+        'init':{
+            'actions': [],
+            'result': {'type':'form', 'arch':vote_form, 'fields':vote_fields, 'state':[('end', 'Cancel'), ('post', 'Post Vote')] },
+        },
+        'post':{
+            'actions': [],
+            'result': {'type':'action', 'action': _do_vote, 'state':'end'},
+        },
+    }
+idea_vote('idea.post.vote')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/knowledge/__init__.py b/addons/knowledge/__init__.py
new file mode 100644
index 00000000000..3511d091ecb
--- /dev/null
+++ b/addons/knowledge/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import installer
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/knowledge/__terp__.py b/addons/knowledge/__terp__.py
new file mode 100644
index 00000000000..361e0143a2c
--- /dev/null
+++ b/addons/knowledge/__terp__.py
@@ -0,0 +1,39 @@
+# -*- 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" : "Knowledge Management System",
+    "version" : "1.0",
+    "depends" : ["base"],
+    "author" : "Tiny",
+    "description": """Installer for knowledge-based tools
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': [
+        'knowledge_installer.xml',
+    ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py
new file mode 100644
index 00000000000..71c54de8d99
--- /dev/null
+++ b/addons/knowledge/installer.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+
+class knowledge_installer(osv.osv_memory):
+    _name = 'knowledge.installer'
+    _inherit = 'res.config.installer'
+
+    _columns = {
+        # Knowledge Management
+        'document_ftp':fields.boolean('Shared Repositories (FTP)'),
+        'document_webdav':fields.boolean('Shared Repositories (WebDAV)'),
+        'wiki':fields.boolean('Collaborative Content (Wiki)'),
+        # Templates of Content
+        'wiki_faq':fields.boolean('Internal FAQ'),
+        'wiki_quality_manual':fields.boolean('Quality Manual'),
+        }
+    _defaults = {
+        'document_ftp':True,
+        }
+
+knowledge_installer()
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
new file mode 100644
index 00000000000..5f8c19e568c
--- /dev/null
+++ b/addons/knowledge/knowledge_installer.xml
@@ -0,0 +1,65 @@
+<openerp>
+  <data>
+    <record id="view_knowledge_installer" model="ir.ui.view">
+      <field name="name">knowledge.installer.view</field>
+      <field name="model">knowledge.installer</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="arch" type="xml">
+        <data>
+          <form position="attributes"><attribute name="string">
+              Knowledge Modules Installation
+          </attribute></form>
+
+          <group string="res_config_contents" position="replace">
+            <separator string="Configure Your Knowledge Management System"
+                       colspan="4"/>
+            <image name="gtk-dialog-info"/>
+            <newline/>
+            <label align="0.0" string=" Lorem ipsum dolor
+                sit amet, consectetur adipiscing elit. Cras metus
+                augue, ultricies et vehicula id, fringilla quis
+                mauris. Vestibulum fringilla ipsum sit amet est
+                adipiscing eget euismod velit semper. Proin non mauris
+                velit. Donec malesuada nisi sed augue viverra commodo
+                sagittis nisi rutrum. Cras vitae libero nunc, a
+                molestie sapien. Proin et augue sit amet est egestas
+                fermentum ut eu lacus. Etiam nisi orci, volutpat
+                aliquam viverra interdum, vehicula iaculis
+                lectus. Mauris ligula sapien, auctor in pharetra non,
+                ultrices quis odio."/>
+            <group>
+              <separator string="Knowledge Management" colspan="4"/>
+              <field name="document_ftp"/>
+              <field name="document_webdav"/>
+              <field name="wiki"/>
+              <separator string="Templates of Content" colspan="4"/>
+              <field name="wiki_faq"/>
+              <field name="wiki_quality_manual"/>
+            </group>
+          </group>
+
+          <xpath expr='//button[@name="action_skip"]' position='replace'/>
+          <xpath expr='//button[@name="action_next"]' position='attributes'>
+            <attribute name='string'>Install Modules</attribute>
+          </xpath>
+        </data>
+      </field>
+    </record>
+
+    <record id="action_knowledge_installer" model="ir.actions.act_window">
+      <field name="name">Knowledge Modules Installation</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">knowledge.installer</field>
+      <field name="view_id" ref="view_knowledge_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="knowledge_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_knowledge_installer"/>
+      <field name="sequence">1</field>
+    </record>
+  </data>
+</openerp>
diff --git a/addons/l10n_be/__init__.py b/addons/l10n_be/__init__.py
index 3b3e6516ff6..444b6e3c625 100644
--- a/addons/l10n_be/__init__.py
+++ b/addons/l10n_be/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__terp__.py
index ca0a14e7e70..84e3354a332 100644
--- a/addons/l10n_be/__terp__.py
+++ b/addons/l10n_be/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index e657d259e60..9281d3c45ac 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -7021,8 +7021,8 @@
             <field name="description">VI 0</field>
             <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_a47"/>
-            <field name="ref_base_code_id" ref="vat_code_a49"/>
+            <field name="base_code_id" ref="vat_code_a46"/>
+            <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
         </record>
     <!-- Purchases VAT -->
diff --git a/addons/l10n_be/company.py b/addons/l10n_be/company.py
index a7646c527bb..8d6633b0d88 100644
--- a/addons/l10n_be/company.py
+++ b/addons/l10n_be/company.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
index b170bc93f4d..c20f1c62420 100644
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ b/addons/l10n_be/l10n_be_wizard.xml
@@ -49,9 +49,6 @@
         id="partner_intra_vat_menu"/>
 
     <record id="config_call_account_template" model="ir.actions.todo">
-        <field name="name">Generate Chart of Accounts from a Chart Template</field>
-        <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
     </record>
 
diff --git a/addons/l10n_be/wizard/__init__.py b/addons/l10n_be/wizard/__init__.py
index 0d48d8a194a..1050e8e2ee9 100644
--- a/addons/l10n_be/wizard/__init__.py
+++ b/addons/l10n_be/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/l10n_be/wizard/account_vat_declaration.py b/addons/l10n_be/wizard/account_vat_declaration.py
index 81eba3e0a84..6533493ce23 100644
--- a/addons/l10n_be/wizard/account_vat_declaration.py
+++ b/addons/l10n_be/wizard/account_vat_declaration.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/l10n_be/wizard/partner_vat_listing.py b/addons/l10n_be/wizard/partner_vat_listing.py
index 6369537ec62..30b2b792f73 100644
--- a/addons/l10n_be/wizard/partner_vat_listing.py
+++ b/addons/l10n_be/wizard/partner_vat_listing.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/l10n_be/wizard/wizard_vat_intra.py b/addons/l10n_be/wizard/wizard_vat_intra.py
index b79c35be612..605313e3541 100644
--- a/addons/l10n_be/wizard/wizard_vat_intra.py
+++ b/addons/l10n_be/wizard/wizard_vat_intra.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/l10n_ch/account_journal_view.xml b/addons/l10n_ch/account_journal_view.xml
index cfe3db3573d..120bb1565ea 100755
--- a/addons/l10n_ch/account_journal_view.xml
+++ b/addons/l10n_ch/account_journal_view.xml
@@ -4,41 +4,45 @@
             <field name="name">account.journal.todo.form</field>
             <field name="model">account.journal.todo</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Account Journal">
-                    <group colspan="4" col="6">
-                        <field name="name" select="1"/>
-                    </group>
-                    <separator colspan="4" string="The accounts linked to the account journals"/>
-                    <field name="default_credit_account_id"
-                        on_change="on_change_credit(name, default_credit_account_id)" select="1"/>
-                    <field name="default_debit_account_id"
-                        on_change="on_change_debit(name, default_debit_account_id)" select="1"/>
-                    <group col="4" colspan="4">
-						<button icon="gtk-cancel" name="action_cancel" string="Cancel" type="object"/>
-						<button icon="gtk-ok" name="action_new" string="Next" type="object"/>
-
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Account Journal
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    Set accounts on financial journals defined by CamptoCamp
+                    l10n_ch module"/>
+                  <separator colspan="4"/>
+                  <group colspan="4" col="6">
+                    <field name="name" select="1"/>
+                  </group>
+                  <separator colspan="4" string="
+                    The accounts linked to the account journals"/>
+                  <field name="default_credit_account_id" select="1"
+                         on_change="on_change_credit(name, default_credit_account_id)"/>
+                  <field name="default_debit_account_id" select="1"
+                         on_change="on_change_debit(name, default_debit_account_id)"/>
+                </group>
+                <xpath expr="//button[@name='action_next']" position="attributes">
+                  <attribute name="string">Next</attribute>
+                </xpath>
+              </data>
             </field>
         </record>
-		<record id="action_config_journal" model="ir.actions.act_window">
-            <field name="name">Configure Journal</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.journal.todo</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-			<field name="view_id" ref="view_account_journal_form_todo"/>
-            <field name="target">new</field>
+        <record id="action_config_journal" model="ir.actions.act_window">
+          <field name="name">Finalize your Journal</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">account.journal.todo</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="view_id" ref="view_account_journal_form_todo"/>
+          <field name="target">new</field>
         </record>
-
-
         <record id="action_config_journal_todo" model="ir.actions.todo">
-            <field name="name">Finalize your journal</field>
-            <field name="note">Set accounts on financial journals defined by
-			Camptocamp l10n_ch module</field>
-            <field name="action_id" ref="action_config_journal"/>
-            <field name="sequence">5</field>
+          <field name="action_id" ref="action_config_journal"/>
+          <field name="sequence">5</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_ch/wizard/journal_config.py b/addons/l10n_ch/wizard/journal_config.py
index 38422913e9c..f28a1ea69d8 100755
--- a/addons/l10n_ch/wizard/journal_config.py
+++ b/addons/l10n_ch/wizard/journal_config.py
@@ -31,14 +31,11 @@
 ##############################################################################
 from osv import fields, osv
 
-
-class Journal(osv.osv):
+class Journal(osv.osv_memory):
     """Create account.journal.todo in order to add configuration wizzard"""
-
     _name ="account.journal.todo"
-    
-    
-    
+    _inherit = 'res.config'
+
     def _get_journal(self, cr, uid, ctx):
         if not self.__dict__.has_key('_inner_steps') :
             self._inner_steps = 0
@@ -47,36 +44,30 @@ class Journal(osv.osv):
             return False
         return ids[self._inner_steps]
         
-
     def _get_debit(self, cr, uid, ctx):
         if not self.__dict__.has_key('_inner_steps') :
             self._inner_steps = 0
         if self._inner_steps == 'done' :
             return False
         ids = self.pool.get('account.journal').search(cr,uid,[])
-        id = self.pool.get('account.journal').browse(
+        return self.pool.get('account.journal').browse(
             cr,
             uid,
             ids[self._inner_steps]
         ).default_debit_account_id.id
         
-        return id
-        
     def _get_credit(self, cr, uid, ctx):
         if not self.__dict__.has_key('_inner_steps') :
             self._inner_steps = 0
         if self._inner_steps == 'done' :
             return False
         ids = self.pool.get('account.journal').search(cr,uid,[])
-        id = self.pool.get('account.journal').browse(
+        return self.pool.get('account.journal').browse(
             cr,
             uid,
             ids[self._inner_steps]
         ).default_credit_account_id.id
         
-        return id
-    
-        
     _columns={
         'name': fields.many2one(
             'account.journal',
@@ -107,61 +98,32 @@ class Journal(osv.osv):
     def on_change_debit(self, cr, uid, id, journal, account) :
         if account :
             self.pool.get('account.journal').write(
-                                        cr,
-                                        uid, 
-                                        journal,
-                                        vals={
-                                            'default_debit_account_id': account,
-                                        }
-                                        )
-    
-        
-        
+                cr, uid, journal,
+                vals={'default_debit_account_id': account,}
+                )
         return {}
         
     def on_change_credit(self, cr, uid, id, journal, account) :
         if account : 
             self.pool.get('account.journal').write(
-                                        cr,
-                                        uid, 
-                                        journal,
-                                        vals={
-                                            'default_credit_account_id': account,
-                                        }
-                                )
+                cr, uid, journal,
+                vals={'default_credit_account_id': account,}
+                )
         return {}
 
-
-
-    def action_cancel(self,cr,uid,ids,context=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }   
-    def action_new(self,cr,uid,ids,context={}):
+    def execute(self,cr,uid,ids,context=None):
         jids = self.pool.get('account.journal').search(cr, uid, [])
-        if self._inner_steps < len(jids)-1 :
+        if self._inner_steps < len(jids)-1:
             self._inner_steps += 1
-        else :
-            print 'DONE'
-            self._inner_steps = 'done'
-        return {
+            return {
                 'view_type': 'form',
                 "view_mode": 'form',
                 'res_model': 'account.journal.todo',
-                'view_id':self.pool.get('ir.ui.view').search(
-                        cr,
-                        uid,
-                        [('name','=','view_account_journal_form_todo')]
-                    ),
+                'view_id': self.pool.get('ir.ui.view')\
+                    .search(cr, uid, [('name','=','account.journal.todo.form')]),
                 'type': 'ir.actions.act_window',
-                'target':'new',
-               }
-        
-
+                'target': 'new',
+                }
 Journal()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml b/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
index fbfd5165a31..4ebda575962 100755
--- a/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
+++ b/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
@@ -11,38 +11,38 @@
             <field name="name">account.tax.template.todo</field>
             <field name="model">account.tax.template.todo</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Account tax template">
-                    <group colspan="4" col="6">
-                        <field name="name" select="1"/>
-                    </group>
-                    <separator colspan="4" string="The accounts linked to the tax template"/>
-                    <field name="account_collected_id"
-                        on_change="on_change_collected(name, account_collected_id)" select="1"/>
-                    <field name="account_paid_id"
-                        on_change="on_change_paid(name, account_paid_id)" select="1"/>
-                    <group col="4" colspan="4">
-						<button icon="gtk-cancel" name="action_cancel" string="Cancel" type="object"/>
-                        <button icon="gtk-ok" name="action_new" string="Next" type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Account tax template
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    Set account on financial taxes defined by 
+                    Camptocamp l10n_ch_c2c_pcg module"/>
+                  <group colspan="4" col="6">
+                    <field name="name" select="1"/>
+                  </group>
+                  <separator colspan="4" string="The accounts linked to the tax template"/>
+                  <field name="account_collected_id"
+                         on_change="on_change_collected(name, account_collected_id)" select="1"/>
+                  <field name="account_paid_id"
+                         on_change="on_change_paid(name, account_paid_id)" select="1"/>
+                </group>
+              </data>
             </field>
         </record>
-		<record id="action_config_tax" model="ir.actions.act_window">
-            <field name="name">Configure Journal</field>
+        <record id="action_config_tax" model="ir.actions.act_window">
+            <field name="name">Finalize your tax configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.tax.template.todo</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
-			<field name="view_id" ref="view_tax_template_form_todo"/>
+            <field name="view_id" ref="view_tax_template_form_todo"/>
             <field name="target">new</field>
         </record>
-
-
         <record id="action_config_tax_todo" model="ir.actions.todo">
-            <field name="name">Finalize your tax configuration</field>
-            <field name="note">Set account on financial taxes defined by 
-			Camptocamp l10n_ch_c2c_pcg module</field>
             <field name="action_id" ref="action_config_tax"/>
             <field name="sequence">5</field>
         </record>
diff --git a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
index 9503bb03ecd..07ee7a6efe0 100755
--- a/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
+++ b/addons/l10n_ch_chart_c2c_pcg/wizard/config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.3
+#!/usr/bin/env python
 #
 #  config.py
 #
@@ -7,54 +7,36 @@
 #
 from osv import fields, osv
 
-
-class Tax_template(osv.osv):
-    """Creat account.journal.todo class in order 
+class Tax_template(osv.osv_memory):
+    """Creat account.journal.todo class in order
         to add configuration wizzard"""
-
     _name ="account.tax.template.todo"
-    
-    
-    
-    def _get_tax(self, cr, uid, ctx):
-        if not self.__dict__.has_key('_inner_steps') :
+    _inherit = 'res.config'
+
+    def _ensure_step(self):
+        if getattr(self, '_inner_steps', None) is None:
             self._inner_steps = 0
+
+    def _current_tax_template(self, cr, uid):
         ids = self.pool.get('account.tax.template').search(cr,uid,[])
-        if self._inner_steps == 'done' :
-            return False
-        return ids[self._inner_steps]
-        
+        return self.pool.get('account.tax.template').browse(
+            cr, uid, ids[self._inner_steps]
+            )
+
+    def _get_tax(self, cr, uid, ctx):
+        self._ensure_step()
+        return self.pool.get('account.tax.template')\
+            .search(cr,uid,[])[self._inner_steps]
 
     def _get_collected(self, cr, uid, ctx):
-        if not self.__dict__.has_key('_inner_steps') :
-            self._inner_steps = 0
-        if self._inner_steps == 'done' :
-            return False
-        ids = self.pool.get('account.tax.template').search(cr,uid,[])
-        id = self.pool.get('account.tax.template').browse(
-            cr,
-            uid,
-            ids[self._inner_steps]
-        ).account_collected_id.id
-        
-        return id
-        
+        self._ensure_step()
+        return self._current_tax_template(cr, uid).account_collected_id.id
+
     def _get_paid(self, cr, uid, ctx):
-        if not self.__dict__.has_key('_inner_steps') :
-            self._inner_steps = 0
-        if self._inner_steps == 'done' :
-            return False
-        ids = self.pool.get('account.tax.template').search(cr,uid,[])
-        id = self.pool.get('account.tax.template').browse(
-            cr,
-            uid,
-            ids[self._inner_steps]
-        ).account_paid_id.id
-        
-        return id
-    
-        
-    _columns={
+        self._ensure_step()
+        return self._current_tax_template(cr, uid).account_paid_id.id
+
+    _columns = {
         'name': fields.many2one(
             'account.tax.template',
             'Tax to set',
@@ -62,84 +44,50 @@ class Tax_template(osv.osv):
              help="The tax template you are currently editing"
         ),
         'account_collected_id':fields.many2one(
-                                                'account.account.template', 
-                                                'Invoice Tax Account',
-                                                help="You can set \
-                                                here the invoice tax account"
-                                              ),
+            'account.account.template',
+            'Invoice Tax Account',
+            help="You can set here the invoice tax account"
+            ),
         'account_paid_id':fields.many2one(
-                                            'account.account.template', 
-                                            'Refund Tax Account',
-                                            help="You can set \
-                                            here the refund tax account"
-                                          ),
-
-    }
+            'account.account.template',
+            'Refund Tax Account',
+            help="You can set here the refund tax account"
+            ),
+        }
 
     _defaults = {
         'name': _get_tax,
-        'account_collected_id':_get_collected,
-        'account_paid_id':_get_paid,
+        'account_collected_id': _get_collected,
+        'account_paid_id': _get_paid,
         }
-    
-    def on_change_collected(self, cr, uid, id, tax, account) :
-        if account :
+
+    def _on_change(self, cr, uid, id, tax, vals):
+        if account:
             self.pool.get('account.tax.template').write(
-                                                    cr,
-                                                    uid, 
-                                                    tax,
-                                                    vals={
-                                                        'account_collected_id': account,
-                                                    }
-                                                    )
-        
-        
-        
-        return {}
-        
-    def on_change_paid(self, cr, uid, id, tax, account) :
-        if account :
-            self.pool.get('account.tax.template').write(
-                                                    cr,
-                                                    uid, 
-                                                    tax,
-                                                    vals={
-                                                        'account_paid_id': account,
-                                                    }
-                                            )
+                cr, uid, tax, vals=vals)
         return {}
 
+    def on_change_collected(self, cr, uid, id, tax, account):
+        return self._on_change(
+            cr, uid, ids, tax, vals={'account_collected_id': account})
 
+    def on_change_paid(self, cr, uid, id, tax, account):
+        return self._on_change(
+            cr, uid, ids, tax, vals={'account_paid_id': account})
 
-    def action_cancel(self,cr,uid,ids,context=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
-    
-    def action_new(self,cr,uid,ids,context={}):
+    def execute(self,cr,uid,ids,context={}):
         jids = self.pool.get('account.tax.template').search(cr, uid, [])
         if self._inner_steps < len(jids)-1 :
             self._inner_steps += 1
-        else :
-            self._inner_steps = 'done'
-        return {
+            return {
                 'view_type': 'form',
                 "view_mode": 'form',
                 'res_model': 'account.tax.template.todo',
                 'view_id':self.pool.get('ir.ui.view').search(
-                        cr,
-                        uid,
-                        [('name','=','view_account_journal_form_todo')]
-                    ),
+                    cr, uid, [('name','=','account.tax.template.todo')]),
                 'type': 'ir.actions.act_window',
                 'target':'new',
-               }
-        
-
+                }
 Tax_template()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_chart_uk_minimal/__terp__.py b/addons/l10n_chart_uk_minimal/__terp__.py
index 47197dbab4d..837bf61d07e 100644
--- a/addons/l10n_chart_uk_minimal/__terp__.py
+++ b/addons/l10n_chart_uk_minimal/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/l10n_chart_uk_minimal/account_tax.xml b/addons/l10n_chart_uk_minimal/account_tax.xml
index a030925f8fa..42f214e5685 100755
--- a/addons/l10n_chart_uk_minimal/account_tax.xml
+++ b/addons/l10n_chart_uk_minimal/account_tax.xml
@@ -21,6 +21,7 @@
         <record id="vat_code_input" model="account.tax.code.template">
             <field name="name">Input VAT</field>
             <field name="parent_id" ref="vat_code_balance_net"/>
+            <field eval="-1" name="sign"/>
         </record>
 
         <record id="vat_code_input_S" model="account.tax.code.template">
diff --git a/addons/l10n_fr/l10n_fr.py b/addons/l10n_fr/l10n_fr.py
index 5243f571759..3b514ba416d 100644
--- a/addons/l10n_fr/l10n_fr.py
+++ b/addons/l10n_fr/l10n_fr.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/l10n_lu/__init__.py b/addons/l10n_lu/__init__.py
index b76dd01dd0b..2c27dad545a 100644
--- a/addons/l10n_lu/__init__.py
+++ b/addons/l10n_lu/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/l10n_lu/__terp__.py b/addons/l10n_lu/__terp__.py
index 74958dbde4a..391c75f01b4 100644
--- a/addons/l10n_lu/__terp__.py
+++ b/addons/l10n_lu/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml
index 6987cf931f5..cbbf76975c4 100644
--- a/addons/l10n_lu/l10n_lu_wizard.xml
+++ b/addons/l10n_lu/l10n_lu_wizard.xml
@@ -3,9 +3,6 @@
     <data>
 
     <record id="config_call_account_template" model="ir.actions.todo">
-        <field name="name">Generate Chart of Accounts from a Chart Template</field>
-        <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to select the company, the chart template, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
     </record>
 
diff --git a/addons/l10n_lu/wizard/__init__.py b/addons/l10n_lu/wizard/__init__.py
index ac1c3deb927..09b898f6497 100644
--- a/addons/l10n_lu/wizard/__init__.py
+++ b/addons/l10n_lu/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/l10n_lu/wizard/pdf_ext.py b/addons/l10n_lu/wizard/pdf_ext.py
index cfbb79ebb6e..26ff61e209c 100644
--- a/addons/l10n_lu/wizard/pdf_ext.py
+++ b/addons/l10n_lu/wizard/pdf_ext.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/lunch/__init__.py b/addons/lunch/__init__.py
new file mode 100644
index 00000000000..b94760a67fb
--- /dev/null
+++ b/addons/lunch/__init__.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import lunch
+import wizard
+import report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/__terp__.py b/addons/lunch/__terp__.py
new file mode 100644
index 00000000000..bc7dfcbfef7
--- /dev/null
+++ b/addons/lunch/__terp__.py
@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+{
+    "name": "Lunch Module",
+    "author": "Tiny",
+    "version": "0.1",
+    "depends": ["base"],
+    "category" : "Generic Modules/Others",
+    "init_xml": [],
+    "update_xml": [
+        'security/ir.model.access.csv', 
+        'lunch_wizard.xml', 
+        'lunch_view.xml', 
+        'lunch_report.xml',
+        #'process/lunch_process.xml'
+    ],
+    "demo_xml": ['lunch_demo.xml'],
+    "installable": True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/i18n/fr_BE.po b/addons/lunch/i18n/fr_BE.po
new file mode 100644
index 00000000000..03beb8e85a4
--- /dev/null
+++ b/addons/lunch/i18n/fr_BE.po
@@ -0,0 +1,347 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* lunch
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 04:56:11+0000\n"
+"PO-Revision-Date: 2009-11-26 04:56:11+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: lunch
+#: model:ir.model,name:lunch.model_lunch_category
+#: view:lunch.category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Reset cashbox"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: lunch
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "lunch.cashmove"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr ""
+
+#. module: lunch
+#: model:ir.module.module,shortdesc:lunch.module_meta_information
+msgid "Lunch Module"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr ""
+
+#. module: lunch
+#: rml:lunch.order:0
+msgid "Printed at :"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "lunch.product"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
+#: view:lunch.cashbox:0
+msgid "CashBox"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: lunch
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0
+#: field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0
+msgid "User Name"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr ""
+
+#. module: lunch
+#: rml:lunch.order:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,price:0
+#: field:lunch.product,price:0
+msgid "Price"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,end:0
+msgid "No"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.category:0
+#: rml:lunch.order:0
+#: view:lunch.order:0
+msgid "Order"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Created date"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch
+msgid "Lunch"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.lunch_order_confirm
+#: wizard_button:lunch.order.confirm,init,go:0
+msgid "Confirm Order"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.order.confirm,init:0
+msgid "Orders Confirmation"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,active:0
+#: field:lunch.product,active:0
+msgid "Active"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_day_form
+msgid " Order of the day"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_root
+msgid "Configuration"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_id_cancel
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " CashBox "
+msgstr ""
+
+#. module: lunch
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
+msgid "Lunch amount"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,name:0
+#: field:lunch.cashmove,name:0
+#: field:lunch.category,name:0
+#: rml:lunch.order:0
+#: field:lunch.product,name:0
+msgid "Name"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Category of product "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "lunch.cashbox"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,date:0
+msgid "Date"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0
+#: field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form
+#: view:lunch.product:0
+msgid "Products"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Category of product"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+msgid "Print Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_day_form
+msgid "Order of the day"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category related to Products"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order
+msgid "lunch.order"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Remained Total"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+msgid "Make order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_clean_cashbox
+msgid "Set CashBox to Zero"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,box:0
+#: field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr ""
+
+#. module: lunch
+#: rml:lunch.order:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: lunch
+#: wizard_field:lunch.order.confirm,init,confirm_cashbox:0
+msgid "Name of box"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,end:0
+#: wizard_button:lunch.order.confirm,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,zero:0
+msgid "Set to Zero"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,cancel:0
+msgid "Yes"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_tools
+msgid "Tools"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: view:lunch.cashmove:0
+#: field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr ""
+
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
new file mode 100644
index 00000000000..7eb6d858a3e
--- /dev/null
+++ b/addons/lunch/lunch.py
@@ -0,0 +1,191 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+
+class lunch_category(osv.osv):
+    _name = 'lunch.category'
+    _description = "Category"
+
+    _columns = {
+        'name': fields.char('Name', required=True, size=50),
+    }
+
+    _order = 'name'
+
+lunch_category()
+
+class lunch_product(osv.osv):
+    _name = 'lunch.product'
+
+    def _category_name_get(self, cr, uid, context={}):
+        obj = self.pool.get('lunch.category')
+        cat_ids= obj.search(cr,uid,[])
+        res = obj.read(cr,uid,cat_ids,['name', 'category'])
+        return [(str(r['id']), r['name']) for r in res]+ [('0','')]
+
+    _columns = {
+        'name': fields.char('Name', size=50, required=True),
+        'category_id': fields.selection(_category_name_get, 'Category', size=32),
+        'description': fields.char('Description', size=128, required=False),
+        'price': fields.float('Price', digits=(16,2)),
+        'active': fields.boolean('Active'),
+    }
+
+    _defaults = {
+        'active': lambda *a : True,
+        }
+
+lunch_product()
+
+class lunch_cashbox(osv.osv):
+    _name='lunch.cashbox'
+
+    def amount_available(self, cr, uid, ids, field_name, arg, context):
+        cr.execute("SELECT box,sum(amount) from lunch_cashmove where active = 't' group by box")
+        r = dict(cr.fetchall())
+        for i in ids :
+            r.setdefault(i,0)
+        return r
+
+    _columns={
+        'manager':fields.many2one('res.users','Manager'),
+        'name':fields.char('Name',size=30,required=True, unique = True),
+        'sum_remain': fields.function(amount_available, method=True, string='Remained Total'),
+        }
+
+lunch_cashbox()
+
+
+
+
+class lunch_cashmove(osv.osv):
+    _name= 'lunch.cashmove'
+
+    _columns={
+        'name': fields.char('Name',size=128),
+        'user_cashmove': fields.many2one('res.users','User Name', required=True),
+        'amount': fields.float('Amount', digits=(16,2)),
+        'box':fields.many2one('lunch.cashbox','Box Name',size=30,required=True),
+        'active':fields.boolean('Active'),
+        'create_date': fields.datetime('Created date', readonly=True),
+        }
+
+    _defaults={
+    'active': lambda *a: True,
+    }
+
+lunch_cashmove()
+
+
+
+class lunch_order(osv.osv):
+    _name='lunch.order'
+    _rec_name= "user_id"
+
+    def _price_get(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for o in self.browse(cr, uid, ids):
+            res[o.id] = o.product.price
+        return res
+
+    _columns={
+        'user_id': fields.many2one('res.users','User Name', required=True,
+            readonly=True, states={'draft':[('readonly',False)]}),
+        'product':fields.many2one('lunch.product','Product', required=True,
+            readonly=True, states={'draft':[('readonly',False)]}, change_default=True),
+        'date': fields.date('Date',readonly=True,states={'draft':[('readonly',False)]}),
+        'cashmove':fields.many2one('lunch.cashmove', 'CashMove' , readonly=True  ),
+        'descript':fields.char('Description Order', readonly=True, size=50,
+            states={'draft':[('readonly',False)]}),
+        'state': fields.selection([('draft','Draft'), ('confirmed','Confirmed'),],
+            'State', readonly=True, select=True),
+        'price': fields.function(_price_get, method=True, string="Price"),
+    }
+
+    _defaults={
+        'user_id': lambda self,cr,uid,context: uid,
+        'date': lambda self,cr,uid,context: time.strftime('%Y-%m-%d'),
+        'state': lambda self,cr,uid,context: 'draft',
+    }
+
+    def confirm(self,cr,uid,ids,box,context):
+        cashmove_ref= self.pool.get('lunch.cashmove')
+        for order in self.browse(cr,uid,ids):
+            if order.state == 'confirmed':
+                continue
+            new_id= cashmove_ref.create(cr,uid,{'name': order.product.name+' order',
+                            'amount':-order.product.price,
+                            'user_cashmove':order.user_id.id,
+                            'box':box,
+                            'active':True,
+                            })
+            self.write(cr,uid,[order.id],{'cashmove':new_id, 'state':'confirmed'})
+        return {}
+
+    def lunch_order_cancel(self,cr,uid,ids,context):
+        orders= self.browse(cr,uid,ids)
+        for order in orders:
+            if not order.cashmove:
+                continue
+            self.pool.get('lunch.cashmove').unlink(cr, uid, [order.cashmove.id])
+        self.write(cr,uid,ids,{'state':'draft'})
+        return {}
+
+    def onchange_product(self, cr, uid, ids, product):
+        if not product:
+            return {'value': {'price': 0.0}}
+        price = self.pool.get('lunch.product').read(cr, uid, product, ['price'])['price']
+        return {'value': {'price': price}}
+
+lunch_order()
+
+class report_lunch_amount(osv.osv):
+    _name='report.lunch.amount'
+    _description = "Amount available by user and box"
+    _auto = False
+    _rec_name= "user"
+
+    _columns = {
+        'user_id': fields.many2one('res.users','User Name',readonly=True),
+        'amount': fields.float('Amount', readonly=True, digits=(16,2)),
+        'box':fields.many2one('lunch.cashbox','Box Name',size=30,readonly=True),
+        }
+
+    def init(self, cr):
+        cr.execute("""
+            create or replace view report_lunch_amount as (
+                select
+                    min(lc.id) as id,
+                    lc.user_cashmove as user_id,
+                    sum(amount) as amount,
+                    lc.box as box
+                from
+                    lunch_cashmove lc
+                where
+                    active = 't'
+                group by lc.user_cashmove, lc.box
+                )""")
+
+report_lunch_amount()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml
new file mode 100644
index 00000000000..91be819d430
--- /dev/null
+++ b/addons/lunch/lunch_demo.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <record model="lunch.category" id="categ_sandwich">
+            <field name="name">Sandwich</field>
+        </record>
+
+        <record model="lunch.product" id="product_club">
+            <field name="name">Club</field>
+            <field name="category_id" eval="str(ref('categ_sandwich'))"/>
+            <field name="price">2.75</field>
+        </record>
+
+        <record model="lunch.cashbox" id="cashbox_cashbox">
+            <field name="name">Cashbox</field>
+            <field name="manager" ref="base.user_admin"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/lunch/lunch_report.xml b/addons/lunch/lunch_report.xml
new file mode 100644
index 00000000000..6503c99a6ea
--- /dev/null
+++ b/addons/lunch/lunch_report.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <report
+            id="report_lunch_order"
+            string="Print Order"
+            model="lunch.order"
+            name="lunch.order"
+            rml="lunch/report/order.rml"
+            auto="False"
+            />
+    </data>
+</openerp>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
new file mode 100644
index 00000000000..61844e099cb
--- /dev/null
+++ b/addons/lunch/lunch_view.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
+        <!--<menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>
+        <menuitem name="Lunch Order" parent="menu_tools" id="menu_lunch" sequence="1"/>
+        <menuitem name="Reporting" parent="menu_tools" id="menu_lunch_reporting" sequence="4"/>
+        <menuitem name="Lunch Orders" parent="menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
+        <menuitem name="Configuration" parent="menu_tools" id="menu_lunch_category_root" sequence="5"/>
+       <menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>-->
+
+        <menuitem name="Lunch Order" parent="base.menu_tools" id="menu_lunch" sequence="1"/>
+        <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="5"/>
+        <menuitem name="Lunch Orders" parent="base.menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
+        <menuitem name="Configuration" parent="base.menu_tools" id="base.menu_lunch_survey_root" sequence="6"/>
+
+
+       <menuitem name="Lunch" parent="base.menu_lunch_survey_root" id="menu_lunch_category_root_configuration" sequence="1"/>
+        <record model="ir.ui.view" id="view_lunch_order_form">
+            <field name="name">Order</field>
+            <field name="model">lunch.order</field>
+            <field name="arch" type="xml">
+                <form string="Order">
+                    <group colspan="2" col="4">
+                        <field name="user_id" select="1"/>
+                        <field name="date" select="1"/>
+                        <field name="product" select="1" on_change="onchange_product(product)"/>
+                        <field name="price"/>
+                        <field name="descript"/>
+                        <field name="cashmove"/>
+                        <field name="state" select="2"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_lunch_order_tree">
+            <field name="name">Order</field>
+            <field name="model">lunch.order</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Order">
+                    <field name="user_id"/>
+                    <field name="product"/>
+                    <field name="date"/>
+                    <field name="cashmove"/>
+                    <field name="state"/>
+                    <field name="descript"/>
+                    <field name="price" sum="Total price"/>
+                </tree>
+            </field>
+        </record>
+
+
+
+        <record model="ir.actions.act_window" id="action_lunch_order_form">
+                <field name="name">Lunch Orders</field>
+                <field name="res_model">lunch.order</field>
+                <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem name="Lunch Order" parent="menu_lunch" id="menu_lunch_order_form" action="action_lunch_order_form"/>
+
+<!--        <record model="ir.actions.act_window" id="action_lunch_order_day_form">-->
+<!--                <field name="name"> Order of the day</field>-->
+<!--                <field name="res_model">lunch.order</field>-->
+<!--                <field name="domain">[('date','=',time.strftime('%Y-%m-%d'))]</field>-->
+<!---->
+<!--        </record>-->
+<!--        <menuitem name="Order of the day" parent="menu_lunch_order_form" id="menu_lunch_order_day_form" action="action_lunch_order_day_form"/>-->
+
+        <record model="ir.ui.view" id="view_lunch_cashbox_form">
+            <field name="name">CashBox</field>
+            <field name="model">lunch.cashbox</field>
+            <field name="arch" type="xml">
+                <form string="CashBox">
+                    <field name="name" select="1"/>
+                    <field name="manager" select="1"/>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_lunch_cashbox_tree">
+            <field name="name">CashBox</field>
+            <field name="model">lunch.cashbox</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="CashBox" colors="red:sum_remain&lt;=0">
+                    <field name="name" select="1"/>
+                    <field name="manager" select="1"/>
+                    <field name="sum_remain" select="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_lunch_cashbox_form">
+                <field name="name"> CashBox </field>
+                <field name="res_model">lunch.cashbox</field>
+        </record>
+        <menuitem name="CashBox" parent="menu_lunch_category_root_configuration" id="menu_lunch_cashbox_form" action="action_lunch_cashbox_form"/>
+
+        <record model="ir.ui.view" id="view_lunch_cashmove_form">
+            <field name="name">CashMove</field>
+            <field name="model">lunch.cashmove</field>
+            <field name="arch" type="xml">
+                <form string="CashMove">
+                    <field name="name" select="1"/>
+                    <field name="user_cashmove" select="1"/>
+                    <field name="amount" select="2"/>
+                    <field name="box" select="1"/>
+                    <field name="create_date" select="1"/>
+                    <field name="active" select="1"/>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_lunch_cashmove_tree">
+            <field name="name">CashMove</field>
+            <field name="model">lunch.cashmove</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="CashMove" editable="top">
+                    <field name="name" select="1" required="1"/>
+                    <field name="user_cashmove" select="1"/>
+                    <field name="amount" select="1" sum="Total amount"/>
+                    <field name="box" select="1"/>
+                    <field name="create_date"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_lunch_cashmove_form">
+                <field name="name">CashMove</field>
+                <field name="res_model">lunch.cashmove</field>
+        </record>
+
+        <menuitem name="Cash Moves" parent="menu_lunch" id="menu_lunch_cashmove_form" action="action_lunch_cashmove_form"/>
+
+        <record model="ir.ui.view" id="view_lunch_category_form">
+            <field name="name"> Category of product </field>
+            <field name="model">lunch.category</field>
+            <field name="arch" type="xml">
+                <form string="Category">
+                    <separator string="Category related to Products" colspan="4"/>
+                    <field name="name" select="1"/>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_lunch_category_tree">
+            <field name="name">Category</field>
+            <field name="model">lunch.category</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Order">
+                    <field name="name" select="1"/>
+                </tree>
+            </field>
+        </record>
+
+
+        <record model="ir.actions.act_window" id="action_lunch_category_form">
+            <field name="name"> Category of product </field>
+            <field name="res_model">lunch.category</field>
+        </record>
+
+        <record model="ir.ui.view" id="view_lunch_product_form">
+            <field name="name">Products</field>
+            <field name="type">form</field>
+            <field name="model">lunch.product</field>
+            <field name="arch" type="xml">
+                <form string="Products">
+                    <field name="name" select="1"/>
+                    <field name="category_id" select="1"/>
+                    <field name="description" select="1"/>
+                    <field name="price" select="1"/>
+                    <field name="active" select="1"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_lunch_product_tree">
+            <field name="name">Products</field>
+            <field name="model">lunch.product</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Products">
+                    <field name="name" select="1"/>
+                    <field name="category_id" select="1"/>
+                    <field name="description" select="1"/>
+                    <field name="price" select="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_lunch_product_form">
+            <field name="name">Product</field>
+            <field name="res_model">lunch.product</field>
+        </record>
+
+        <menuitem name="Tools/Lunch/Configuration/Products" id="menu_lunch_product_form" action="action_lunch_product_form"  sequence="1"/>
+        <menuitem name="Products" parent="menu_lunch_category_root_configuration" id="menu_lunch_product_form" action="action_lunch_product_form"  sequence="2"/>
+        <menuitem name="Category of product" parent="menu_lunch_category_root_configuration" id="menu_lunch_category_form" action="action_lunch_category_form" sequence="1"/>
+
+
+        <record model="ir.ui.view" id="view_report_lunch_amount_tree">
+            <field name="name">Lunch amount</field>
+            <field name="model">report.lunch.amount</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Box Amount by User">
+                    <field name="box" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="amount" select="1" sum="Total box" />
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_lunch_amount_form">
+            <field name="name">Lunch amount</field>
+            <field name="model">report.lunch.amount</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Box Amount by User">
+                    <field name="user_id" select="1"/>
+                    <field name="box" select="1"/>
+                    <field name="amount" select="1"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.actions.act_window" id="action_report_lunch_amount_tree">
+            <field name="name">Lunch amount</field>
+            <field name="res_model">report.lunch.amount</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem name="Cash Position by User" parent="menu_lunch_reporting_order" action="action_report_lunch_amount_tree" id="menu_lunch_report_amount_tree"/>
+    </data>
+</openerp>
+
+
diff --git a/addons/lunch/lunch_wizard.xml b/addons/lunch/lunch_wizard.xml
new file mode 100644
index 00000000000..0820ae7d80c
--- /dev/null
+++ b/addons/lunch/lunch_wizard.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <wizard 
+            string="Confirm Order"
+            model="lunch.order"
+            name="lunch.order.confirm"
+            keyword="client_action_multi"
+            id="lunch_order_confirm"/>
+
+        <wizard
+            string="Cancel Order"
+            model="lunch.order"
+            name="lunch.order.cancel"
+            keyword="client_action_multi"
+            id="wizard_id_cancel"/>
+
+        <wizard
+            string="Set CashBox to Zero"
+            model="lunch.cashbox"
+            name="lunch.cashbox.clean"
+            keyword="client_action_multi"
+            id="wizard_clean_cashbox"/>
+    </data>
+</openerp>
diff --git a/addons/lunch/report/__init__.py b/addons/lunch/report/__init__.py
new file mode 100644
index 00000000000..acf05a0ca2a
--- /dev/null
+++ b/addons/lunch/report/__init__.py
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import order
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py
new file mode 100644
index 00000000000..abb99ceb380
--- /dev/null
+++ b/addons/lunch/report/order.py
@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import time
+from report import report_sxw
+from osv import osv
+
+
+class order(report_sxw.rml_parse):
+
+    def sum_price(self, orders):
+        res = 0.0
+        for o in orders:
+            res += o.price
+        return res
+
+    def __init__(self, cr, uid, name, context):
+        super(order, self).__init__(cr, uid, name, context)
+
+        self.localcontext.update({
+        'time': time,
+        'sum_price': self.sum_price,
+        })
+
+report_sxw.report_sxw('report.lunch.order', 'lunch.order',
+        'addons/lunch/report/order.rml',parser=order, header=False)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
new file mode 100644
index 00000000000..a7bc1b32cdd
--- /dev/null
+++ b/addons/lunch/report/order.rml
@@ -0,0 +1,132 @@
+<?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="34.0" y1="42.0" width="527" height="758"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="15.0" leading="19"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="16.0" leading="20"/>
+    <paraStyle name="P3" fontName="Times-Roman"/>
+    <paraStyle name="P4" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Times-BoldItalic" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P6" fontName="Times-BoldItalic" fontSize="9.0" leading="11"/>
+    <paraStyle name="P7" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P8" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="9.0" leading="11"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P11" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P12" fontName="Times-BoldItalic" fontSize="6.0" leading="8"/>
+    <paraStyle name="P13" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P14" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    <para style="P1">
+      <font face="Times-Roman">Printed at : [[time.strftime("%Hh%M")]]</font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="149.0,135.0,103.0,140.0" repeatRows="1" style="Tableau2">
+      <tr>
+        <td>
+          <para style="P4">Name</para>
+        </td>
+        <td>
+          <para style="P4">Order</para>
+        </td>
+        <td>
+          <para style="P4">Description</para>
+        </td>
+        <td>
+          <para style="P4">Unit Price</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="P5">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <blockTable colWidths="148.0,135.0,103.0,140.0" style="Tableau1">
+      <tr>
+        <td>
+          <para style="P7">[[repeatIn(objects, 'o') ]]</para>
+          <para style="P7">[[ o.user_id.name ]]</para>
+        </td>
+        <td>
+          <para style="P8">[[o.product.name ]]</para>
+        </td>
+        <td>
+          <para style="P9">[[ o.descript ]]</para>
+          <para style="P10">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P14">[['%.2f' % o.price ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P11">[[ '%.2f' % sum_price(objects) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P6">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
new file mode 100644
index 00000000000..43490780c36
--- /dev/null
+++ b/addons/lunch/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_lunch_category","lunch.category","model_lunch_category",base.group_user,1,1,1,1
+"access_lunch_product","lunch.product","model_lunch_product",base.group_user,1,1,1,1
+"access_lunch_cashbox","lunch.cashbox","model_lunch_cashbox",base.group_user,1,1,1,1
+"access_lunch_cashmove","lunch.cashmove","model_lunch_cashmove",base.group_user,1,1,1,1
+"access_lunch_order","lunch.order","model_lunch_order",base.group_user,1,1,1,1
+"access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount",base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/addons/lunch/wizard/__init__.py b/addons/lunch/wizard/__init__.py
new file mode 100644
index 00000000000..e290a2e933c
--- /dev/null
+++ b/addons/lunch/wizard/__init__.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import confirm
+import cancel
+import reset_box
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project/wizard/task_attachment.py b/addons/lunch/wizard/cancel.py
similarity index 54%
rename from addons/project/wizard/task_attachment.py
rename to addons/lunch/wizard/cancel.py
index 6ca99a3da88..1acc1535a90 100644
--- a/addons/project/wizard/task_attachment.py
+++ b/addons/lunch/wizard/cancel.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
@@ -20,30 +20,34 @@
 ##############################################################################
 
 import wizard
+import netsvc
+import ir
 import pooler
 
-'''View the attachments of the parent + children tasks'''
+cancel_form = """<?xml version="1.0"?>
+<form string="Cancel Order">
+    <label string="Are you sure you want to cancel this order ?"/>
+</form>"""
 
-def _show_attachment(self, cr, uid, data, context):
-    task_obj = pooler.get_pool(cr.dbname).get('project.task')
-    task_browse_id = task_obj.browse(cr, uid, [data['id']], context)[0]
-    attachment_list = [child_id.id for child_id in task_browse_id.child_ids]
-    attachment_list.extend([task_browse_id.parent_id.id])
-    value = {
-        'domain': [('res_model','=',data['model']),('res_id','in',attachment_list)],
-        'name': 'Attachments',
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'ir.attachment',
-        'context': { },
-        'type': 'ir.actions.act_window'
-    }
-    return value
-class wizard_attachment(wizard.interface):
+
+cancel_fields = {
+}
+
+def _cancel(self,cr,uid,data,context):
+    return pooler.get_pool(cr.dbname).get('lunch.order').lunch_order_cancel(cr,uid,data['ids'],context)
+
+class order_cancel(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type':'action', 'action':_show_attachment, 'state': 'end'},
+            'result': {'type':'form', 'arch':cancel_form, 'fields':cancel_fields, 'state':[('end','No'),('cancel','Yes')]}
         },
+        'cancel': {
+            'actions': [_cancel],
+            'result': {'type':'state', 'state':'end'}
+        }
     }
-wizard_attachment('project.task.attachment')
+order_cancel('lunch.order.cancel')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/wizard/confirm.py b/addons/lunch/wizard/confirm.py
new file mode 100644
index 00000000000..64891098349
--- /dev/null
+++ b/addons/lunch/wizard/confirm.py
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import wizard
+import netsvc
+import ir
+import pooler
+
+confirm_order_form = """<?xml version="1.0"?>
+<form title="Confirm">
+    <separator string="Orders Confirmation" colspan="4"/>
+    <field name="confirm_cashbox"/>
+    <newline/>
+</form>
+"""
+
+confirm_order_fields = {
+    'confirm_cashbox': {'string':'Name of box', 'type':'many2one', 'required':True, 'relation':'lunch.cashbox' },
+}
+
+def _confirm(self,cr,uid,data,context):
+    pool= pooler.get_pool(cr.dbname)
+    order_ref = pool.get('lunch.order')
+    order_ref.confirm(cr,uid,data['ids'],data['form']['confirm_cashbox'],context)
+    return {}
+
+class order_confirm(wizard.interface):
+    states = {
+        'init': {
+            'action':[],
+            'result':{'type' : 'form', 'arch' : confirm_order_form, 'fields' : confirm_order_fields, 'state' : [('end', 'Cancel'),('go', 'Confirm Order') ]},
+        },
+        'go' : {
+            'actions' : [_confirm],
+            'result' : {'type' : 'state', 'state' : 'end'}
+        },
+    }
+order_confirm('lunch.order.confirm')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/wizard/reset_box.py b/addons/lunch/wizard/reset_box.py
new file mode 100644
index 00000000000..83999fc3ba0
--- /dev/null
+++ b/addons/lunch/wizard/reset_box.py
@@ -0,0 +1,76 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import wizard
+import netsvc
+import ir
+import pooler
+
+set_to_zero_form = """<?xml version="1.0"?>
+<form string="Reset cashbox">
+    <label string="Are you sure you want to reset this cashbox ?"/>
+</form>"""
+
+
+
+confirm_setting_zero_fields = {}
+
+def _set_to_zero(self,cr,uid,data,context):
+    pool= pooler.get_pool(cr.dbname)
+    cashmove_ref = pool.get('lunch.cashmove')
+    cr.execute("select user_cashmove, box,sum(amount) from lunch_cashmove where active= 't' and box in (%s) group by user_cashmove, box"%','.join(map(str,data['ids'])))
+    res= cr.fetchall()
+    cr.execute("update lunch_cashmove set active = 'f' where active= 't' and box in (%s)"%','.join(map(str,data['ids'])))
+##    to_unactive= {}.fromkeys([r[0] for r in cr.fetchall]).keys()
+##    print to_unactive
+##    cashmove_ref.write(cr,uid,to_unactive,{'active':False})            
+##    
+    for (user_id,box_id,amount) in res:
+        cashmove_ref.create(cr,uid,{'name': 'Summary for user'+ str(user_id),
+                        'amount': amount,
+                        'user_cashmove': user_id,
+                        'box': box_id,
+                        'active': True,
+                        })
+    return {}
+
+
+class cashbox_set_to_zero(wizard.interface):
+
+    states = {
+            
+        'init': {
+                        'action':[],
+                        'result':{'type' : 'form',
+                          'arch' : set_to_zero_form,
+              'fields' : confirm_setting_zero_fields,
+                          'state' : [('end', 'Cancel'),('zero', 'Set to Zero') ]},
+    
+        },
+        'zero' : {
+            'actions' : [_set_to_zero],
+            'result' : {'type' : 'state', 'state' : 'end'}
+        },
+    }
+    
+cashbox_set_to_zero('lunch.cashbox.clean')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mail_gateway/__init__.py b/addons/mail_gateway/__init__.py
index 950dc0220e2..0bf7eb43128 100644
--- a/addons/mail_gateway/__init__.py
+++ b/addons/mail_gateway/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mail_gateway/__terp__.py b/addons/mail_gateway/__terp__.py
index 3e94524c2da..ea816774651 100644
--- a/addons/mail_gateway/__terp__.py
+++ b/addons/mail_gateway/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 5867e9b45c4..b162d82e2be 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mail_gateway/wizard/__init__.py b/addons/mail_gateway/wizard/__init__.py
index 4ae407fe1b7..496b15be6dd 100644
--- a/addons/mail_gateway/wizard/__init__.py
+++ b/addons/mail_gateway/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mail_gateway/wizard/wizard_fetch_mail.py b/addons/mail_gateway/wizard/wizard_fetch_mail.py
index 30660e6f0ac..10922835fe0 100644
--- a/addons/mail_gateway/wizard/wizard_fetch_mail.py
+++ b/addons/mail_gateway/wizard/wizard_fetch_mail.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/membership/__init__.py b/addons/membership/__init__.py
index 691798849ac..4ae17c80e71 100644
--- a/addons/membership/__init__.py
+++ b/addons/membership/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/membership/__terp__.py b/addons/membership/__terp__.py
index ef328c75be2..3d8deb6ef75 100644
--- a/addons/membership/__terp__.py
+++ b/addons/membership/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index bbb3bab4d7f..7a67bf6e1e9 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 78c81d77e88..2bc1ac1d48d 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -82,9 +82,12 @@
         </record>
 
         <menuitem name="Membership" id="menu_membership" icon="terp-crm"/>
+        <menuitem name="Members" parent="menu_membership"
+            id="menu_member"
+            sequence="1"/>
         <menuitem name="Configuration" parent="menu_membership"
             id="menu_conf"
-            sequence="1"/>
+            sequence="3"/>
         <menuitem name="Membership products" parent="menu_conf"
             id="menu_membership_products"
             action="action_membership_products"/>
@@ -144,8 +147,8 @@
             <field name="view_mode">form</field>
             <field name="act_window_id" ref="action_membership_members"/>
         </record>
-        
-        <menuitem name="Current members" parent="menu_membership"
+
+        <menuitem name="Current members" parent="menu_member"
             id="menu_members"
             sequence="2"
             action="action_membership_members"/>
@@ -207,7 +210,7 @@
 
         <!-- MEMBERSHIP/REPORTING -->
         <menuitem name="Reporting" parent="menu_membership"
-            sequence="5"
+            sequence="2"
             id="menu_reporting"/>
 
         <!-- REPORTING/MEMBERSHIP BY YEAR  -->
diff --git a/addons/membership/wizard/__init__.py b/addons/membership/wizard/__init__.py
index 99180c1ad69..9f5d3dc14af 100644
--- a/addons/membership/wizard/__init__.py
+++ b/addons/membership/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/membership/wizard/invoice_membership.py b/addons/membership/wizard/invoice_membership.py
index 4ecb3069a51..6fd1e56f831 100644
--- a/addons/membership/wizard/invoice_membership.py
+++ b/addons/membership/wizard/invoice_membership.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/misc_tools/__init__.py b/addons/misc_tools/__init__.py
new file mode 100644
index 00000000000..3511d091ecb
--- /dev/null
+++ b/addons/misc_tools/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import installer
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/misc_tools/__terp__.py b/addons/misc_tools/__terp__.py
new file mode 100644
index 00000000000..209be09cfc9
--- /dev/null
+++ b/addons/misc_tools/__terp__.py
@@ -0,0 +1,39 @@
+# -*- 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" : "Miscellaneous Tools",
+    "version" : "1.0",
+    "depends" : ["base"],
+    "author" : "Tiny",
+    "description": """Installer for various interesting tools
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': [
+        'misc_tools_installer.xml',
+    ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/misc_tools/installer.py b/addons/misc_tools/installer.py
new file mode 100644
index 00000000000..4037b073319
--- /dev/null
+++ b/addons/misc_tools/installer.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+
+class misc_tools_installer(osv.osv_memory):
+    _name = 'misc_tools.installer'
+    _inherit = 'res.config.installer'
+
+    _columns = {
+        # Tools
+        'lunch':fields.boolean('Lunch Orders'),
+        'subscription':fields.boolean('Recurring Documents'),
+        'survey':fields.boolean('Survey'),
+        'audittrail':fields.boolean('Audit Trail'),
+        }
+    _defaults = {
+        'lunch': True,
+        }
+    
+misc_tools_installer()
+
diff --git a/addons/misc_tools/misc_tools_installer.xml b/addons/misc_tools/misc_tools_installer.xml
new file mode 100644
index 00000000000..a8e98312ffc
--- /dev/null
+++ b/addons/misc_tools/misc_tools_installer.xml
@@ -0,0 +1,62 @@
+<openerp>
+  <data>
+    <record id="view_misc_tools_installer" model="ir.ui.view">
+      <field name="name">misc_tools.installer.view</field>
+      <field name="model">misc_tools.installer</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="arch" type="xml">
+        <data>
+          <form position="attributes"><attribute name="string">
+              Tools Modules Installation
+          </attribute></form>
+
+          <group string="res_config_contents" position="replace">
+            <separator string="Select Tools To Install" colspan="4"/>
+            <image name="gtk-dialog-info"/>
+            <newline/>
+            <label align="0.0" string=" Lorem ipsum dolor
+                sit amet, consectetur adipiscing elit. Cras metus
+                augue, ultricies et vehicula id, fringilla quis
+                mauris. Vestibulum fringilla ipsum sit amet est
+                adipiscing eget euismod velit semper. Proin non mauris
+                velit. Donec malesuada nisi sed augue viverra commodo
+                sagittis nisi rutrum. Cras vitae libero nunc, a
+                molestie sapien. Proin et augue sit amet est egestas
+                fermentum ut eu lacus. Etiam nisi orci, volutpat
+                aliquam viverra interdum, vehicula iaculis
+                lectus. Mauris ligula sapien, auctor in pharetra non,
+                ultrices quis odio."/>
+            <group>
+              <separator string="Tools" colspan="4"/>
+              <field name="lunch"/>
+              <field name="subscription"/>
+              <field name="survey"/>
+              <field name="audittrail"/>
+            </group>
+          </group>
+
+          <xpath expr='//button[@name="action_skip"]' position='replace'/>
+          <xpath expr='//button[@name="action_next"]' position='attributes'>
+            <attribute name='string'>Install Modules</attribute>
+          </xpath>
+        </data>
+      </field>
+    </record>
+
+    <record id="action_misc_tools_installer" model="ir.actions.act_window">
+      <field name="name">Tools Modules Installation</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">misc_tools.installer</field>
+      <field name="view_id" ref="view_misc_tools_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="misc_tools_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_misc_tools_installer"/>
+      <field name="sequence">1</field>
+    </record>
+  </data>
+</openerp>
diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index 0b7e4d4191e..90ca012bc48 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import mrp
+import installer
 import wizard
 import report
 import company
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index e7da1012b83..686cc1154ee 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -69,7 +69,8 @@
         'company_view.xml',
         'process/stockable_product_process.xml',
         'process/service_product_process.xml',
-        'process/procurement_process.xml'
+        'process/procurement_process.xml',
+        'mrp_installer.xml',
     ],
     'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
     'installable': True,
diff --git a/addons/mrp/company.py b/addons/mrp/company.py
index d9a4b5b94ba..064b1034ba0 100644
--- a/addons/mrp/company.py
+++ b/addons/mrp/company.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index 6bd8678d6f0..6d435434544 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.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-11-17 07:38+0000\n"
+"PO-Revision-Date: 2010-01-15 20:33+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.net>\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: 2009-12-16 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
 msgid "Moves Created"
-msgstr ""
+msgstr "Създадени движения"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "No. Of Cycles"
-msgstr ""
+msgstr "Бр. цикли"
 
 #. module: mrp
 #: help:mrp.procurement.compute.all,init,automatic:0
@@ -33,43 +33,47 @@ msgid ""
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
 msgstr ""
+"Извикване на автоматично набавяне на всички продукти които имат виртуална "
+"наличност под 0. Вероятно не е необходимо да използвате тази възможност, "
+"препоръчваме ви да използвате настройката Производство за Поръчка при "
+"Продукти."
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
-msgstr ""
+msgstr "Планиране на ресурси за производство"
 
 #. module: mrp
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаване на действие"
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
 msgid "Revision"
-msgstr ""
+msgstr "Редакция"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
 #: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2
 msgid "Compute Stock Minimum Rules Only"
-msgstr ""
+msgstr "Изчисляване на правила за минимално правило за количество"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5
 msgid "Exceptions Procurements"
-msgstr ""
+msgstr "Грешки при набавяне"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Workcenters"
-msgstr ""
+msgstr "Маршрутизиране на цехове"
 
 #. module: mrp
 #: help:mrp.property,composition:0
 msgid "Not used in computations, for information purpose only."
-msgstr ""
+msgstr "Не се използва за изчисление, само за информация."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -80,40 +84,40 @@ msgstr "Маршрути"
 #. module: mrp
 #: field:mrp.production,picking_id:0
 msgid "Packing list"
-msgstr ""
+msgstr "Списък за опаковане"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
 msgid "Stockable Stock"
-msgstr ""
+msgstr "Складируеми стоки"
 
 #. module: mrp
 #: field:mrp.procurement,origin:0
 #: field:mrp.production,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Произход"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_configuration
 #: view:res.company:0
 msgid "Configuration"
-msgstr "Настройка"
+msgstr "Настройки"
 
 #. module: mrp
 #: field:mrp.production,name:0
 msgid "Reference"
-msgstr ""
+msgstr "Отпратка"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Finished Products"
-msgstr ""
+msgstr "Произведени продукти"
 
 #. module: mrp
 #: wizard_field:mrp.procurement.compute.all,init,automatic:0
 #: wizard_field:mrp.procurement.orderpoint.compute,init,automatic:0
 msgid "Automatic orderpoint"
-msgstr ""
+msgstr "Автоматично пренареждане"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 7aa9c7700c0..3467172df6b 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-27 12:39+0000\n"
+"PO-Revision-Date: 2010-01-11 20:49+0000\n"
 "Last-Translator: TeMPO <info@tempo-consulting.fr>\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: 2009-12-16 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-01-12 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -1635,7 +1635,7 @@ msgstr "Valide depuis"
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Normal BoM"
-msgstr "UdM Standard"
+msgstr "Nomemclature normale"
 
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
diff --git a/addons/mrp/installer.py b/addons/mrp/installer.py
new file mode 100644
index 00000000000..4d7936c91c2
--- /dev/null
+++ b/addons/mrp/installer.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+
+class mrp_installer(osv.osv_memory):
+    _name = 'mrp.installer'
+    _inherit = 'res.config.installer'
+
+    _columns = {
+        # Manufacturing Resource Planning
+        'stock_location':fields.boolean('Advanced Routes'),
+        'mrp_jit':fields.boolean('Just In Time Scheduling'),
+        'mrp_operations':fields.boolean('Manufacturing Operations'),
+        'mrp_subproduct':fields.boolean('MRP Subproducts'),
+        'mrp_repair':fields.boolean('Repairs'),
+        }
+mrp_installer()
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index c3a272f06ca..1f3be7c0943 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -544,7 +544,7 @@ class mrp_production(osv.osv):
 
     #TODO Review materials in function in_prod and prod_end.
     def action_production_end(self, cr, uid, ids):
-        move_ids = []
+#        move_ids = []
         for production in self.browse(cr, uid, ids):
             for res in production.move_lines:
                 for move in production.move_created_ids:
@@ -552,7 +552,7 @@ class mrp_production(osv.osv):
                     cr.execute('INSERT INTO stock_move_history_ids \
                             (parent_id, child_id) VALUES (%s,%s)',
                             (res.id, move.id))
-                move_ids.append(res.id)
+#                move_ids.append(res.id)
             vals= {'state':'confirmed'}
             new_moves = [x.id for x in production.move_created_ids]
             self.pool.get('stock.move').write(cr, uid, new_moves, vals)
@@ -562,7 +562,7 @@ class mrp_production(osv.osv):
             self.pool.get('stock.move').check_assign(cr, uid, new_moves)
             self.pool.get('stock.move').action_done(cr, uid, new_moves)
             self._costs_generate(cr, uid, production)
-        self.pool.get('stock.move').action_done(cr, uid, move_ids)
+#        self.pool.get('stock.move').action_done(cr, uid, move_ids)
         self.write(cr,  uid, ids, {'state': 'done'})
         return True
 
@@ -1009,7 +1009,7 @@ class mrp_procurement(osv.osv):
         self.write(cr, uid, ids, {'state':'confirmed','message':''})
         return True
 
-    def action_move_assigned(self, cr, uid, ids):
+    def action_move_assigned(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'running','message':_('from stock: products assigned.')})
         return True
 
@@ -1085,11 +1085,13 @@ class mrp_procurement(osv.osv):
             newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
             newdate = newdate - procurement.product_id.seller_ids[0].delay
 
-            context.update({'lang':partner.lang})
+            #Passing partner_id to context for purchase order line integrity of Line name
+            context.update({'lang':partner.lang, 'partner_id':partner_id})
+            
             product=self.pool.get('product.product').browse(cr,uid,procurement.product_id.id,context=context)
 
             line = {
-                'name': product.name,
+                'name': product.partner_ref,
                 'product_qty': qty,
                 'product_id': procurement.product_id.id,
                 'product_uom': uom_id,
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
new file mode 100644
index 00000000000..a6b2f7ed1b6
--- /dev/null
+++ b/addons/mrp/mrp_installer.xml
@@ -0,0 +1,63 @@
+<openerp>
+  <data>
+    <record id="view_mrp_installer" model="ir.ui.view">
+      <field name="name">mrp.installer.view</field>
+      <field name="model">mrp.installer</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="arch" type="xml">
+        <data>
+          <form position="attributes"><attribute name="string">
+              MRP Modules Installation
+          </attribute></form>
+
+          <group string="res_config_contents" position="replace">
+            <separator string="Configure Your Manufacturing" colspan="4"/>
+            <image name="gtk-dialog-info"/>
+            <newline/>
+            <label align="0.0" string=" Lorem ipsum dolor
+                sit amet, consectetur adipiscing elit. Cras metus
+                augue, ultricies et vehicula id, fringilla quis
+                mauris. Vestibulum fringilla ipsum sit amet est
+                adipiscing eget euismod velit semper. Proin non mauris
+                velit. Donec malesuada nisi sed augue viverra commodo
+                sagittis nisi rutrum. Cras vitae libero nunc, a
+                molestie sapien. Proin et augue sit amet est egestas
+                fermentum ut eu lacus. Etiam nisi orci, volutpat
+                aliquam viverra interdum, vehicula iaculis
+                lectus. Mauris ligula sapien, auctor in pharetra non,
+                ultrices quis odio."/>
+            <group>
+              <separator string="Manufacturing Resource Planning" colspan="4"/>
+              <!-- Advanced Routes -->
+              <field name="mrp_jit"/>
+              <field name="mrp_operations"/>
+              <field name="mrp_subproduct"/>
+              <field name="mrp_repair"/>
+            </group>
+          </group>
+
+          <xpath expr='//button[@name="action_skip"]' position='replace'/>
+          <xpath expr='//button[@name="action_next"]' position='attributes'>
+            <attribute name='string'>Install Modules</attribute>
+          </xpath>
+        </data>
+      </field>
+    </record>
+
+    <record id="action_mrp_installer" model="ir.actions.act_window">
+      <field name="name">MRP Modules Installation</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">mrp.installer</field>
+      <field name="view_id" ref="view_mrp_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="mrp_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_mrp_installer"/>
+      <field name="sequence">1</field>
+    </record>
+  </data>
+</openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 0e7ff6db167..34ea506fb23 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -4,8 +4,14 @@
 
         <menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"
             groups="group_mrp_user,group_mrp_manager"/>
-        <menuitem id="menu_mrp_reordering" name="Automatic Requisitions" parent="stock.menu_stock_root" sequence="4"/>
+        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
+		<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="menu_mrp_root" sequence="1"/>
 
+        <menuitem name="Control" id="menu_mrp_control" parent="menu_mrp_root"  sequence="3" />
+     	<menuitem name="Master Data"
+                  id="menu_mrp_bom"
+                  parent="menu_mrp_root"
+                  sequence="5" />
         <!--
         Property / Property Group
         -->
@@ -34,7 +40,7 @@
             name="Configuration"
             parent="menu_mrp_root"
             groups="group_mrp_manager"
-            sequence="-50" />
+            sequence="50" />
 
         <record id="mrp_property_tree_view" model="ir.ui.view">
             <field name="name">mrp.property.tree</field>
@@ -74,7 +80,7 @@
             id="menu_mrp_property"
             parent="menu_mrp_configuration"
             groups="base.group_extended"
-            sequence="10" />
+            sequence="20" />
         <menuitem
             action="mrp_property_action"
             id="menu_mrp_property_action"
@@ -220,10 +226,10 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_routing_tree_view"/>
         </record>
-        <menuitem name="Routings" id="menu_mrp_routing_and_workcenters" parent="menu_mrp_configuration" groups="base.group_extended"
-                  sequence="100" />
-        <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="menu_mrp_routing_and_workcenters" groups="base.group_extended" />
-        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="menu_mrp_routing_and_workcenters" groups="base.group_extended"/>
+ <!--       <menuitem name="Routings" id="menu_mrp_routing_and_workcenters" parent="mrp.menu_mrp_bom" groups="base.group_extended"
+                  sequence="100" />-->
+        <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="40" />
+        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="30"/>
 
         <!--
           Bill of Materials
@@ -309,10 +315,11 @@
         </record>
 
         <!-- BOM menus -->
-        <menuitem name="Bill of Materials"
+
+  <!--      <menuitem name="Bill of Materials"
                   id="menu_mrp_bom"
-                  parent="menu_mrp_configuration"
-                  sequence="50" />
+                  parent="menu_mrp_bom"
+                  sequence="50" />-->
         <menuitem action="mrp_bom_form_action"
                   id="menu_mrp_bom_form_action"
                   parent="menu_mrp_bom"
@@ -375,7 +382,7 @@
             <field name="model">mrp.production</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date and state in ('done','cancel') " string="Production orders">
+                <tree colors="red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date and state in ('done','cancel') " string="Manufacturing Orders">
                     <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_qty" sum="Total Qty"/>
@@ -395,7 +402,7 @@
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="routing_id" date_start="date_planned" string="Production Orders">
+                <calendar color="routing_id" date_start="date_planned" string="Manufacturing Orders">
                     <field name="origin"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
@@ -424,7 +431,7 @@
             <field name="model">mrp.production</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Production orders" type="bar">
+                <graph string="Manufacturing Orders" type="bar">
                     <field name="date_planned_date"/>
                     <field name="hour_total" operator="+"/>
                     <field name="cycle_total" operator="+"/>
@@ -444,7 +451,7 @@
             <field name="model">mrp.production</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Production orders">
+                <form string="Manufacturing Orders">
                     <group colspan="4" col="7">
                         <field name="name" select="1"/>
                         <field name="date_planned" select="1"/>
@@ -525,8 +532,8 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                    <group col='8' colspan='4'>
-                       <filter icon="terp-mrp" string="Ready" domain="[('state','=','ready')]" help="Production orders which are ready to produce"/>
-                       <filter icon="terp-mrp" string="In Production" domain="[('state','=','in_production')]" help="Production orders which are in production"/>
+                       <filter icon="terp-mrp" string="Ready" domain="[('state','=','ready')]" help="Manufacturing Orders which are ready to produce"/>
+                       <filter icon="terp-mrp" string="In Production" domain="[('state','=','in_production')]" help="Manufacturing Orders which are in production"/>
                        <separator orientation="vertical"/>
                        <field name="name" select='1'/>
                        <field name="product_id" select='1'/>
@@ -538,7 +545,7 @@
         </record>
 
         <record id="mrp_production_action" model="ir.actions.act_window">
-            <field name="name">Production Orders</field>
+            <field name="name">Manufacturing Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.production</field>
             <field name="view_type">form</field>
@@ -546,10 +553,10 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
-        <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_root" sequence="-30"/>
+        <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" sequence="1"/>
 
         <record id="mrp_production_action2_gantt" model="ir.actions.act_window">
-            <field name="name">Production Orders Planning</field>
+            <field name="name">Manufacturing Orders Planning</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.production</field>
             <field name="view_type">form</field>
@@ -558,7 +565,7 @@
         </record>
 
         <record id="mrp_production_action2" model="ir.actions.act_window">
-            <field name="name">Production Orders To Start</field>
+            <field name="name">Manufacturing Orders To Start</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.production</field>
             <field name="view_type">form</field>
@@ -569,7 +576,7 @@
         </record>
 
         <record id="mrp_production_action3" model="ir.actions.act_window">
-            <field name="name">Production Orders in Progress</field>
+            <field name="name">Manufacturing Orders in Progress</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.production</field>
             <field name="view_type">form</field>
@@ -580,7 +587,7 @@
         </record>
 
         <record id="mrp_production_action4" model="ir.actions.act_window">
-            <field name="name">Production Orders Waiting Products</field>
+            <field name="name">Manufacturing Orders Waiting Products</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.production</field>
             <field name="view_type">form</field>
@@ -654,7 +661,7 @@
         </record>
 
         <!--
-    	Requisition
+    	Procurement
     -->
 
         <record id="mrp_procurement_tree_view" model="ir.ui.view">
@@ -662,7 +669,7 @@
             <field name="model">mrp.procurement</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Requisition Lines">
+                <tree string="Procurement Lines">
                     <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
@@ -680,10 +687,10 @@
             <field name="model">mrp.procurement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Requisition">
+                <form string="Procurement">
                     <group col="2" colspan="2">
                         <separator colspan="2" string="References"/>
-                        <field name="name" select="1" string="Requisition Reason"/>
+                        <field name="name" select="1" string="Procurement Reason"/>
                         <field name="origin" select="2"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
@@ -694,7 +701,7 @@
                         <field name="priority" groups="base.group_extended"/>
                     </group>
                     <notebook colspan="4">
-                    <page string="Requisition Details">
+                    <page string="Procurement Details">
                         <separator colspan="4" string="Product &amp; Location"/>
                         <field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
                         <field name="location_id" select="2"/>
@@ -710,9 +717,8 @@
                         <group col="7" colspan="2">
                             <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
                             <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
-                            <button name="button_cancel" states="exception,waiting" string="Cancel" icon="gtk-cancel"/>
-                            <button name="button_check" states="confirmed" string="Run 	Requisition" icon="gtk-media-play"/>
-                            <button name="button_cancel" states="draft,running" string="Cancel" icon="gtk-cancel"/>
+                            <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
+                            <button name="button_check" states="confirmed" string="Run 	Procurement" icon="gtk-media-play"/>
                         </group>
                     </page>
                     <page string="Extra Information">
@@ -738,9 +744,9 @@
             <field name="model">mrp.procurement</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Requisition">
+                <search string="Search Procurement">
                        <group col='8' colspan='4'>
-                       <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Requisition orders with exceptions"/>
+                       <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
                        <separator orientation="vertical"/>
                        <field name="name" select='1'/>
                        <field name="product_id" select='1'/>
@@ -751,18 +757,18 @@
             </field>
         </record>
         <record id="mrp_procurement_action" model="ir.actions.act_window">
-            <field name="name">Requisition Orders</field>
+            <field name="name">Procurement Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_procurement_filter"/>
         </record>
-        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root"
-                  sequence="-40" />
+        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_manufacturing"
+                  sequence="2" />
 
         <record id="mrp_procurement_action3" model="ir.actions.act_window">
-            <field name="name">Unscheduled Requisitions</field>
+            <field name="name">Requisitions</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
@@ -770,8 +776,23 @@
             <field name="domain">[('state','=','confirmed')]</field>
         </record>
 
+      <menuitem action="mrp_procurement_action3" id="menu_procurement_requisitions" parent="purchase.menu_procurement_management"
+                  name="Requisitions" sequence="5" />
+		<record id="mrp_procurement_action_quotation" model="ir.actions.act_window">
+            <field name="name">Quotation Request</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft')]</field>
+        </record>
+	    <menuitem action="mrp_procurement_action_quotation" id="menu_procurement_request_quotation" parent="purchase.menu_procurement_management"
+                  name="Request for Quotations" sequence="6" />
+
+
+
         <record id="mrp_procurement_action5" model="ir.actions.act_window">
-            <field name="name">Requisition Exceptions</field>
+            <field name="name">Procurement Exceptions</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
@@ -779,8 +800,10 @@
             <field name="domain">[('state','=','exception')]</field>
         </record>
 
+		<menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_exception_action" parent="mrp.menu_mrp_control"
+                  sequence="1" />
         <record id="mrp_procurement_action4" model="ir.actions.act_window">
-            <field name="name">Requisition Exceptions to Fix</field>
+            <field name="name">Procurement Exceptions to Fix</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
@@ -790,7 +813,7 @@
         </record>
 
         <record id="mrp_procurement_action11" model="ir.actions.act_window">
-            <field name="name">Temporary Requisition Exceptions</field>
+            <field name="name">Temporary Procurement Exceptions</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index acf2edd2c2b..935c556a93c 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -2,7 +2,8 @@
 <openerp>
     <data>
         <wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute Schedulers" name="mrp.procurement.compute.all"/>
-        <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="90"/>
+        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="menu_mrp_root" sequence="4"/>   
+        <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" type="wizard" sequence="90"/>
         <wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute Requisitions Only" name="mrp.procurement.compute"/>
         <!--
           <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>
diff --git a/addons/mrp/report/__init__.py b/addons/mrp/report/__init__.py
index c3a3e393a89..b71cf46ea4d 100644
--- a/addons/mrp/report/__init__.py
+++ b/addons/mrp/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/report/order.py b/addons/mrp/report/order.py
index 3f5ba86d59c..7acf6029392 100644
--- a/addons/mrp/report/order.py
+++ b/addons/mrp/report/order.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 30ea59792e1..0a6a21de971 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index 4ec95f0d289..0bbca83a130 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/schedulers.py b/addons/mrp/schedulers.py
index 2f62c94587a..6c3effa3995 100644
--- a/addons/mrp/schedulers.py
+++ b/addons/mrp/schedulers.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/scripts/scheduler.py b/addons/mrp/scripts/scheduler.py
index 46d3f304e0b..d95e8246c70 100644
--- a/addons/mrp/scripts/scheduler.py
+++ b/addons/mrp/scripts/scheduler.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index b233dd8d4ae..d619539a802 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/wizard/make_procurement.py b/addons/mrp/wizard/make_procurement.py
index 423ac4bd65c..0cf12107181 100644
--- a/addons/mrp/wizard/make_procurement.py
+++ b/addons/mrp/wizard/make_procurement.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/wizard/wizard_change_production_qty.py b/addons/mrp/wizard/wizard_change_production_qty.py
index d85731d9bea..a9a8387acdf 100644
--- a/addons/mrp/wizard/wizard_change_production_qty.py
+++ b/addons/mrp/wizard/wizard_change_production_qty.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/wizard/wizard_orderpoint_procurement.py b/addons/mrp/wizard/wizard_orderpoint_procurement.py
index 3a1cc1e326d..00fb232d5f5 100644
--- a/addons/mrp/wizard/wizard_orderpoint_procurement.py
+++ b/addons/mrp/wizard/wizard_orderpoint_procurement.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/wizard/wizard_price.py b/addons/mrp/wizard/wizard_price.py
index 9902c67cc8e..dd84ad23be2 100644
--- a/addons/mrp/wizard/wizard_price.py
+++ b/addons/mrp/wizard/wizard_price.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/wizard/wizard_procurement.py b/addons/mrp/wizard/wizard_procurement.py
index 0bd09ace396..af43437cc52 100644
--- a/addons/mrp/wizard/wizard_procurement.py
+++ b/addons/mrp/wizard/wizard_procurement.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/wizard/wizard_schedulers_all.py b/addons/mrp/wizard/wizard_schedulers_all.py
index c9363dd19b8..54a96383f79 100644
--- a/addons/mrp/wizard/wizard_schedulers_all.py
+++ b/addons/mrp/wizard/wizard_schedulers_all.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/wizard/wizard_track_line.py b/addons/mrp/wizard/wizard_track_line.py
index 25dbef4c970..b13de11735b 100644
--- a/addons/mrp/wizard/wizard_track_line.py
+++ b/addons/mrp/wizard/wizard_track_line.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/mrp/wizard/wizard_track_prod.py b/addons/mrp/wizard/wizard_track_prod.py
index 4a082842fa5..c94ce47b8d8 100644
--- a/addons/mrp/wizard/wizard_track_prod.py
+++ b/addons/mrp/wizard/wizard_track_prod.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp/wizard/wizard_workcenter_load.py b/addons/mrp/wizard/wizard_workcenter_load.py
index a26d10a2856..6465622c421 100644
--- a/addons/mrp/wizard/wizard_workcenter_load.py
+++ b/addons/mrp/wizard/wizard_workcenter_load.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_jit/__init__.py b/addons/mrp_jit/__init__.py
index 0d29405d526..2aefd8b3c11 100644
--- a/addons/mrp_jit/__init__.py
+++ b/addons/mrp_jit/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_jit/__terp__.py b/addons/mrp_jit/__terp__.py
index 1d894a84c30..25649dbc682 100644
--- a/addons/mrp_jit/__terp__.py
+++ b/addons/mrp_jit/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_operations/__init__.py b/addons/mrp_operations/__init__.py
index e7726da004a..c493c5ae7fe 100644
--- a/addons/mrp_operations/__init__.py
+++ b/addons/mrp_operations/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_operations/__terp__.py b/addons/mrp_operations/__terp__.py
index d47906b44cc..9c0a2bb4f33 100644
--- a/addons/mrp_operations/__terp__.py
+++ b/addons/mrp_operations/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_operations/i18n/es.po b/addons/mrp_operations/i18n/es.po
index aa3a1d5ab7c..c868f7b3594 100644
--- a/addons/mrp_operations/i18n/es.po
+++ b/addons/mrp_operations/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-12-15 08:15+0000\n"
+"PO-Revision-Date: 2010-01-14 23:12+0000\n"
 "Last-Translator: Daniel Brown <dbrown@tecnosconsultores.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: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-01-16 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
@@ -161,6 +161,8 @@ msgid ""
 "Check this to be able to move independently all production orders, without "
 "moving dependent ones."
 msgstr ""
+"Selecciona esta opcion para poder mover independientemente todas las ordenes "
+"de producción, sin mover sus dependientes"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action
@@ -235,7 +237,7 @@ msgstr "Orden de producción para cualquier producto"
 #. module: mrp_operations
 #: field:stock.move,move_dest_id_lines:0
 msgid "Children Moves"
-msgstr ""
+msgstr "Hijo se mueve"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
@@ -320,7 +322,7 @@ msgstr "Operación inicio de producción"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Packing Exception"
-msgstr ""
+msgstr "Excepción de empaque"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,workcenter_id:0
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 590cb5fee18..8a6efa625bb 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -141,7 +141,16 @@ class mrp_production_workcenter_line(osv.osv):
         return True
 
     def action_done(self, cr, uid, ids):
-        self.write(cr, uid, ids, {'state':'done', 'date_finnished': time.strftime('%Y-%m-%d %H:%M:%S')})
+        delay = 0.0
+        date_now = time.strftime('%Y-%m-%d %H:%M:%S')
+        obj_line = self.browse(cr, uid, ids[0])
+        
+        date_start = datetime.datetime.strptime(obj_line.date_start,'%Y-%m-%d %H:%M:%S')
+        date_finished = datetime.datetime.strptime(date_now,'%Y-%m-%d %H:%M:%S')
+        delay += (date_finished-date_start).days * 24
+        delay += (date_finished-date_start).seconds / float(60*60)
+        
+        self.write(cr, uid, ids, {'state':'done', 'date_finnished': date_now,'delay':delay})
         self.modify_production_order_state(cr,uid,ids,'done')
         return True
 
@@ -337,7 +346,7 @@ class mrp_operations_operation(osv.osv):
                 a = datetime.datetime.strptime(time_lst[i-1],'%Y-%m-%d %H:%M:%S')
                 b = datetime.datetime.strptime(time_lst[i],'%Y-%m-%d %H:%M:%S')
                 diff += (b-a).days * 24
-                diff += (b-a).seconds / (60*60)
+                diff += (b-a).seconds / float(60*60)
         return diff
 
     def check_operation(self,cr,uid,vals):
@@ -412,6 +421,7 @@ class mrp_operations_operation(osv.osv):
             if code.start_stop=='start':
                 tmp=self.pool.get('mrp.production.workcenter.line').action_start_working(cr,uid,wc_op_id)
                 wf_service.trg_validate(uid, 'mrp.production.workcenter.line', wc_op_id[0], 'button_start_working', cr)
+                
 
             if code.start_stop=='done':
                 tmp=self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,wc_op_id)
@@ -433,9 +443,17 @@ class mrp_operations_operation(osv.osv):
         if not self.check_operation(cr, uid, vals):
             return
         delay=self.calc_delay(cr, uid, vals)
-        self.pool.get('mrp.production.workcenter.line').write(cr,uid,wc_op_id,{'delay':delay})
+        line_vals = {}
+        line_vals['delay'] = delay
+        if vals.get('date_start',False):
+            if code.start_stop == 'done':
+                line_vals['date_finnished'] = vals['date_start']
+            elif code.start_stop == 'start':    
+                line_vals['date_start'] = vals['date_start']
 
-        return super(mrp_operations_operation, self).create(cr, uid, vals,  context=context)
+        self.pool.get('mrp.production.workcenter.line').write(cr, uid, wc_op_id, line_vals, context=context)
+
+        return super(mrp_operations_operation, self).create(cr, uid, vals, context=context)
 
     _columns={
         'production_id':fields.many2one('mrp.production','Production',required=True),
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 48261c19912..9f891b480ec 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-
+	<menuitem id="menu_mrp_planning" name="Planning" parent="mrp.menu_mrp_root" sequence="2"/>
     <record model="ir.ui.view" id="mrp_production_workcenter_tree_view_inherit">
         <field name="name">mrp.production.workcenter.line.tree</field>
         <field name="model">mrp.production.workcenter.line</field>
@@ -138,7 +138,7 @@
         <field name="res_model">mrp.production.workcenter.line</field>
         <field name="view_type">form</field>
         <field name="domain">[('production_state','in',('ready','confirmed','in_production'))]</field>
-        <field name="view_mode">gantt,tree,form,graph,calendar</field>
+        <field name="view_mode">tree,form,graph,calendar</field>
     </record>
 
 
@@ -151,7 +151,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,graph,gantt,calendar</field>
         <field name="domain">[('production_state','=','ready')]</field>
-        <field name="filter" eval="True"/>        
+        <field name="filter" eval="True"/>
     </record>
 
     <!-- Action for Draft Operations   -->
@@ -163,7 +163,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="domain">[('state','=','draft')]</field>
-        <field name="filter" eval="True"/>        
+        <field name="filter" eval="True"/>
     </record>
 
     <record model="ir.values" id="mrp_production_wc_action_open">
@@ -175,7 +175,10 @@
 
     </record>
 
-    <menuitem name="All Work Orders" parent="mrp.menu_mrp_root" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/>
+    <menuitem action="mrp.mrp_production_action" id="menu_mrp_production_order_action" parent="menu_mrp_planning" sequence="1"/>
+    <menuitem name="Work Orders" parent="mrp.menu_mrp_manufacturing" id="menu_mrp_production_wc_order" action="mrp_production_wc_action_form"/>
+	<menuitem name="Work Orders" parent="menu_mrp_planning" id="menu_mrp_production_wc_action_planning" action="mrp_production_wc_action_planning" sequence="2"/>
+<!--    <menuitem name="All Work Orders" parent="menu_mrp_planning" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/>-->
 
 <!-- Operation codes -->
 
@@ -214,7 +217,7 @@
         <field name="view_id" ref="mrp_production_code_tree_view"/>
     </record>
 
-    <menuitem name="Start - Stop Codes" parent="mrp.menu_mrp_configuration" id="menu_mrp_production_code_action" action="mrp_production_code_action"/>
+<!--    <menuitem name="Start - Stop Codes" parent="menu_mrp_planning" id="menu_mrp_production_code_action" action="mrp_production_code_action"/>-->
 
 <!-- Operations -->
 
@@ -271,11 +274,11 @@
         <field name="view_id" ref="mrp_production_operation_tree_view"/>
     </record>
 
-    <menuitem
-        name="Work Order Events Using Bar Codes"
-        parent="mrp.menu_mrp_root"
-        id="menu_mrp_production_operation_action"
-        action="mrp_production_operation_action"/>
+<!--    <menuitem-->
+<!--        name="Work Order Events Using Bar Codes"-->
+<!--        parent="menu_mrp_planning"-->
+<!--        id="menu_mrp_production_operation_action"-->
+<!--        action="mrp_production_operation_action"/>-->
 
     <record id="mrp_production_reorder_form_view" model="ir.ui.view">
         <field name="name">mrp.production.allow_reorder.form</field>
diff --git a/addons/mrp_operations/process/mrp_operation_process.xml b/addons/mrp_operations/process/mrp_operation_process.xml
index c229f3a55de..17bc98d4643 100644
--- a/addons/mrp_operations/process/mrp_operation_process.xml
+++ b/addons/mrp_operations/process/mrp_operation_process.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!--
 			Process
 		-->
-	
+
 		<record id="process_process_mrpoperationprocess0" model="process.process">
 			<field eval="&quot;&quot;&quot;Mrp Operations&quot;&quot;&quot;" name="name"/>
 			<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
 			<field eval="1" name="active"/>
 		</record>
-		
+
 		<!--
 			Process Node
 		-->
-		
+
 		<record id="process_node_productionorder0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_production_action"/>
 			<field name="model_id" ref="mrp.model_mrp_production"/>
@@ -26,9 +26,9 @@
 			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="1" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_workorder0" model="process.node">
-			<field name="menu_id" ref="menu_mrp_production_operation_action"/>
+<!--			<field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
 			<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Information from the routing definition.&quot;&quot;&quot;" name="note"/>
@@ -37,9 +37,9 @@
 			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="1" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_startoperation0" model="process.node">
-			<field name="menu_id" ref="menu_mrp_production_operation_action"/>
+<!--			<field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
 			<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Start the operation.&quot;&quot;&quot;" name="note"/>
@@ -48,9 +48,9 @@
 			<field eval="&quot;&quot;&quot;object.state=='startworking'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_doneoperation0" model="process.node">
-			<field name="menu_id" ref="menu_mrp_production_operation_action"/>
+<!--			<field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
 			<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Finish the operation.&quot;&quot;&quot;" name="note"/>
@@ -59,9 +59,9 @@
 			<field eval="&quot;&quot;&quot;object.state=='done'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_canceloperation0" model="process.node">
-			<field name="menu_id" ref="menu_mrp_production_operation_action"/>
+<!--			<field name="menu_id" ref="menu_mrp_production_operation_action"/>-->
 			<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Cancel the operation.&quot;&quot;&quot;" name="note"/>
@@ -70,11 +70,11 @@
 			<field eval="&quot;&quot;&quot;object.state=='cancel'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<!--
 			Process Transition
 		-->
-		
+
 		<record id="process_transition_productionstart0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -83,7 +83,7 @@
 			<field model="process.node" name="target_node_id" ref="process_node_startoperation0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
 		</record>
-		
+
 		<record id="process_transition_workstartoperation0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -92,7 +92,7 @@
 			<field model="process.node" name="target_node_id" ref="process_node_startoperation0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_workorder0"/>
 		</record>
-		
+
 		<record id="process_transition_startdoneoperation0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -101,7 +101,7 @@
 			<field model="process.node" name="target_node_id" ref="process_node_doneoperation0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_startoperation0"/>
 		</record>
-		
+
 		<record id="process_transition_startcanceloperation0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -110,7 +110,6 @@
 			<field model="process.node" name="target_node_id" ref="process_node_canceloperation0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_startoperation0"/>
 		</record>
-		
+
 	</data>
 </openerp>
-	
\ No newline at end of file
diff --git a/addons/mrp_operations/report/__init__.py b/addons/mrp_operations/report/__init__.py
index df6b38fd5af..36db08542a9 100755
--- a/addons/mrp_operations/report/__init__.py
+++ b/addons/mrp_operations/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_operations/report/mrp_code_barcode.py b/addons/mrp_operations/report/mrp_code_barcode.py
index d216e9ef0cd..ab487b7c70a 100755
--- a/addons/mrp_operations/report/mrp_code_barcode.py
+++ b/addons/mrp_operations/report/mrp_code_barcode.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_operations/report/mrp_wc_barcode.py b/addons/mrp_operations/report/mrp_wc_barcode.py
index bc8f4e2ccf6..b422ecda340 100755
--- a/addons/mrp_operations/report/mrp_wc_barcode.py
+++ b/addons/mrp_operations/report/mrp_wc_barcode.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_repair/__init__.py b/addons/mrp_repair/__init__.py
index 233e3976dc1..9727c3d05e9 100644
--- a/addons/mrp_repair/__init__.py
+++ b/addons/mrp_repair/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__terp__.py
index 595ff9c9a63..2f44e257a80 100644
--- a/addons/mrp_repair/__terp__.py
+++ b/addons/mrp_repair/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_repair/i18n/it.po b/addons/mrp_repair/i18n/it.po
index 9ad9bf9746e..e8ee5ec9f18 100644
--- a/addons/mrp_repair/i18n/it.po
+++ b/addons/mrp_repair/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-01-09 14:51+0000\n"
-"Last-Translator: Carlo <Unknown>\n"
+"PO-Revision-Date: 2010-01-20 13:06+0000\n"
+"Last-Translator: Milo Casagrande <milo@casagrande.name>\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-01-10 07:17+0000\n"
+"X-Launchpad-Export-Date: 2010-01-22 04:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
@@ -479,7 +479,7 @@ msgstr ""
 #: selection:mrp.repair,state:0
 #: wizard_button:mrp.repair.make_invoice,init,end:0
 msgid "Cancel"
-msgstr "Cancella"
+msgstr "Annulla"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 78cbca337d1..7ae054c3a16 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 4c3cf5a08bc..2045acae1f1 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -224,7 +224,7 @@
             <field name="filter" eval="True"/>
         </record>
 
-        <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_root" name="Repairs" sequence="50"/>
+        <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_manufacturing" name="Repairs" sequence="50"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp_repair/report/__init__.py b/addons/mrp_repair/report/__init__.py
index 45b5491c9a9..d7659b7fc65 100644
--- a/addons/mrp_repair/report/__init__.py
+++ b/addons/mrp_repair/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_repair/report/order.py b/addons/mrp_repair/report/order.py
index 993c973c32f..298e1f237ff 100644
--- a/addons/mrp_repair/report/order.py
+++ b/addons/mrp_repair/report/order.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_repair/wizard/__init__.py b/addons/mrp_repair/wizard/__init__.py
index b0456900f7a..ec3063f01de 100644
--- a/addons/mrp_repair/wizard/__init__.py
+++ b/addons/mrp_repair/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_repair/wizard/wizard_cancel_repair.py b/addons/mrp_repair/wizard/wizard_cancel_repair.py
index 9e9b2ef9f2d..d895096ce6f 100644
--- a/addons/mrp_repair/wizard/wizard_cancel_repair.py
+++ b/addons/mrp_repair/wizard/wizard_cancel_repair.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_repair/wizard/wizard_make_invoice.py b/addons/mrp_repair/wizard/wizard_make_invoice.py
index 269d04b707f..71aefadfe4b 100644
--- a/addons/mrp_repair/wizard/wizard_make_invoice.py
+++ b/addons/mrp_repair/wizard/wizard_make_invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_subproduct/__init__.py b/addons/mrp_subproduct/__init__.py
index 5e7fa5eea67..5b48431ef16 100644
--- a/addons/mrp_subproduct/__init__.py
+++ b/addons/mrp_subproduct/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_subproduct/__terp__.py b/addons/mrp_subproduct/__terp__.py
index 807000c3023..02dd29bd73d 100644
--- a/addons/mrp_subproduct/__terp__.py
+++ b/addons/mrp_subproduct/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index 9e07515a0ff..22ae9c44bec 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/multi_company/__init__.py b/addons/multi_company/__init__.py
index 0d29405d526..2aefd8b3c11 100644
--- a/addons/multi_company/__init__.py
+++ b/addons/multi_company/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/multi_company/__terp__.py b/addons/multi_company/__terp__.py
index 83d6afa777f..df892aca33c 100644
--- a/addons/multi_company/__terp__.py
+++ b/addons/multi_company/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/multi_company/i18n/pt_BR.po b/addons/multi_company/i18n/pt_BR.po
new file mode 100644
index 00000000000..5a0be538147
--- /dev/null
+++ b/addons/multi_company/i18n/pt_BR.po
@@ -0,0 +1,198 @@
+# Brazilian Portuguese 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-12-08 11:46+0000\n"
+"PO-Revision-Date: 2010-01-20 00:41+0000\n"
+"Last-Translator: pedrobom <pedrobomlimeira@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@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-01-22 04:34+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: multi_company
+#: help:multi_company.default,object_id:0
+msgid "Object affect by this rules"
+msgstr "Objeto afetado por esta regra"
+
+#. module: multi_company
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"O nome do Objeto deve iniciar com x_ e não conter nenhum caracter especial!"
+
+#. module: multi_company
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Erro: A unidade padrão e a unidade de compra devem ser da mesma categoria."
+
+#. module: multi_company
+#: constraint:res.partner:0
+msgid "The VAT doesn't seem to be correct."
+msgstr "O imposto não parece estar correto."
+
+#. module: multi_company
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nome de modelo inválido na definição da ação"
+
+#. module: multi_company
+#: model:res.company,overdue_msg:multi_company.res_company_odoo
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_be
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_editor
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_in
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_us
+msgid ""
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department"
+msgstr ""
+
+#. module: multi_company
+#: field:multi_company.default,company_dest_id:0
+msgid "Default Company"
+msgstr "Empresa Padrão"
+
+#. module: multi_company
+#: field:multi_company.default,object_id:0
+msgid "Object"
+msgstr "Objeto"
+
+#. module: multi_company
+#: model:ir.module.module,shortdesc:multi_company.module_meta_information
+#: view:multi_company.default:0
+msgid "Multi Company"
+msgstr "Multi Empresa"
+
+#. module: multi_company
+#: model:ir.module.module,description:multi_company.module_meta_information
+msgid ""
+"This module add the possibility to easily manage \n"
+"    the default value for each object\n"
+"    "
+msgstr ""
+"Este módulo acrescenta a possibilidade de gerenciar facilmente \n"
+"    o valor padrão para cada objeto\n"
+"    "
+
+#. module: multi_company
+#: field:multi_company.default,company_id:0
+msgid "Main Company"
+msgstr "Empresa principal"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr "Condição"
+
+#. module: multi_company
+#: help:multi_company.default,company_dest_id:0
+msgid "Company to store the current record"
+msgstr "Empresa para guardar o registro atual"
+
+#. module: multi_company
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML inválido para Arquitetura da View"
+
+#. module: multi_company
+#: field:multi_company.default,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: multi_company
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+"Erro: Unidade de venda deve ser de categoria diferente da unidade de medida"
+
+#. module: multi_company
+#: model:product.category,name:multi_company.Odoo1
+msgid "Odoo Offers"
+msgstr ""
+
+#. module: multi_company
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Você não pode criar empresas recursivas."
+
+#. module: multi_company
+#: help:multi_company.default,name:0
+msgid "Name it to easily find a record"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
+msgid "Multi company"
+msgstr "Multi empresa"
+
+#. module: multi_company
+#: model:ir.model,name:multi_company.model_multi_company_default
+msgid "multi_company.default"
+msgstr ""
+
+#. module: multi_company
+#: help:multi_company.default,company_id:0
+msgid "Company where the user is connected"
+msgstr "Empresa onde o usuário está conectado"
+
+#. module: multi_company
+#: model:ir.actions.act_window,name:multi_company.action_inventory_form
+msgid "Default Company per Object"
+msgstr "Empresa Padrão por Objeto"
+
+#. module: multi_company
+#: field:multi_company.default,expression:0
+msgid "Expression"
+msgstr "Expressão"
+
+#. module: multi_company
+#: model:product.template,name:multi_company.product_product_odoo1_product_template
+msgid "Odoo Offer"
+msgstr ""
+
+#. module: multi_company
+#: field:multi_company.default,sequence:0
+msgid "Sequence"
+msgstr "Seqüência"
+
+#. module: multi_company
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Erro!  Você não pode criar categorias recursivas."
+
+#. module: multi_company
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Erro: Código EAN inválido"
+
+#. module: multi_company
+#: help:multi_company.default,expression:0
+msgid "Expression, must be True to match"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
+msgid "Default company per Object"
+msgstr "Empresa padrão por Objeto"
+
+#. module: multi_company
+#: code:addons/multi_company/multi_company.py:0
+#, python-format
+msgid " (copy)"
+msgstr " (cópia)"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Matching"
+msgstr ""
diff --git a/addons/olap/__init__.py b/addons/olap/__init__.py
new file mode 100755
index 00000000000..fbc12796e54
--- /dev/null
+++ b/addons/olap/__init__.py
@@ -0,0 +1,30 @@
+##############################################################################
+#
+# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#                    Fabien Pinckaers <fp@tiny.Be>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import olap
+import wizard
diff --git a/addons/olap/__terp__.py b/addons/olap/__terp__.py
new file mode 100644
index 00000000000..7583de75182
--- /dev/null
+++ b/addons/olap/__terp__.py
@@ -0,0 +1,23 @@
+{
+    "name" : "Olap Schemes Management",
+    "version" : "0.1",
+    "author" : "Tiny",
+    "website" : "http://www.openerp.com",
+    "depends" : ["base"],
+    "category" : "Generic Modules/Olap",
+    "description": """
+    Base module to manage Olap schemas. Cube designer.
+    """,
+    "init_xml" :  ["data/olap_data.xml"],
+    "update_xml" : [
+        "data/olap_view.xml",
+        "data/olap_wizard.xml",
+        "data/olap_cube_view.xml",
+        "data/olap_fact_view.xml",
+        "data/olap_cube_workflow.xml",
+        "data/olap_security.xml"
+    ],
+    "demo_xml" : ["data/olap_demo.xml"],
+    "active": False,
+    "installable": True
+}
diff --git a/addons/olap/cli/Makefile b/addons/olap/cli/Makefile
new file mode 100755
index 00000000000..dd44a2c1289
--- /dev/null
+++ b/addons/olap/cli/Makefile
@@ -0,0 +1,69 @@
+DATABASE = 'bi'
+
+all: simple sale date where sublevels calc_meas cross page complex test
+
+simple:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[User].[all]} on rows, {[measures].[Credit Limit],[measures].[Count]} on columns from Partner"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[measures].[Credit Limit],[measures].[Count]} on rows, {[User].[all],[User].children} on columns from Partner"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[User].children} on rows from Partner"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[User].[all],[User].children} on rows, {[measures].[Credit Limit],[measures].[Count]} on columns from Partner"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[User].children} on rows, {[User].children} on columns from Partner where ([measures].[Count])"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[User].children} on rows, {[measures].[Count]} on columns from Partner where ([User].[3])" 
+#	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[Date].[2008]} on rows, {[measures].[Credit Limit],[measures].[Count]} on columns from Partner"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c "select {[Date].[all],[Date].children} on rows, {[measures].[Credit Limit],[measures].[Count]} on columns from Partner"
+
+sale:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Partner Country].children} on rows from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].children} on rows from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].children,[City].[Paris].children,[Partner Country].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Order Date].[all],[Order Date].children,[Users].children} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Order Date].children, [Order Date].[all]} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Partner Country].children} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Partner Country].[China]} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Partner Country].[Belgium]} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+
+date:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Order Date].children} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Order Date].[2007]} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Order Date].[2008]} on rows, {[measures].[Average Sales],[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Order Date].children,[Order Date].[2008].children,[Order Date].[2008].[Q2].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Order Date].children,[Order Date].[2008].children,[Order Date].[2008].[Q2].children} on rows, {[measures].[Total Sales]} on columns from Sales where ([Order Date].[2008].[Q2])"
+
+where:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c " select crossjoin (crossjoin ({[Order Date].[all],[Users].[all]} , {[Users].children} ) , {[Partner Country].[all]}) on rows, {[measures].[Units Sold]} on columns from Sales"
+sublevels:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].[all],[City].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].[all],[City].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].[all],[City].children,[City].[Liege].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Products Category].[all],[Products Category].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[Products Category].[all],[Products Category].children,[Products Category].[PC].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+
+calc_meas:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].[all]} on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].[all],[City].children} on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].[all],[City].children} on rows, {[measures].[Units Sold],[measures].[Total Sales]} on columns from Sales"
+
+cross:	
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select  crossjoin ({[Order Date].[all],[Order Date].children} , {[All Products].[all]}) on rows from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin({[City].[all]},{[Users].[all]}) on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin({[City].[all],[Users].[all]},{[Order Date].[all]}) on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin({[City].[all],[City].children},{[Order Date].children}) on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin(crossjoin({[City].[all],[City].children},{[Users].children}),{[Order Date].children}) on rows, {[measures].[Total Sales]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin(crossjoin({[City].[all],[City].children},{[Users].children}),{[Order Date].children}) on rows, {[measures].[Total Sales],[measures].[Units Sold]} on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin(crossjoin({[City].[all],[Users].[all]},{[Order Date].[all]}),{[Order Date].children}) on rows, crossjoin({[All Products].[all],[Products Category].[all]},{[Partner Country].children}) on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin({[City].[all]},{[Users].[all]}) on rows, crossjoin({[measures].[Total Sales]},{[Order Date].children}) on columns from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin({[City].[all]},{[Users].[all]}) on rows, crossjoin(crossjoin({[measures].[Total Sales]},{[Order Date].children}),{[Users].children}) on columns from Sales"
+
+page:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[City].[all],[City].children} on rows, {[measures].[Units Sold],[measures].[Total Sales]} on columns, {[Order Date].children} on pages from Sales" 
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select {[measures].[Units Sold],[measures].[Total Sales]} on rows, {[City].[all],[City].children} on columns, {[Order Date].children} on pages from Sales"
+
+complex:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin({[City].[all],[City].children},{[Order Date].[all]}) on rows, {[measures].[Units Sold],[measures].[Total Sales]} on columns, {[Order Date].children} on pages from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin(crossjoin({[City].[all],[City].children},{[Order Date].children}),{[Users].children}) on rows, {[measures].[Units Sold],[measures].[Total Sales]} on columns, {[Order Date].children} on pages from Sales"
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "OpenERPSales" -c "select crossjoin(crossjoin({[City].[all],[City].children},{[Order Date].children}),{[Users].children}) on rows, crossjoin({[measures].[Units Sold],[measures].[Total Sales]},{[City].children}) on columns, {[Order Date].children} on pages from Sales"
+
+test:
+	./tinybi.py -d ${DATABASE} -H localhost -U admin -W admin -p 8069 -s "tinyerp" -c " select crossjoin (crossjoin ({[Order Date].[all],[Users].[all]} , {[Users].children} ) , {[Partner Country].[all]}) on rows, {[measures].[Units Sold]} on columns from Sales"
\ No newline at end of file
diff --git a/addons/olap/cli/tinybi.py b/addons/olap/cli/tinybi.py
new file mode 100755
index 00000000000..ec31232110d
--- /dev/null
+++ b/addons/olap/cli/tinybi.py
@@ -0,0 +1,86 @@
+#!/usr/bin/python
+
+##############################################################################
+#
+# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#                    Fabien Pinckaers <fp@tiny.Be>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+#
+# This module test all RPC methods
+#
+
+import optparse
+
+import xmlrpclib
+import time
+
+__version__ = '1.0'
+
+parser = optparse.OptionParser(version=__version__)
+
+group = optparse.OptionGroup(parser, "General options")
+group.add_option("-c", "--command", dest="command", help="The query to execute")
+group.add_option("-s", "--schema", dest="schema", help="The schema to use for the query")
+parser.add_option_group(group)
+
+group = optparse.OptionGroup(parser, "Connection options")
+group.add_option("-d", "--database", dest="database", help="Database name")
+group.add_option("-H", "--hostname", dest="hostname", default='localhost', help="Server hostname")
+group.add_option("-U", "--username", dest="username", default='admin', help="Username")
+group.add_option("-W", "--password", dest="password", default='admin', help="Password")
+group.add_option("-p", "--port", dest="port", default=8069, help="Server port")
+parser.add_option_group(group)
+
+(opt, args) = parser.parse_args()
+
+sock = xmlrpclib.ServerProxy('http://'+opt.hostname+':'+str(opt.port)+'/xmlrpc/object')
+uid = 1 
+
+axis,data = sock.execute(opt.database, uid, opt.password, 'olap.schema', 'request', opt.schema, opt.command)
+COLSPAN = 18
+ROWSPAN = 18
+
+print
+if len(axis)>1:
+    for i in range(8):
+        ok = False
+        for x in axis[1]:
+            if len(x[0])==i:
+                ok = True
+        if not ok:
+            continue
+        print ' '*COLSPAN,
+        print (('%-'+str(ROWSPAN)+'s ' ) * len(axis[1])) % tuple(map(lambda x: str(len(x[0])==i and x[1] or ''),axis[1]))
+for col in data:
+    print ('%-'+str(COLSPAN)+'s')% (' '*(len(axis[0][0][0])-1)*2 + str(axis[0].pop(0)[1]),),
+    for row in col:
+        if row==[False]:
+            print ('%-'+str(ROWSPAN)+'s')%('',),
+        else:
+            print ('%-'+str(ROWSPAN)+'s')%(row,),
+    print
+print
+
diff --git a/addons/olap/cube/__init__.py b/addons/olap/cube/__init__.py
new file mode 100755
index 00000000000..79c50e6422d
--- /dev/null
+++ b/addons/olap/cube/__init__.py
@@ -0,0 +1,3 @@
+from mdx_parser import mdx_parser
+from mdx_output import mdx_output
+from warehouse import warehouse
diff --git a/addons/olap/cube/agregator.py b/addons/olap/cube/agregator.py
new file mode 100755
index 00000000000..27cede990f2
--- /dev/null
+++ b/addons/olap/cube/agregator.py
@@ -0,0 +1,9 @@
+import sqlalchemy
+
+agregator = {}
+agregator['sum'] = sqlalchemy.func.sum
+agregator['count'] = sqlalchemy.func.count
+agregator['avg'] = sqlalchemy.func.avg
+agregator['min'] = sqlalchemy.func.min
+agregator['max'] = sqlalchemy.func.max
+
diff --git a/addons/olap/cube/axis.py b/addons/olap/cube/axis.py
new file mode 100755
index 00000000000..6bff19b49cd
--- /dev/null
+++ b/addons/olap/cube/axis.py
@@ -0,0 +1,43 @@
+
+import sqlalchemy
+import common
+
+
+
+class axis(object):
+    def __init__(self, axis, name=None):
+        self.axis = axis
+        self.name = name
+
+    def validate(self, cube):
+        self.object = cube
+        self.axis.validate(cube)
+
+    def name_set(self, name):
+        self.name = name
+
+    def __repr__(self):
+        res = '\t<olap.axis ['+str(self.name)+']\n'
+        res += str(self.axis)
+        res += '\t>'
+        return res
+
+	#
+	# Output:
+	#    a list of grouped values that can be computed at once
+	#    a group is defined by elements having the same query
+	#
+	#   [
+	#     {
+	#       'level': ["Time","2008","Q1"],
+	#       'value': '1er Trim 2008',
+	#       'query': SQLAlchemy query object
+	#     }
+	#   ]
+	#
+
+    def run(self, metadata):
+        result = self.axis.run(metadata)
+        return result
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/axis_map.py b/addons/olap/cube/axis_map.py
new file mode 100755
index 00000000000..9b0cf7e53cc
--- /dev/null
+++ b/addons/olap/cube/axis_map.py
@@ -0,0 +1,109 @@
+#
+# Interface for all mapping objects to map values into the right
+# position in the cube, according to cube definition
+#
+
+class mapping(object):
+    def query_init(self):
+        pass
+    def position_get(self):
+        return 0
+
+class column_static(mapping):
+    def __init__(self, value=False, position=0):
+        self.value = value
+    def cube_set(self, cube, value, delta=0):
+        return cube[ delta]
+    def value_set(self, value=False):
+        value.pop(0)
+        return self.value
+
+
+class column_static_dummy(mapping):
+    def __init__(self, value=False, position=0):
+        self.value = value
+    def cube_set(self, cube, value, delta=0):
+        return cube[ delta]
+    def value_set(self, value=False):
+        value.pop(0)
+        return self.value
+
+class column_fixed(mapping):
+    def __init__(self, pos=0, position=0):
+        self.pos = pos
+    def cube_set(self, cube, value, delta=0):
+        return cube[ self.pos +delta]
+    def value_set(self, value):
+        return value.pop(0)
+
+class column_mapping_value(mapping):
+    def __init__(self, value, position=0):
+        self.axis_value = {}
+        for v in range(len(value)):
+            self.axis_value[value[v][0]] = v
+
+    def cube_set(self, cube, value, delta=0):
+        pos = value.pop(0)
+        return cube[ self.axis_value[pos]+delta ]
+    def value_set(self, value):
+        return False
+
+class column_mapping(mapping):
+    def __init__(self, value, position=0):
+        self.axis_value = {}
+        for v in range(len(value)):
+            self.axis_value[value[v][0]] = v
+
+    def cube_set(self, cube, value, delta=0):
+        pos = value.pop(0)
+        return cube[ self.axis_value[pos]+delta ]
+
+    def value_set(self, value):
+        return False
+
+    def position_get(self):
+        return 1
+
+
+class column_mapping_axis(mapping):
+    def __init__(self, mapping, axis, position=0):
+        keys = {}
+        i = 0
+        for a in axis:
+            keys[tuple(list(a)[0][1:])] = i
+            i+=1
+
+        self.axis_value = {}
+        for m in mapping:
+            k = tuple(list(m)[:-1])
+            a = keys[k]
+            self.axis_value[tuple(m)[-1]] = a
+
+    def cube_set(self, cube, value, delta=0):
+        pos = value.pop(0)
+        return cube[ self.axis_value[pos]+delta ]
+
+    def value_set(self, value):
+        return False
+
+    def position_get(self):
+        return 1
+
+
+
+class column_mapping_join(mapping):
+    def __init__(self, mappings, position=0):
+        self.mappings = mappings
+
+    def cube_set(self, cube, value, delta=0):
+        for m in self.mappings:
+            cube = m.cube_set(cube, value, delta)
+        return cube
+
+    def value_set(self, value):
+        for m in self.mappings:
+            value = m.value_set(value)
+        return value
+
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/common.py b/addons/olap/cube/common.py
new file mode 100755
index 00000000000..508abade814
--- /dev/null
+++ b/addons/olap/cube/common.py
@@ -0,0 +1,109 @@
+import sqlalchemy
+from sqlalchemy import *
+import common
+
+def measure_sql_exp_col(metadata,col):
+    temp = col.split(".")
+    table_name =  filter(lambda x: x.name==temp[0],metadata.table_iterator(reverse=False))
+    if table_name:
+        if not col  in table_name[0].c:
+            col = sqlalchemy.Column(temp[1], sqlalchemy.Float)
+            table_name[0].append_column(col)
+            return col
+        else:
+            for k in table_name[0].c:
+                if temp[1] == k.name:
+                    return k
+    else:
+        print "The table %s  do not exist or match to cube fact table"%(temp[0])
+# To be Improved
+# I am sure it exist something better in SA
+def col_get(table, col_obj):
+#   table = sqlalchemy table object
+#   level = level object
+
+    # Check for the columns
+    
+    datatypes = {
+        'timestamp': sqlalchemy.DateTime,
+        'timestampz': sqlalchemy.DateTime,
+        'numeric': sqlalchemy.Numeric,
+        'int': sqlalchemy.Integer,
+        'float8': sqlalchemy.Float,
+        'varchar': sqlalchemy.String,
+        'bool': sqlalchemy.Boolean,
+        'bytea':'Byte A', # Not Clear 
+        'int2':sqlalchemy.SmallInteger,
+        'int4':sqlalchemy.Integer,
+        'int8':sqlalchemy.Integer,
+        'text':sqlalchemy.String,
+        'date':sqlalchemy.Date,
+        'time': sqlalchemy.Time,
+        'number':sqlalchemy.Numeric,
+    }
+    if not  ('.').join([col_obj.table_id.table_db_name,col_obj.column_db_name]) in table.c:
+        col = sqlalchemy.Column(col_obj.column_db_name, datatypes[col_obj.type])
+        table.append_column(col)
+        return col
+    else:
+        for k in table.c:
+            if col_obj.column_db_name == k.name:
+                return k
+
+def get_primary_key(table):
+    for cols in table.columns:
+        if cols.primary_key == True:
+            return cols
+
+
+# It gets the olap_cube_table browse object
+def table_get(metadata, table):
+    result = False
+    table1 = False
+    table2 = False
+    if table.line_ids:
+        temp = 0
+        for i in range(len(table.line_ids)):
+            table1 = sqlalchemy.Table(table.line_ids[i].table_id.table_db_name,metadata)
+            pk = get_primary_key(table.line_ids[i].table_id)
+            if result:
+                
+                result = join(result,table1, onclause=col_get(table1,pk)==col_get(table2,table.line_ids[i-1].field_id))
+            elif table2:
+                result = join(table1, table2, onclause=col_get(table1,pk)==col_get(table2,table.line_ids[i-1].field_id))
+            else:
+                table2=table1
+            temp=i
+            
+        if not result:
+            result = table1
+        pk = get_primary_key(table.line_ids[temp].table_id)
+        tab = sqlalchemy.Table(table.line_ids[temp].field_id.related_to.table_db_name,metadata)
+        result = join(result, tab,onclause=col_get(tab,pk)
+                 ==col_get(sqlalchemy.Table(table.line_ids[temp].table_id.table_db_name,metadata),table.line_ids[temp].field_id))
+                 
+    else:
+        if table.column_link_id.related_to:
+            result = sqlalchemy.Table(table.column_link_id.related_to.table_db_name,metadata)
+        else:
+            result = sqlalchemy.Table(table.column_link_id.table_id.table_db_name,metadata)
+
+    return result
+
+def xcombine(*seqin):
+    """
+        Cartesian product of the list of list that produce all distinct
+        subsets of my query.
+    """
+    def rloop(seqin,comb):
+        '''recursive looping function'''
+        if seqin:
+            for item in seqin[0]:
+                newcomb=comb+[item]
+                for item in rloop(seqin[1:],newcomb):
+                    yield item
+        else:
+            yield comb
+    return rloop(seqin, [])
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/cross.py b/addons/olap/cube/cross.py
new file mode 100755
index 00000000000..d3a53bf4853
--- /dev/null
+++ b/addons/olap/cube/cross.py
@@ -0,0 +1,32 @@
+
+import sqlalchemy
+import common
+import level
+
+class cross(object):
+    def __init__(self, cross):
+    	self.cross = cross
+        self.name = False 
+        self.object = False
+        
+    def validate(self, cube):
+        for obj in self.cross:
+            self.object = obj.validate(cube)
+        return self.object
+    
+    def name_set(self, name):
+        self.name = name
+        
+    def __repr__(self):
+        res = '\t<olap.cross\n'
+        res += str(self.cross)
+        res += '\t>'
+        return res
+        
+    def run(self, metadata):
+        print '*'*40
+        for obj in self.cross:
+            result = obj.run(metadata)
+        return result
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/cube.py b/addons/olap/cube/cube.py
new file mode 100755
index 00000000000..8b028f4d411
--- /dev/null
+++ b/addons/olap/cube/cube.py
@@ -0,0 +1,24 @@
+
+import sqlalchemy
+import common
+
+class cube(object):
+    def __init__(self, name=None):
+        super(cube, self).__init__()
+        self.object = False
+        self.name = name
+
+    def run(self, metadata):
+        table = common.table_get(metadata, self.object.table_id)
+        return sqlalchemy.select(from_obj = [table], columns=[]),table
+
+    def validate(self, schema):
+        for cube in schema.cube_ids:
+            if self.name == cube.name:
+                self.object = cube
+                break
+        return self.object
+
+    def __repr__(self):
+        return self.name
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/datatype.py b/addons/olap/cube/datatype.py
new file mode 100755
index 00000000000..67287a951d2
--- /dev/null
+++ b/addons/olap/cube/datatype.py
@@ -0,0 +1,8 @@
+
+class datatype_class(object):
+    def __init__(self):
+        self.datatype = {}
+    def subscribe(self, name, data):
+        self.datatype[name] = data
+datatype = datatype_class()
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/formatstring.py b/addons/olap/cube/formatstring.py
new file mode 100755
index 00000000000..9e6f56f58e6
--- /dev/null
+++ b/addons/olap/cube/formatstring.py
@@ -0,0 +1,8 @@
+class formatstring_class(object):
+    def __init__(self):
+        self.formatstrings = {}
+    def subscribe(self, name, data):
+        self.formatstrings[name] = data
+formatstring = formatstring_class()
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/level.py b/addons/olap/cube/level.py
new file mode 100755
index 00000000000..863ac9e8e16
--- /dev/null
+++ b/addons/olap/cube/level.py
@@ -0,0 +1,322 @@
+
+import sqlalchemy
+import common
+import axis_map
+import pooler,tools
+
+class level(object):
+    def __init__(self, level, sublevels=[]):
+        self.level = level
+        self.sublevels = sublevels
+        self.object = False
+
+    def validate(self, cube):
+        for dimension in cube.dimension_ids:
+            if self.object:
+                break
+            for hierarchy in dimension.hierarchy_ids:
+                if hierarchy.name==self.level:
+                    self.object = hierarchy
+                    break
+
+        #
+        # TODO: implement access to unique levels for not fully qualified names
+        #
+        if not self.object:
+            raise 'This dimension (%s) does not exist !' % (self.level,)
+
+        obj = hierarchy
+        pos = 0
+        for level in self.sublevels:
+            res = level.validate(hierarchy.level_ids[pos])
+            if res:
+                pos += 1
+        return self.object
+
+    def _to_unicode(self,s):
+        try:
+            return s.encode('ascii')
+        except UnicodeError:
+            try:
+                return s.decode('utf-8')
+            except UnicodeError:
+                try:
+                    return s.decode('latin')
+                except UnicodeError:
+                    return s
+
+    def _to_decode(self,s):
+        try:
+            return s.encode('utf-8')
+        except UnicodeError:
+            try:
+                return s.encode('latin')
+            except UnicodeError:
+                try:
+                    return s.decode('ascii')
+                except UnicodeError:
+                    return s
+
+    def run(self, metadata):
+        '''
+            RETURN: {
+                    'value': [(ID, NAME)],              # ID = ['user', 3]
+                    'query': {
+                        'whereclause': [col.in_(*primary_keys)],
+                        'column': [col],
+                        'group_by': [col]
+                    },
+                    'axis_mapping': axis_map.column_mapping(result),
+                    'delta':0
+                }
+        '''
+        if self.sublevels[0].name=='all':
+            return [{
+                'value': [([str(self.level)], str(self.level), False)],
+                'query': {
+                    'column': [sqlalchemy.literal('all')],
+                },
+                'axis_mapping': axis_map.column_static(False),
+                'delta':0,
+            }]
+
+
+        # Make these 2 commands working in all cases:
+        # return self._run_transform(metadata)
+        # return self._run_star(metadata)
+        
+        if self.object.table_id<>self.object.dimension_id.cube_id.table_id: # Add a condition on the object
+            result = self._run_transform(metadata)
+        else:
+            result = self._run_star(metadata)
+        return result
+
+    def _compute_axis(self, metadata, primarykey=False):
+        """
+            Compute axis values, and transform the main query in the same way
+            to add this branch of the star for this subset. The mappers
+            reassign to values.
+        """
+
+        #
+        # Build a query on all tables of the hierarchy
+        # It passes the hierarchy table_id browse object (olap_cube_table )
+        #
+        table = common.table_get(metadata, self.object.table_id)
+        #
+        # Implement the query for all sublevels
+        # Return:
+        #     [ (ID1, ID2, ID3, NAME, [PRIMARYKEY]) ]
+        #
+        result_axis = {}
+        for slevel in self.sublevels:
+            res = slevel.run(metadata, table)
+            for key in res.keys():
+                result_axis.setdefault(key, [])
+                result_axis[key] += res[key]
+        cols = []
+        axis_select = sqlalchemy.select(from_obj=[table], columns=[], distinct=True)
+        for where in result_axis.get('where_clause', []):
+            axis_select.append_whereclause(where)
+        for col in result_axis.get('column', []):
+            axis_select.append_column(col)
+        for group in result_axis.get('group_by', []):
+            axis_select.append_group_by(group)
+        # TODO: find a way to do: axis_select2 = axis_select.copy()
+        axis_select2 = sqlalchemy.select(from_obj=[table], columns=[], distinct=True)
+        for where in result_axis.get('where_clause', []):
+            axis_select2.append_whereclause(where)
+        for col in result_axis.get('column', []):
+            axis_select2.append_column(col)
+        for group in result_axis.get('group_by', []):
+            axis_select2.append_group_by(group)
+        # TODO: end
+        #metadata.bind.echo = True
+        axis_select2.append_column(result_axis['column_name'][-1].label('axis_name'))
+        query = axis_select2.execute()
+        result = query.fetchall()
+          
+        def _tuple_define(x):
+            y=list(x)
+            if y[-1] == None:
+                y[-1] = '/'
+            elif isinstance(y[-1],float):
+                y[-1] = str (int(y[-1]))
+            else:
+                y[-1] = self._to_unicode(y[-1])
+                y[-1] = tools.ustr(y[-1])
+            return ([self.level]+y[:-1]),y[-1]
+             
+        axis = map(_tuple_define, result)
+        # Gives the mapping
+
+        primary_key = ''
+        if primarykey:
+            if self.object.table_id.column_link_id.related_to:
+                primary_key = self.object.table_id.column_link_id.related_to
+            else:
+                primary_key = self.object.table_id.column_link_id.table_id
+            tableprim = sqlalchemy.Table(primary_key.table_db_name, metadata)
+            pk = common.get_primary_key(primary_key)
+            col = common.col_get(tableprim,pk)
+            axis_select.append_column(col.label('axis_primarykey'))
+            query = axis_select.execute()
+            result = query.fetchall()
+        else:
+            # To find the primary key that suits best as per the given criteria
+            raise 'Primary key table not made in the hierarchy'
+            
+        maps = []
+        position =0
+        for mapping in result_axis['axis_mapping']:
+            mapinst = mapping(result, position)
+            maps.append(mapinst)
+            position += mapinst.position_get()
+        result_axis['axis_mapping'] = maps
+#
+#       #
+#       # Apply the filters on the main query object due to this block
+#       #
+#
+#       maps = []
+#       position =0
+#       for mapping in result_axis['axis_mapping']:
+#           mapinst = mapping(result, position)
+#           maps.append(mapinst)
+#           position += mapinst.position_get()
+#       result_axis['axis_mapping'] = maps
+#       print '*'*50
+#       print table, result, result_axis
+        return table, axis, result ,result_axis
+
+    def _run_star(self, metadata):
+        """
+            Compute axis values, and transform the main query in the same way
+            to add this branch of the star for this subset. The mappers
+            reassign to values.
+        """
+        print '*** Start ***'
+        table, result,result_mapping, result_axis = self._compute_axis(metadata, True)
+        result_axis.setdefault('where_clause', [])
+        #
+        # The result to be applied to the main query object
+        #
+        result = {
+            'value': result,
+            'query': {
+#               'whereclause': result_axis.get('where_clause',[]),
+                'column': result_axis.get('column', []),
+                'group_by': result_axis.get('column', [])
+            },
+            ##
+            ## How to use group of axis_mapping ?
+            ##
+            'axis_mapping': axis_map.column_static(False),
+            'delta':0,
+        }
+        return [result]
+
+    def _run_transform(self, metadata):
+        """
+            Compute axis values, and transform the main query according to axis
+            values for this subset. The main query slicer is transformed to a
+            single condition like: foreign_key in (...) and reapplied to axis
+            values.
+        """
+
+        table, axis, mapping, result_axis = self._compute_axis(metadata, True)
+        table2 = common.table_get(metadata, self.object.dimension_id.cube_id.table_id)
+        sql_table = sqlalchemy.Table(self.object.table_id.column_link_id.table_id.table_db_name,metadata)
+        col = common.col_get(sql_table, self.object.table_id.column_link_id)
+
+        #
+        # The result to be applied to the main query object
+        #
+
+        result = []
+        for a in axis:
+            k = tuple(list(a)[0][1:])
+            mapping_axis = filter(lambda m: tuple(list(m)[:-1])==k, mapping)
+            primary_keys = map(lambda x:list(x)[-1], mapping_axis)
+            # To convert everything in to the string so that no conversion needed at later stage 
+            # This is for the elements to be displayed in the rows and columns
+            for i in range(len(a[0])):
+                if a[0][i]:
+                    if isinstance(a[0][i],int):
+                        a[0][i] = str(a[0][i])
+                    elif isinstance(a[0][i],float):
+                        a[0][i] = str(int(a[0][i]))
+                else:
+                    a[0][i] = '/'
+            a = list(a)
+            if isinstance(a[-1],int):
+                a[-1] = str(a[-1])
+            elif isinstance(a[-1],float):
+                a[-1] = str(int(a[-1]))
+            a = tuple(a)
+            primary_keys = map(lambda x: str(x),primary_keys)
+            result.append( {
+                'value': [a],
+                'query': {
+                          
+                    'whereclause': [col.in_(primary_keys)],#.extend(result_axis['where_clause']),
+                    'column': [sqlalchemy.literal('transform')],
+                },
+                'axis_mapping': axis_map.column_static(False),
+                'delta':0,
+            })
+        return result
+
+    def __repr__(self):
+        res= '\t\t<olap.level \n'
+        res+= '\t\t\t'+str(self.level)+'\n'
+        for l in self.sublevels:
+            res+= '\t\t\t'+str(l)+'\n'
+        res += '\t\t>'
+        return res
+
+class level_filter(object):
+    def __init__(self, name):
+        self.name=name
+        self.object=None
+
+    def validate(self, level):
+        self.object = level
+        return 1
+
+    #
+    # Modify for the query select to return tuples:
+    #   (id, name)
+    # where:
+    #   id: ["Time","2008","Q1"]
+    #   name: Quarter 1
+    # Return a description of what have been added
+    #
+    def run(self, metadata, table):
+        return self.object._types[self.object.type].run( self, metadata, table)
+
+    def __repr__(self):
+        return '<olap.level_filter '+self.name+'>'
+
+class level_function(object):
+    def __init__(self, name):
+        self.type='function'
+        self.name = name
+        self.object = None
+    # [{
+    #   'level': ["Time","2008","Q1"],
+    #   'value': '1er Trim 2008',
+    #   'query': SQLAlchemy query object
+    # }]
+    def run(self, metadata, table):
+        return self.object._types[self.object.type].children( self, metadata, table)
+
+    def validate(self, level):
+        self.object = level
+        return 0
+
+    def __repr__(self):
+        return '<olap.level_function '+self.name+'>'
+
+# vim: ts=4 sts=4 sw=4 si et
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/olap/cube/levels/__init__.py b/addons/olap/cube/levels/__init__.py
new file mode 100755
index 00000000000..ebfef2e83aa
--- /dev/null
+++ b/addons/olap/cube/levels/__init__.py
@@ -0,0 +1,3 @@
+import level_interface
+from level_normal import level_normal
+from level_date import *
diff --git a/addons/olap/cube/levels/level_date.py b/addons/olap/cube/levels/level_date.py
new file mode 100755
index 00000000000..fc6ddb891a3
--- /dev/null
+++ b/addons/olap/cube/levels/level_date.py
@@ -0,0 +1,109 @@
+
+import sqlalchemy
+from level_interface import level_interface
+
+from olap.cube import common
+from olap.cube import axis_map
+
+#
+# To Be Fixed:
+#   Mapping of QX and Month
+#
+
+class level_date_month(level_interface):
+    def run(self, level, metadata, table):
+        col = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        col_id = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        result = {
+            'column': [sqlalchemy.func.date_part('month',col_id)],
+            'column_name': [sqlalchemy.func.date_part('month', col)],
+            'axis_mapping': [axis_map.column_mapping],
+            'where_clause': [sqlalchemy.func.date_part('month',col_id) == level.name]
+        }
+        return result
+
+    def children(self, level, metadata, table):
+        col = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        col_id = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        qexpr = sqlalchemy.literal('Q')+ sqlalchemy.sql.cast(sqlalchemy.func.date_part('QUARTER',col_id), sqlalchemy.types.String) + sqlalchemy.sql.cast(sqlalchemy.func.date_part('month',col_id),sqlalchemy.types.String)
+        return  {
+            'column': [sqlalchemy.func.date_part('month',col)],
+            'column_name':[sqlalchemy.func.date_part('month',col)],
+            'axis_mapping': [axis_map.column_mapping]
+        }
+
+    def validate(self, level, name):
+        
+        return 1
+
+class level_date_year(level_interface):
+    def run(self, level, metadata, table):
+        col = common.col_get(sqlalchemy.Table(level.object.table_name,metadata),level.object.column_name)
+        col_id = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        result = {
+            'column': [sqlalchemy.func.date_part('year',col_id)],
+            'column_name': [sqlalchemy.func.date_part('year', col)],
+            'axis_mapping': [axis_map.column_mapping],
+            'where_clause': [sqlalchemy.func.date_part('year',col_id) == level.name]
+        }
+        return result
+
+    def children(self, level, metadata, table):
+        col = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        col_id = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        return  {
+            'column': [sqlalchemy.func.date_part('year',col_id)],
+            'column_name':[sqlalchemy.func.date_part('year',col)],
+            'axis_mapping': [axis_map.column_mapping],
+            'where_clause':[]
+        }
+
+    def validate(self, level, name):
+        return 1
+
+#
+# To Do: Create your own axis mapping
+#
+class level_date_quarter(level_interface):
+
+    def run(self, level, metadata, table):
+        quarters = {
+            'Q1': [1,2,3],
+            'Q2': [4,5,6],
+            'Q3': [7,8,9],
+            'Q4': [10,11,12]
+            }
+        col = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        col_id = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        qexpr = sqlalchemy.literal('Q')+ sqlalchemy.sql.cast(sqlalchemy.func.date_part('QUARTER',col_id), sqlalchemy.types.String)
+        if not level.name in quarters:
+            raise 'Quarter should be in Q1,Q2,Q3,Q4 !'
+
+        result = {
+            'column': [qexpr],
+            'column_name': [qexpr],
+            'axis_mapping': [axis_map.column_static],
+            'where_clause': [
+                (sqlalchemy.func.date_part('month',col_id)==quarters[level.name][0]) |
+                (sqlalchemy.func.date_part('month',col_id)==quarters[level.name][1]) |
+                (sqlalchemy.func.date_part('month',col_id)==quarters[level.name][2])
+            ]
+        }
+        return result
+
+
+
+    def children(self, level, metadata, table):
+        table = sqlalchemy.Table(level.object.table_name, metadata)
+        col =common.col_get(table, level.object.column_name)
+        col_id = common.col_get(table,level.object.column_name)
+        qexpr = sqlalchemy.literal('Q')+ sqlalchemy.sql.cast(sqlalchemy.func.date_part('QUARTER',col_id), sqlalchemy.types.String)
+        return  {
+            'column': [qexpr],
+            'column_name': [qexpr],
+            'axis_mapping': [axis_map.column_mapping_value]
+        }
+
+    def validate(self, level, name):
+        return 1
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/levels/level_interface.py b/addons/olap/cube/levels/level_interface.py
new file mode 100755
index 00000000000..fc73dbc272a
--- /dev/null
+++ b/addons/olap/cube/levels/level_interface.py
@@ -0,0 +1,14 @@
+
+class level_interface(object):
+    #
+    # Return the number of position consummed by this level
+    # 1 means this goes to the next level object (.[20])
+    # 0 means that the next argument is still on the same level object (.children)
+    #
+    def validate(self, level, name):
+        return 1
+
+    def run(self, level, metadata, table):
+        col = None
+        return {}
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/levels/level_normal.py b/addons/olap/cube/levels/level_normal.py
new file mode 100755
index 00000000000..1c3e860babd
--- /dev/null
+++ b/addons/olap/cube/levels/level_normal.py
@@ -0,0 +1,32 @@
+import sqlalchemy
+from olap.cube import common
+from olap.cube import axis_map
+from level_interface import level_interface
+
+class level_normal(level_interface):
+    def run(self, level, metadata, table):
+        col = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        col_id = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        result = {
+                  'column': [col_id],
+                  'column_name': [col],
+                  'axis_mapping': [axis_map.column_mapping],
+                  'where_clause': [col_id == level.name ]
+                  }
+        return result
+
+    def children(self, level, metadata, table):
+        col = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        col_id = common.col_get(sqlalchemy.Table(level.object.table_name,metadata), level.object.column_name)
+        result = {
+                  'column': [col_id],
+                  'column_name': [col],
+                  'axis_mapping': [axis_map.column_mapping],
+                  'where_clause': []
+                  }
+        return result
+
+    def validate(self, level, name):
+        return 1
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/mdx_input/__init__.py b/addons/olap/cube/mdx_input/__init__.py
new file mode 100755
index 00000000000..8c338cddef2
--- /dev/null
+++ b/addons/olap/cube/mdx_input/__init__.py
@@ -0,0 +1 @@
+from mdx_input import mdx_input
diff --git a/addons/olap/cube/mdx_input/mdx_input.py b/addons/olap/cube/mdx_input/mdx_input.py
new file mode 100755
index 00000000000..92d6d983a1c
--- /dev/null
+++ b/addons/olap/cube/mdx_input/mdx_input.py
@@ -0,0 +1,5 @@
+
+class mdx_input(object):
+
+    def parse(self, mdx):
+        return mdx
diff --git a/addons/olap/cube/mdx_operator.py b/addons/olap/cube/mdx_operator.py
new file mode 100755
index 00000000000..92102d88f02
--- /dev/null
+++ b/addons/olap/cube/mdx_operator.py
@@ -0,0 +1,35 @@
+import common
+
+#
+# Class constructed by {..., ...}
+#
+class mdx_set(object):
+    def __init__(self, list):
+        self.list = list
+
+    def run(self, metadata):
+        """
+            Should use xcombine, I think it's currently False
+            common.xcombine(*result)
+        """
+        result = []
+        for l in self.list:
+            result += l.run(metadata)
+        position = 0
+        for r in result:
+            r['delta'] = position
+            position += len(r['value'])
+        return result
+
+    def validate(self, object):
+        for l in self.list:
+            l.validate(object)
+        return True
+
+    def __repr__(self):
+        res = '\tSet: ['
+        for l in self.list:
+            res += str(l)+',\n'
+        res += '\t]'
+        return res
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/mdx_output/__init__.py b/addons/olap/cube/mdx_output/__init__.py
new file mode 100755
index 00000000000..0110b6fe01f
--- /dev/null
+++ b/addons/olap/cube/mdx_output/__init__.py
@@ -0,0 +1 @@
+from mdx_output import *
diff --git a/addons/olap/cube/mdx_output/mdx_output.py b/addons/olap/cube/mdx_output/mdx_output.py
new file mode 100755
index 00000000000..f4708387d0b
--- /dev/null
+++ b/addons/olap/cube/mdx_output/mdx_output.py
@@ -0,0 +1,56 @@
+#
+# Modify the final result (axis, data), for instance, reordering of axes
+#
+import copy
+
+def decimal_to_float(cube):
+# Note FP: I think the decimal > float conversion should be done more
+# in upstream
+    if type(cube)==type([]) and len(cube):
+        if type(cube[0])==type([]):
+            for b in cube:
+                decimal_to_float(b)
+        else:
+            for l in range(len(cube)):
+                cube[l] = str(float(cube[l]))
+
+def sort_apply(cube, axis_pos):
+    cube2 = copy.copy(cube)
+    for i in range(len(axis_pos)):
+        cube[i] = cube2[axis_pos[i]]
+    return cube
+
+def sort_axis(data):
+    for axis_id in range(len(data[0])):
+        axis_pos = []
+        for i in range(len(data[0][axis_id])):
+            axis_pos.append((data[0][axis_id][i], i))
+        axis_pos.sort()
+        data[0][axis_id] = map(lambda x: x[0], axis_pos)
+        axis_pos2 = map(lambda x: x[1], axis_pos)
+        cubes = [ data[1] ]
+        for i in range(axis_id):
+            cubes2 = []
+            for cube in cubes:
+                cubes2 += cube
+            cubes = cubes2
+        for cube in cubes:
+            sort_apply(cube, axis_pos2)
+
+def mdx_output(data):
+    print 'DATA',  data
+#    decimal_to_float(data[1])
+#    sort_axis(data) 
+    return data
+
+if __name__=='__main__':
+	print 'Testing Code'
+	data = ([[(['user'], 'All user')], [(['measures', 'credit_limit'], 'credit_limit'), (['measures', 'count'], 'count')]], [[[66700.0], [22L]]])
+	data = ([[([u'Products'], u'All Products'), ([u'Order Date'], u'All Order Date')]], [[False], [False]])
+	data = ([[([u'Order Date'], u'All Order Date'), ([u'Order Date', 2007.0], 2007.0), ([u'Order Date', 2008.0], 2008.0), ([u'Order Date', 2007.0, 'Q1'], 'Q1'), ([u'Order Date', 2007.0, 'Q2'], 'Q2'), ([u'Order Date', 2007.0, 'Q3'], 'Q3'), ([u'Order Date', 2007.0, 'Q4'], 'Q4'), ([u'Users'], u'All Users'), ([u'Users', 'Administrator'], 'Administrator'), ([u'Users', 'Demo User'], 'Demo User'), ([u'Users', 'Root'], 'Root'), ([u'Partner Country'], u'All Partner Country'), ([u'Partner Country', 'Belgium'], 'Belgium'), ([u'Partner Country', 'China'], 'China'), ([u'Partner Country', 'France'], 'France'), ([u'Partner Country', 'Taiwan'], 'Taiwan')]], [[False], [False], [False], [False], [False], [False], [False], [False], [False], [False], [False], [False], [False], [False], [False], [False]])
+	data = ([[([u'Order Date'], u'All Order Date'), ([u'Order Date', 2007.0], 2007.0), ([u'Order Date', 2008.0], 2008.0), ([u'Order Date', 2007.0, 'Q1'], 'Q1'), ([u'Order Date', 2007.0, 'Q2'], 'Q2'), ([u'Order Date', 2007.0, 'Q3'], 'Q3'), ([u'Order Date', 2007.0, 'Q4'], 'Q4'), ([u'Users'], u'All Users'), ([u'Users', 'Administrator'], 'Administrator'), ([u'Users', 'Demo User'], 'Demo User'), ([u'Users', 'Root'], 'Root'), ([u'Partner Country'], u'All Partner Country'), ([u'Partner Country', 'Belgium'], 'Belgium'), ([u'Partner Country', 'China'], 'China'), ([u'Partner Country', 'France'], 'France'), ([u'Partner Country', 'Taiwan'], 'Taiwan')], [(['measures', u'Items Sold'], u'Items Sold')]], [[[Decimal("258.00")]], [[Decimal("34.00")]], [[Decimal("224.00")]], [[Decimal("12.00")]], [[Decimal("9.00")]], [[Decimal("6.00")]], [[Decimal("7.00")]], [[Decimal("258.00")]], [[Decimal("204.00")]], [[Decimal("16.00")]], [[Decimal("38.00")]], [[Decimal("258.00")]], [[Decimal("17.00")]], [[Decimal("78.00")]], [[Decimal("139.00")]], [[Decimal("2.00")]]])
+	print 'Old', data
+	sort_axis(data)
+	print 'New', data
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/mdx_parser.py b/addons/olap/cube/mdx_parser.py
new file mode 100755
index 00000000000..76014c91acb
--- /dev/null
+++ b/addons/olap/cube/mdx_parser.py
@@ -0,0 +1,201 @@
+"""
+Tiny BI
+Copyright (C)2007 Fabien Pinckaers
+
+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 version 2.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+"""
+
+from pyparsing import *
+
+import cube, axis, measure, level, query, slicer, cross
+import mdx_operator
+
+
+#
+# Predicate: the construction of the object's query does not depend
+# on the schema architecture. I think we can go on for this, this will
+# simplify the extension/module architecture.
+#
+# Rethink about that in one month.
+#
+
+class mdx_parser(object):
+    def mdx_level(self):
+        """
+            Return a parser that parse the level part of the MDX query and
+            return a level object
+            Examples:
+                [prod].[all prod].children
+                [prod].[all prod].join(...)
+        """
+        leftSqBr = Literal("[").suppress()
+        rightSqBr = Literal("]").suppress()
+        dotToken = Literal(".").suppress()
+        measuresToken = Literal("measures").suppress()
+        scalar = Word(alphanums+alphas8bit.encode("utf-8") +"_"+" "+"-" )
+        level_filter = leftSqBr + scalar + rightSqBr
+        level_function = Keyword("children", caseless=True)
+        level_filter.setParseAction(lambda s,a,toks: level.level_filter(toks[0]))
+        level_function.setParseAction(lambda s,a,toks: level.level_function(toks[0]))
+        level_item = level_filter | level_function
+        level_parse = leftSqBr + scalar + rightSqBr + Optional(dotToken + delimitedList(level_item, ".", combine=False))
+        level_parse.setParseAction(lambda s,a,toks: level.level(toks[0], toks[1:]))
+        measure_parse = leftSqBr + measuresToken + rightSqBr + dotToken + leftSqBr + scalar + rightSqBr
+        measure_parse.setParseAction(lambda s,a,toks: measure.measure(toks[0]))
+        lev = measure_parse | level_parse
+        return lev
+
+
+    def mdx_axis(self):
+        """
+            Return a parser that parse the axis part of the MDX query and 
+            return an axis object
+            Examples:
+                {[prod].[all prod].children, [a]}
+                OR 
+                crossjoin({[Order Date].[all]},{[prod].[all prod].children, [a]})
+                This is to be made recursive for the cross join
+                crossjoin(crossjoin({[City].[all],[City].children},{[User].[all]}),{[User].[Administrator]})
+
+        """
+        leftCurlBr = Literal("{").suppress()
+        rightCurlBr = Literal("}").suppress()
+        comma = Literal(",").suppress()
+
+        level_parse = self.mdx_level()
+        axis_parser = delimitedList(level_parse, ",", combine=False)
+        axis_parser.setParseAction(lambda s,a,toks:axis.axis(mdx_operator.mdx_set(toks)))
+
+        mdx = leftCurlBr + axis_parser + rightCurlBr
+        
+        return mdx
+
+    def cross_axis(self):
+        leftCurlBr = Literal("{").suppress()
+        rightCurlBr = Literal("}").suppress()
+        cross_parser = self.mdx_level()
+        cross_parser.setParseAction(lambda s,a,toks:cross.cross(toks))
+
+        cross_parse = leftCurlBr + cross_parser + rightCurlBr
+
+        return cross_parse 
+        
+    def mdx_cross_axis(self):
+        leftRoundBr = Literal("(").suppress()
+        rightRoundBr = Literal(")").suppress()
+        comma = Literal(",").suppress()
+        crossjoinToken = Keyword("crossjoin", caseless=True).suppress() 
+        
+        crossx = Forward() 
+        cross_mdx = crossx | self.mdx_axis() 
+        crossx << (crossjoinToken + leftRoundBr +  cross_mdx + comma + self.cross_axis()  + rightRoundBr)
+#        crossx.setParseAction(lambda s,a,toks:axis.axis(toks)
+        simple_mdx = self.mdx_axis()
+
+        mdx = simple_mdx | crossx
+        return mdx  
+
+    def mdx_axis_list(self):
+        #
+        # TODO: accept notation line AXIS(0) = rows, AXIS(1)=columns, ...
+        #
+        row_names = ["rows","columns","pages"]
+        onToken = Keyword("on", caseless=True).suppress()
+        page_name = oneOf(' '.join(row_names))
+        axis_parser = self.mdx_cross_axis() + Optional(onToken + page_name)
+
+        def _assign_name(s,a,toks):
+            if len(toks)>=3:
+                toks[0].name_set(toks[-1])
+                for x in range(1,len(toks)-1):
+                    toks[x].name_set('cross')
+            elif len(toks)==2:
+                toks[0].name_set(toks[1])
+            elif len(toks)==1:
+                toks[0].name_set(row_names.pop(0))
+            else:
+                raise 'invalid size'
+            return toks[:-1]
+        axis_parser.setParseAction(_assign_name)
+        axis_lst = delimitedList(axis_parser, ",")
+        axis_lst.setParseAction(lambda s,a,toks: [toks])
+        return axis_lst
+    
+    def mdx_slice(self):
+        """ Return a MDX parser of the where clause of a MDX query """
+        leftBr = Literal("(").suppress()
+        rightBr = Literal(")").suppress()
+        levels = delimitedList(self.mdx_level(), ',', combine=False)
+        levels.setParseAction(lambda s,a,toks: toks)
+        slicer_lst = delimitedList(leftBr + levels + rightBr, ",", combine=False)
+        slicer_lst.setParseAction(lambda s,a,toks:slicer.slicer(list(toks)))
+        return slicer_lst
+    
+    def mdx_cube(self):
+        """ Return a MDX parser of the from clause of a MDX query """
+        mdx = Word(alphas+'_')
+        mdx.setParseAction(lambda s,a,toks: cube.cube(toks[0]))
+        return mdx
+    
+    def mdx_query(self):
+        """ Return a MDX parser of the from clause of a MDX query """
+        selectToken = Keyword("select", caseless=True).suppress()
+        fromToken = Keyword("from", caseless=True).suppress()
+        whereToken = Keyword("where", caseless=True).suppress()
+        semicolon = Literal(";").suppress()
+        mdx = selectToken + self.mdx_axis_list() + fromToken + self.mdx_cube() + Optional(whereToken + self.mdx_slice()) + Optional(semicolon)
+        mdx.setParseAction(lambda s,a,toks: query.query(*toks))
+        return mdx
+    
+    def parse(self, query):
+        """ Parse a string and get a MDX object """
+        return self.mdx_query().parseString(query)[0]
+
+if __name__ == "__main__":
+    mdx = mdx_parser()
+    level_parse = mdx.mdx_level()
+    for test in ['[sales].children','[prod].[all prod]']:
+        print 'Testing level', test
+        print level_parse.parseString(test)
+    print
+    axis_parser = mdx.mdx_axis()
+    for test in ['{[a]}','{[prod].[all prod],[time].[Q3].[Sep]}']:
+        print 'Testing axis', test
+        print axis_parser.parseString(test)
+
+    axis_parser = mdx.mdx_axis_list()
+    for test in ['{[a]} on rows, {[prod].[all prod],[time].[Q3].[Sep]} on columns',
+        '{[region].[all region].children} on rows, {[prod].[all prod].children} on columns'
+    ]:
+        print 'Testing axis', test
+        print axis_parser.parseString(test)
+
+    cube_parser = mdx.mdx_cube()
+    for test in ['sales']:
+        print 'Testing axis', test
+        print cube_parser.parseString(test)
+
+    for query_parser in [
+"Select {[region].[all region].children} on rows, {[product]} on columns from cubulus where ([time].[all time].[time_2005])",
+"Select {[region].[all region].children} on rows, {[prod].[all prod].children} on columns from cubulus where ([time].[all time].[time_2005])",
+#"Select {[time].[all time].children} on rows, crossjoin([region].[all region].children, [region].[all region].children) on columns from cubulus"
+    ]:
+        print 'Testing ', query_parser
+        print mdx.parse(query_parser)
+
+    print mdx.parse('''select
+            {[date].[2007].[Q2].children} on rows, 
+            {[country_id].children,[country_id].[1].children} on columns 
+        from res_partner where ([measure].[credit_limit])''')
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/measure.py b/addons/olap/cube/measure.py
new file mode 100755
index 00000000000..2b8d563ba1d
--- /dev/null
+++ b/addons/olap/cube/measure.py
@@ -0,0 +1,84 @@
+
+import sqlalchemy
+import common
+import copy
+import pyparsing
+import operator
+from operator import add,sub
+from pyparsing import *
+
+from agregator import agregator
+import axis_map
+
+class measure(object):
+    def __init__(self, name):
+        self.name = name
+        self.object = False
+    def validate(self, cube):
+        for measure in cube.measure_ids:
+            if measure.name==self.name:
+                self.object = measure
+        if not self.object:
+            raise 'This measure does not exist !'
+        return True
+
+    def run(self, metadata):
+        table = common.table_get(metadata, self.object.cube_id.table_id)
+        if self.object.measure_type == 'fact_column':
+            col = common.col_get(sqlalchemy.Table(self.object.table_name,metadata), self.object.value_column)
+            col_agregated = agregator[self.object.agregator](col)
+        else:
+            scalar = Word(alphanums+"_"+" "+".") 
+            sql_func = ["sum","max","min","count","avg"]
+            arith_operator = ["-","*","/","+"]
+            
+            sql_function = oneOf(' '.join(sql_func))
+            leftRdBr = Literal("(").suppress()
+            rightRdBr = Literal(")").suppress()
+            operator_arith = oneOf(' '.join(arith_operator))
+            sqlexpression = sql_function.setResultsName('sql_func') + leftRdBr + delimitedList(scalar,",",combine=False) + rightRdBr | sql_function + leftRdBr +  scalar + ZeroOrMore(operator_arith.setResultsName('arithmetic') + scalar) + rightRdBr 
+            res = sqlexpression.parseString(self.object.value_sql)
+            operators = []
+            cols = []
+            function = None
+            for item in res:
+                if str(item) == res.sql_func:
+                    function = str(item)
+                elif str(item) == res.arithmetic or str(item) in ["+","-","/","*"]:
+                    operators.append(str(item))
+                else:
+                    cols.append(common.measure_sql_exp_col(metadata,str(item)))
+            operations = {
+                '+':operator.add,
+                '-':operator.sub,
+                '/':operator.div,
+                '%':operator.mod,
+                '*':operator.mul,
+            }
+            operators = [operations[name] for name in operators]
+            ops_cols = zip(operators, cols[1:])
+            col = reduce(lambda expr, op_col: op_col[0](expr, op_col[1]), ops_cols,cols[0]) 
+
+            if function:
+                col_agregated = agregator[function](col)
+            else:
+                col_agregated = col
+
+        return [ {
+            'value': [(['measures',self.name], self.name, False)],
+            'query': {
+                'column': [col_agregated]
+            },
+            'axis_mapping': axis_map.column_fixed(0),
+            'delta': 0,
+            'format':self.object.formatstring
+        } ]
+
+    def children(self, level, metadata):
+        raise 'Not yet implemented !'
+
+    def __repr__(self):
+        res= '\t\t<olap.measure %s>\n' % (self.name,)
+        return res
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/query.py b/addons/olap/cube/query.py
new file mode 100755
index 00000000000..37aaf365c87
--- /dev/null
+++ b/addons/olap/cube/query.py
@@ -0,0 +1,236 @@
+import locale
+
+
+import mdx_input
+import sqlalchemy
+import common
+import slicer
+import datetime
+import pooler
+import copy
+
+class mapper(object):
+    def __init__(self, size):
+        self.size = size
+
+class query(object):
+    def __init__(self, axis, cube, slicer_obj=None, *args):
+        super(query, self).__init__()
+        self.object = False
+        self.cube = cube
+        self.axis = axis
+        if not slicer_obj:
+            slicer_obj = slicer.slicer([])
+        self.slicer = slicer_obj
+
+    #
+    # Generate the cube with 'False' values
+    # This function could be improved
+    #
+    def _cube_create(self, cube_size):
+        cube_data = [False]
+        while cube_size:
+            newcube = []
+            for i in range(cube_size.pop()):
+                newcube.append(copy.deepcopy(cube_data))
+            cube_data = newcube
+        return cube_data
+
+    def run(self,currency):
+        db = sqlalchemy.create_engine(self.object.schema_id.database_id.connection_url,encoding='utf-8')
+        metadata = sqlalchemy.MetaData(db)
+        print 'Connected to database...', self.object.schema_id.database_id.connection_url
+        #
+        # Compute axis
+        #
+        axis = []
+        axis_result = []
+        cube_size = []
+        cross = False
+        cross_all = []
+        for ax in self.axis:
+            if ax.name == 'cross':
+                cross = True
+                cross = ax.run(metadata)
+                cube_size[-1] = cube_size[-1] * len(cross)
+                temp = axis_result[0][:] 
+                cross_all.append(cross)
+                final_axis = []
+                for cr in cross:
+                    for el in axis_result[-1]:
+                        t = copy.deepcopy(el)
+                        t = list(t)
+                        t[0].append(cr['value'][0][0])
+                        t.append(cr['value'][0][1])
+                        final_axis.append(tuple(t))
+                axis_result[-1]=final_axis[:]
+                final_axis=[]
+                len_axis = len(axis[-1])
+                len_cross = len(cross)
+                delta_count = 0 
+                d=0  
+                for data in common.xcombine(axis[-1],cross):
+                    flag = False
+                    make_where = []
+                    temp_where = []
+                    temp_column = []
+                    if 'whereclause' in data[0]['query'].keys():
+                        flag = True
+                        temp_where = data[0]['query']['whereclause'][0] 
+                        data[0]['query']['whereclause']=str(data[0]['query']['whereclause'][0])
+                        
+                    if isinstance(type(data[0]['query']['column'][0]),type(sqlalchemy.sql.expression._BindParamClause)):
+                        temp_column = data[0]['query']['column'][0]
+                        data[0]['query']['column'][0] = str(data[0]['query']['column'][0])
+                    data_temp = copy.deepcopy(data[0])
+                    if 'whereclause' in data[1]['query'].keys():
+                        if 'whereclause' in data_temp['query'].keys():
+                            make_where.append(data[1]['query']['whereclause'][0])
+                        else:
+                            make_where.append(data[1]['query']['whereclause'][0])
+                    delta_count = delta_count + 1
+                    if delta_count >= len_cross and len_cross!=1:
+                        delta_count = 0 
+                        data_temp['delta'] = d
+                        d = d + 1
+                    else:
+                        data_temp['delta'] = d
+                        d = d + 1
+                    if flag:
+                        data[0]['query']['whereclause']=[temp_where]
+                        data_temp['query']['whereclause'] = [temp_where]
+                    if make_where:
+                        if 'whereclause' in data_temp['query'].keys():
+                            data_temp['query']['whereclause'].append(make_where[0])
+                        else:
+                            data_temp['query']['whereclause'] = make_where
+                    if temp_column:
+                        data[0]['query']['column'] = [temp_column]
+                        data_temp['query']['column'] = [temp_column]
+                    final_axis.append(data_temp)
+                axis[-1] = []
+                axis[-1] = final_axis
+            else:
+                cross = False
+                result = ax.run(metadata)
+                length = 0
+                axis_result2 = []
+                for r in result:
+                    length += len(r['value'])
+                    axis_result2 += map(lambda x: (map(lambda y: y or False,x[0]),x[1] or False), r['value'])
+                axis_result.append(axis_result2)
+                axis.append(result)
+                cube_size.append(length)    
+        cube_data = self._cube_create(cube_size)
+        cr = []
+        slice = self.slicer.run(metadata)
+        position = 0
+        ax = []
+        for subset in common.xcombine(*axis):
+            select,table_fact = self.cube.run(metadata)
+            for s in subset+slice:
+                for key,val in s['query'].items():
+                    for v in val:
+                        if key=='column':
+                            v = v.label('p_%d' % (position,))
+                            position += 1
+                            select.append_column(v)
+                        elif key=='whereclause':
+                            select.append_whereclause(v)
+                        elif key=='group_by':
+                            select.append_group_by(v)
+                        else:
+                            raise 'Error, %s not implemented !'% (key,)
+#            metadata.bind.echo = True
+            query = select.execute()
+            result = query.fetchall()
+            for record in result:
+                cube = cube_data
+                r = list(record)
+                value = False
+                for s in subset:
+                    if s.has_key('format'):
+                        # To make use of the format string if specified for the measure
+                        # Its set to static for a testing
+                        if not currency:
+                            currency = "EUR"
+                        if isinstance(r[0],float) or isinstance(r[0],int) or isinstance(r[0],long):
+                            a = {'data':r[0]}
+                            r[0] = str(r[0])
+                        else:
+                            r[0] = '0.0'
+                            a = {'data':0.0}
+                        if s['format'] == 'cr_prefix':
+                            r[0] = currency + " "  + "%.2f"%a['data']
+                        elif s['format'] == 'cr_postfix':
+                            r[0] = "%.2f"%a['data'] + " " + currency
+                        elif s['format'] == 'comma_sep':
+                            r[0] = locale.format("%(data).2f", a, 1)
+                        elif s['format'] == 'cr_prefix_comma':
+                            r[0] = locale.format("%(data).2f", a, 1)
+                            r[0] = currency + " "  + str(r[0])
+                        elif s['format'] == 'cr_postfix_comma':
+                            a['currency'] = currency
+                            r[0] = locale.format("%(data).2f %(currency)s", a, 1)
+                    cube = s['axis_mapping'].cube_set(cube, r, s['delta'])
+                    value = s['axis_mapping'].value_set(r) or value
+                for s in slice:
+                    value = s['axis_mapping'].value_set(r) or value
+                if value:
+                    assert not cube[0], 'Already a value in cube, this is a bug !'
+                    cube[0] = value
+
+        i=0
+        for a in cube_data:
+            i=i+1;
+        return (axis_result, cube_data)
+
+    def preprocess(self):
+        wrapper = mdx_input.mdx_input()
+        wrapper.parse(self)
+
+    def validate(self, schema):
+        """ This function takes a query object and validate and assign
+        fact data to it. Browse object from Tiny ERP"""
+        cube = self.cube.validate(schema)
+        self.object = cube
+        if not self.object:
+            raise "Cube '%s' not found in the schema '%s' !"%(cube.name, schema.name)
+        self.slicer.validate(cube)
+
+        for axis in self.axis:
+            axis.validate(cube)
+        for dimension in cube.dimension_ids:
+            pass
+        return True,cube
+
+    def __repr__(self):
+        res = '<olap.query ['+str(self.cube)+']\n'
+        for l in self.axis:
+            res+= '\tAxis: '+str(l)+'\n'
+        res+= '\tSlicer:\n'+str(self.slicer)+'\n'
+        res += '>'
+        return res
+
+    def log(self,cr,uid,cube,query,context={}):
+        if not context==False:
+            log_ids = pooler.get_pool(cr.dbname).get('olap.query.logs').search( cr, uid, [('query','=', query), ('user_id','=', uid)])
+            if log_ids:
+                count = pooler.get_pool(cr.dbname).get('olap.query.logs').browse(cr, uid, log_ids, context)[0]
+                pooler.get_pool(cr.dbname).get('olap.query.logs').write(cr, uid, log_ids, {'count':count.count+1})
+                
+            else:
+                logentry={}
+                logentry['user_id']=uid
+                logentry['cube_id']=cube.id
+                logentry['query']=query
+                logentry['time']= str(datetime.datetime.now())
+                logentry['result_size']=0
+                logentry['count']=1
+                logentry['schema_id'] = cube.schema_id.id
+                log_id = pooler.get_pool(cr.dbname).get('olap.query.logs').create(cr,uid,logentry)
+#                count = pooler.get_pool(cr.dbname).get('olap.query.logs').browse(cr, uid, log_id, context)
+#                pooler.get_pool(cr.dbname).get('olap.query.logs').write(cr, uid, log_id, {'count':count.count+1})
+                return log_id
+        return -1
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/slicer.py b/addons/olap/cube/slicer.py
new file mode 100755
index 00000000000..66d86dbc065
--- /dev/null
+++ b/addons/olap/cube/slicer.py
@@ -0,0 +1,42 @@
+
+import sqlalchemy
+import common
+
+class slicer(object):
+    def __init__(self, slicer):
+        self.slicer = slicer
+
+    def validate(self, cube):
+        self.object = cube
+        for slicer in self.slicer:
+            slicer.validate(cube)
+
+    def __repr__(self):
+        res = '\t<olap.slicer\n'
+        res += str(self.slicer)
+        res += '\t>'
+        return res
+
+#
+# Output:
+#    a list of grouped values that can be computed at once
+#    a group is defined by elements having the same query
+#
+#   [
+#     {
+#       'level': ["Time","2008","Q1"],
+#       'value': '1er Trim 2008',
+#       'query': SQLAlchemy query object
+#     }
+#   ]
+#
+    def run(self, metadata):
+        print '*'*40
+        print self.slicer
+        result = []
+        for slicer_line in self.slicer:
+            res = slicer_line.run(metadata)
+            result += slicer_line.run(metadata)
+        return result
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/cube/warehouse.py b/addons/olap/cube/warehouse.py
new file mode 100644
index 00000000000..4b3be0f1db4
--- /dev/null
+++ b/addons/olap/cube/warehouse.py
@@ -0,0 +1,270 @@
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import locale
+import mdx_input
+import sqlalchemy
+from sqlalchemy import *
+import common
+import slicer
+import datetime
+import pooler
+import copy
+import pyparsing
+from pyparsing import *
+
+class warehouse(object):
+    def create_table(self, connection, table_name, data):
+        measures = data[0].keys()
+        measures.pop(measures.index('name'))
+        engine = create_engine(connection, echo=False)
+        metadata = MetaData()
+        tab = Table(str(table_name), metadata, 
+                      Column('name', String(100)),
+                      Column('parent_id', String(100)),
+                      Column('id', String(100))
+                      )
+        for msr in measures:
+            colmn = Column(msr, String(100))
+            tab.append_column(colmn)
+            
+        metadata.create_all(engine) 
+        result = engine.execute(tab.insert(), data)
+        return {}
+    
+    def log(self,cr,uid,cube,query,data,connection,context={}):
+        if not context==False:
+            log_ids = pooler.get_pool(cr.dbname).get('olap.query.logs').search( cr, uid, [('query','=', query), ('user_id','=', uid)])
+            if log_ids:
+                count = pooler.get_pool(cr.dbname).get('olap.query.logs').browse(cr, uid, log_ids, context)[0]
+                counter = count.count + 1
+                table_name = ''
+                if counter>=3:
+                    if len(data[0]) == 2:
+                        rows = data[0][0]
+                        columns = data[0][1]
+                        datas = data[1]
+                        result = []
+                        
+                        parent_list = [ rw[0] for rw in rows]
+                        
+                        for element in range(len(rows)):
+                            res = {}
+                            check_element = rows[element][0][:rows[element][0].index(rows[element][1])]
+                            if check_element:
+                                res['parent_id'] = str(parent_list.index(check_element))
+                                res['id'] = str(element)
+                            else:
+                                res['parent_id'] = str(None)
+                                res['id'] = str(element)
+                            res['name'] = str(rows[element][1])
+                            for col in range(len(columns)):
+                                col_elem = columns[col][0][:columns[col][0].index(columns[col][1])+1]
+                                c_element = '.'.join(map(lambda x: str(x), col_elem))
+                                res[c_element] = str(datas[element][col][0])
+                            result.append(res)
+                        table_name = cube.name+'_'+str(count.id)+'_'+str(counter)
+                        self.create_table(connection,table_name, result)
+                    elif len(data[0]) == 3:
+                        print "Its for Pages:>>>>>>>>>"
+                pooler.get_pool(cr.dbname).get('olap.query.logs').write(cr, uid, log_ids, {'count':counter, 'table_name': table_name})
+                return True
+            else:
+                logentry={}
+                logentry['user_id']=uid
+                logentry['cube_id']=cube.id
+                logentry['query']=query
+                logentry['time']= str(datetime.datetime.now())
+                logentry['result_size']=0
+                logentry['count']=1
+                logentry['schema_id'] = cube.schema_id.id
+                log_id = pooler.get_pool(cr.dbname).get('olap.query.logs').create(cr,uid,logentry)
+                return log_id
+        return -1
+    
+    def run(self, currency, qry_obj):
+        schema = qry_obj.schema_id
+        table_name = str(qry_obj.table_name)
+        connection = schema.database_id.connection_url
+        engine = create_engine(connection, echo=False)
+        metadata = MetaData(engine)
+        metadata.create_all(engine)
+        tab = Table(table_name, metadata, autoload=True, autoload_with=engine)
+        total_columns = [c.name for c in tab.columns]
+        columns = []
+        cols = []
+        for c in tab.columns:
+                if not c.name.__contains__('name') and not c.name.__contains__('id') and not c.name.__contains__('parent_id'):
+                    columns.append(c.name)
+                    cols.append((c.name.split('.'), str(c.name.split('.')[1])))
+        result = tab.select().execute()
+        res = result.fetchall()
+        rows = []
+#        dt = [[[]] * len(columns)] * len(res)
+        for r in range(len(res)):
+            if res[r][1] == str(None):
+                rows.append(([str(res[r][0])], str(res[r][0])))
+            else:
+                rows.append(([str(res[int(res[r][1])][0]),str(res[r][0])], str(res[r][0])))
+        
+        data = []
+        for r in range(len(res)):
+            data.append(res[r][3:])
+            
+        datas = []
+        for dd in range(len(data)):
+            datas.append([])
+            for d in range(len(data[dd])):
+                datas[dd].append([str(data[dd][d])])
+        
+        final_result = ([rows, cols], datas)
+        return  final_result
+    
+    def match_table(self, cr, uid,request, context):
+        qry_obj = pooler.get_pool(cr.dbname).get('olap.query.logs')
+        result = self.parse_query(request)
+        qry = result[1][0]
+        qry_axis = result[0]
+        qry_id = qry_obj.search(cr, uid, [('query','=',str(qry))])
+        result = ()
+        if qry_id:
+            qry = qry_obj.browse(cr, uid, qry_id)[0]
+            schema = qry.schema_id
+            if qry.table_name !='':
+                total_rows = []
+                total_cols = []
+                data = []
+                table_name = str(qry.table_name)
+                connection = schema.database_id.connection_url
+                engine = create_engine(connection, echo=False)
+                metadata = MetaData(engine)
+                metadata.create_all(engine)
+                tab = Table(table_name, metadata, autoload=True, autoload_with=engine)
+                total_columns = [c.name for c in tab.columns]
+                res = tab.select().execute().fetchall()
+                for val in range(len(res)):
+                    for row in range(len(res[val])):
+                        if total_columns[row]!='parent_id' and total_columns[row]!='id':
+                            if total_columns[row] == 'name':
+                                total_rows.append((str(res[val][row]).split("."), str(res[val][row]).split(".")[-1]))
+                            else:
+                                total_cols.append((str(total_columns[row]).split("."), str(total_columns[row]).split(".")[-1]))
+                                data.append([[str(res[val][row])]])
+                res_1 = []
+                res_1.append(total_rows)
+                res_1.append(total_cols)
+                result = (res_1, data)
+        return result
+    
+    def parse_query(self, query):
+        result = []
+        lrbrack, rrbrack = map( Suppress, "()" )
+        comma = Suppress( "," )
+        leftCurlBr, rightCurlBr = map( Suppress, "{}" )
+        dot = Suppress( "." )
+        crossToken = Literal( "crossjoin" ).suppress()
+        selectToken = Keyword( "select", caseless = True ).suppress()
+        fromToken = Keyword( "from", caseless = True ).suppress()
+        whereToken = Keyword( "where", caseless = True ).suppress()
+
+        scalar = Word( alphanums + "_" + " " + "-" + "+")
+        cube = Word( alphas + '_' )
+        level_scalar = Word( alphanums + "_" + " " )
+        level_filter = Suppress( "[" ) + level_scalar + Suppress( "]" )
+        level_function = Keyword( "children", caseless = True )
+        level_item = level_filter | level_function
+        levels = Group( level_item + Optional( dot + delimitedList( level_item, ".", combine = False ) ) )
+        axis_parser = delimitedList( levels, ",", combine = False )
+        where_parse = lrbrack + Group( delimitedList( levels , ",", combine = False ) ) + rrbrack
+
+        cross_parser = leftCurlBr + levels + rightCurlBr
+        crossx = Forward()
+        cross_mdx = crossx | leftCurlBr + axis_parser + rightCurlBr
+        crossx << ( crossToken + lrbrack + cross_mdx + comma + Group( cross_parser.setResultsName( "cross" ) ) + rrbrack )
+
+        rowsmdx = leftCurlBr + axis_parser + rightCurlBr
+        colsmdx = leftCurlBr + axis_parser + rightCurlBr
+        pagemdx = leftCurlBr + axis_parser + rightCurlBr
+        row_mdx_axis = rowsmdx | crossx
+        col_mdx_axis = colsmdx | crossx
+        row_names = ["rows", "columns", "pages"]
+        onToken = Keyword( "on", caseless = True ).suppress()
+        page_name = oneOf( ' '.join( row_names ) ).suppress()
+
+        query_parser = selectToken + Group( row_mdx_axis ) + onToken + page_name + Optional( comma + Group( col_mdx_axis ) + onToken + page_name ) \
+                + Optional( comma + Group( pagemdx ) + onToken + page_name )\
+                + fromToken + cube.suppress() + Optional( whereToken + Group(where_parse ))
+        qr = query_parser.parseString(query)
+        axes = [[],[], []]
+        crossjoins=[[],[],[]]
+        ax = 0
+        for items in qr:
+            for i in items:
+#                if ax == 2:
+#                    if len( items ) > 1:
+#                        for t in i:
+#                            conditions.append( list(t)  )
+#                    else:
+#                        conditions.append(  list(i))
+                if i.cross:
+                    if i[0][-1] == 'children':
+                        crossjoins[ax].append( '.'.join(map(lambda x: "[" + x +"]",i[0][:-1]))+".children")
+                    else:
+                        crossjoins[ax].append( '.'.join(map(lambda x: "[" + x +"]",i[0])))
+                else:
+                    if i[-1] == 'children':
+                        axes[ax].append( '.'.join(map(lambda x: "[" + x +"]",i[:-1]))+".children")
+                    else:
+                        axes[ax].append( '.'.join(map(lambda x: "[" + x +"]",i)))
+            ax = ax + 1
+    
+        result.append(axes)
+        result.append(crossjoins)
+        qry_list = [[], []]
+        t_qry = []
+        new_query = ''
+        
+        for x in range(len(axes)):
+            qry_select = 'select  {'
+            if x == 0:
+                rs = axes[x][:-1]
+                if rs:
+                    t_qry.append(rs)
+                    rs_axis = ','.join(rs)
+                    new_query  = qry_select + rs_axis + '} on rows,'
+            elif x == 1:
+                cs_axis = ','.join(axes[x])
+                if cs_axis:
+                    t_qry.append(cs_axis)
+                    new_query = new_query + ' {' + cs_axis + '} on columns from Sales'
+
+        qry_list[0].append(t_qry)
+        qry_list[1].append(new_query)
+        
+    #        else:
+    #            print "pages"
+        return qry_list
+        
\ No newline at end of file
diff --git a/addons/olap/data/olap_cube_view.xml b/addons/olap/data/olap_cube_view.xml
new file mode 100644
index 00000000000..4fa62e32185
--- /dev/null
+++ b/addons/olap/data/olap_cube_view.xml
@@ -0,0 +1,701 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+<!--
+
+Wizard view for the load data
+
+-->
+        <record id="bi_load_db_form" model="ir.ui.view">
+            <field name="name">bi.load.db.form</field>
+            <field name="model">bi.load.db.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Load Database Tables">
+                    <label align="0.0" string="We will load the complete structure of the database by introspection, so that you will be able to work on it, and specify a better structure according to your reporting needs." colspan="4" />
+                    <newline/>
+                    <label align="0.0" string="After having loaded the structure, you will be able to hide/show or rename tables and columns to simplify end-users interface. The following database will be loaded:" colspan="4"/>
+                    <newline/>
+                    <field name="fact_table" />
+                    <field name="db_name" />
+                    <newline/>
+                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
+                    <button name="action_load" string="Load Data Structure" type="object"  colspan="2"/>
+                </form>
+            </field>
+        </record>
+        <record id="act_bi_load_db_wizard" model="ir.actions.act_window">
+            <field name="name">Load database Structure</field>
+            <field name="res_model">bi.load.db.wizard</field>
+            <field name="src_model">olap.schema</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>
+        </record>
+
+
+<!--
+Wizard For Olap Warehouse
+ -->
+        <record id="view_warehouse_bi" model="ir.ui.view">
+            <field name="name">Olap Warehouse</field>
+            <field name="model">olap.warehouse.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Warehouse">
+                    <group colspan="16">
+                    <separator string="Query" colspan="16"/>
+                    <field name="query" nolabel="1" colspan="16"/>
+                    <button string="Ok" name="action_ok" colspan="16" type="object" icon='gtk-ok'/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_olap_warehouse" model="ir.actions.act_window">
+            <field name="name">Olap Warehouse</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">olap.warehouse.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem
+        name="Olap Warehouse"
+        action="action_olap_warehouse"
+        id="menu_bi_warehouse"
+        sequence="51"
+        parent="base.next_id_50"
+        />
+<!--
+
+Wizard View for the parameters wizard
+-->
+
+        <record id="view_config_bi" model="ir.ui.view">
+            <field name="name">Parameters Configuration</field>
+            <field name="model">olap.parameters.config.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Parameters Configure">
+                    <separator string="BI Web Client." colspan="4"/>
+                    <label string="This wizard will automatically configure the web client for BI." align="0.0" colspan="4"/>
+                    <field name="host_name" colspan="4"/>
+                    <field name="host_port" colspan="4"/>
+                    <separator string="" colspan="4"/>
+                    <label string="" colspan="2"/>
+                    <group col="4" colspan="2">
+                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
+                        <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_config_bi_parameters" model="ir.actions.act_window">
+            <field name="name">Parameters Configuration</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">olap.parameters.config.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem
+        name="Server Parameters"
+        action="action_config_bi_parameters"
+        id="menu_bi_server_parameters"
+        sequence="50"
+        parent="base.next_id_50"
+        />
+        <record model="ir.actions.todo" id="config_auto_directory">
+            <field name="name">Server Parameters Configuration</field>
+            <field name="note">This wizard will configure the URL of the web client</field>
+            <field name="action_id" ref="action_config_bi_parameters"/>
+        </record>
+
+
+<!--
+
+Wizard view for the Auto Configuring the data
+
+-->
+
+        <record id="bi_auto_configure_form" model="ir.ui.view">
+            <field name="name">bi.auto.configure.form</field>
+            <field name="model">bi.auto.configure.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Auto Congifuring Tables">
+                    <label align="0.0" string="This will Auto Configure Application. This will help to increase the readability of the tables and columns by giving it meaningful and easy to comprehend name. You can hides particular data and columns by reconfiguring the structure option." colspan="4" />
+                    <field name="name" select="1" colspan="4"/>
+                    <newline/>
+                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
+                    <button name="action_load" string="Auto Configure Structure" type="object"  colspan="2"/>
+                </form>
+            </field>
+        </record>
+        <record id="act_bi_auto_configure" model="ir.actions.act_window">
+            <field name="name">Auto Configuration</field>
+            <field name="res_model">bi.auto.configure.wizard</field>
+            <field name="src_model">olap.schema</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>
+        </record>
+
+
+
+    # ------------------------------------------------------------------
+    # Olap Schema
+    # ------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_schema_tree">
+        <field name="name">olap.schema.tree</field>
+        <field name="model">olap.schema</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap Schema">
+                <field name="name"/>
+                <field name="database_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_olap_schema_form">
+        <field name="name">olap.schema.form</field>
+        <field name="model">olap.schema</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap Schema">
+              <field name="name" select="1" colspan="4"/>
+              <field name="database_id" select="2" colspan="4"/>
+              <field name="loaded" colspan="3"/>
+              <button name="%(act_bi_load_db_wizard)d" string="Reload Structure" type="action" states="done"/>
+              <field name="configure" colspan="3"/>
+              <button name="%(bi_load_configuration_table)d" string="ReConfigure Structure" type="action" states="done"/>
+<!--              <button string="Configure Manually" name="dbconfigure" states="dbload" target="new"/>-->
+              <field name="ready" select="2" colspan="3"/>
+              <field name="note" colspan="4"/>
+              <field name="state" select="2" colspan="2" />
+              <group colspan="2">
+                <button string="Connect to Database" name="dbconnect" states="none"/>
+                <button string="Load Database Structure" name="%(act_bi_load_db_wizard)d" type="action" states="dbconnect" target="new" />
+                <button string="Configure Manually" name="dbconfigure"  states="dbload"/>
+                <button string="Mark as Configured" name="dbready" states="dbconfigure"/>
+              </group>
+              <separator string="Auto Application Configuration" colspan="4"/>
+              <field name="app_detect" nolabel="1" colspan="3"/>
+              <button string="Configure Automatically " name="%(act_bi_auto_configure)d" type="action" states="dbload" target="new"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_schema_form">
+        <field name="name">Olap Schemas</field>
+        <field name="res_model">olap.schema</field>
+        <field name="view_type">form</field>
+
+    </record>
+    <menuitem
+        name="Olap Schema"
+        action="action_olap_schema_form"
+        id="menu_action_olap_schema_form"
+        parent="menu_bi_conf_cubes"/>
+
+    # ------------------------------------------------------------------
+    # Olap Cubes Table
+    # ------------------------------------------------------------------
+    <record model="ir.ui.view" id="view_olap_cube_table_form">
+        <field name="name">olap.cube.table.form</field>
+        <field name="model">olap.cube.table</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap cube_table" >
+                <field name="name" select="2"/>
+                <field name="column_link_id" context="{'fk':True,'dim_x':context.get('d_id',False)}"/>
+                <newline/>
+                <separator colspan="2" string="Joined Tables"/>
+                <field invisible="True" name="line_ids" nolabel="1">
+                    <form string="Database Tables">
+                        <field name="table_id"/>
+                        <field name="field_id"/>
+                    </form>
+                    <tree string="Database Tables">
+                        <field name="table_id"/>
+                        <field name="field_id"/>
+                    </tree>
+                </field>
+                <field name="available_table_ids" colspan="4" nolabel="1" readonly="0" domain="[('available_table_ids','in',available_table_ids)]" context="{'flag':True,'master_dim':context.get('d_id',False),'master_schema':context.get('parent_schema_id',False),'link_col':column_link_id}">
+                    <tree string="Database Tables">
+                        <field name="related_to" string="Joined Table"/>
+                        <field name="name"/>
+                        <field name="table_id" />
+                        <field name="primary_key" />
+                    </tree>
+                </field>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_olap_cube_table_form">
+        <field name="name">Olap Cube Tables</field>
+        <field name="res_model">olap.cube.table</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Olap Cubes Table"
+        parent = "menu_bi_conf_cubes"
+        action="action_olap_cube_table_form"
+        id="menu_action_olap_cube_table_form"/>
+
+    # ------------------------------------------------------------------
+    # Olap Cubes
+    # ------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_cube_tree">
+        <field name="name">olap.cube.tree</field>
+        <field name="model">olap.cube</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap cube">
+                <field name="name"/>
+                <field name="table_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_cube_form">
+        <field name="name">olap.cube.form</field>
+        <field name="model">olap.cube</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap cube">
+                <field name="name" select="1" colspan="4"/>
+                <field name="schema_id" select="1" attrs="{'readonly':[('schema_id','!=','')]}"/>
+                <field name="query_log" select="2"/>
+                <field name="table_id"  colspan="4" context="{'parent_schema_id':schema_id}"/>
+
+                <!--<separator colspan="4" string="Dimensions"/>
+                <field name="dimension_ids" colspan="4" nolabel="1"/>
+                <separator colspan="4" string="Measures"/>
+                <field name="measure_ids" colspan="4" nolabel="1"/>-->
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_cube_form">
+        <field name="name">Olap Cubes</field>
+        <field name="res_model">olap.cube</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Olap Cubes"
+        parent ="menu_bi_conf_cubes"
+        action="action_olap_cube_form"
+        id="menu_action_olap_cube_form"/>
+
+
+    # ------------------------------------------------------------------
+    # Olap Dimensions
+    # ------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_dimension_tree">
+        <field name="name">olap.dimension.tree</field>
+        <field name="model">olap.dimension</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap dimension">
+                <field name="name"/>
+                <field name="cube_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_dimension_form">
+        <field name="name">olap.dimension.form</field>
+        <field name="model">olap.dimension</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap dimension">
+                <field name="name" select="1"/>
+                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
+<!--                <field name="cube_id" on_change="onchange_cube_id(cube_id)" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
+                <field name="foreign_key_table" select="2"/>
+                <field name="foreign_key" select="2"/>
+                <separator colspan="4" string="Select In These Tables For Foreign Keys"/>
+                <field name="available_foreign_table_ids" nolabel="1" colspan="4" readonly="0">
+                    <tree string="Database Tables">
+                        <button string="Mark as Foreign Table" name="mark_foreign" context="{'parent_id':parent.id,'parent_name':parent.name,'parent_cube':parent.cube_id,'reload':1}" type="object"/>
+                        <field name="table_id" />
+                        <field name="name" string="Link Column"/>
+                   </tree>
+                </field>
+                <separator colspan="4" string="Hierarchies"/>
+                <field name="hierarchy_ids" colspan="4" nolabel="1"/>-->
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_dimension_form">
+        <field name="name">Olap Dimensions</field>
+        <field name="res_model">olap.dimension</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Olap Dimension"
+        parent = "menu_bi_conf_cubes"
+        action="action_olap_dimension_form"
+        id="menu_action_olap_dimension_form"/>
+
+    # ------------------------------------------------------------------
+    # Olap Hierarchies
+    # ------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_hierarchy_tree">
+        <field name="name">olap.hierarchy.tree</field>
+        <field name="model">olap.hierarchy</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap hierarchy">
+                <field name="name"/>
+                <field name="dimension_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_hierarchy_form">
+        <field name="name">olap.hierarchy.form</field>
+        <field name="model">olap.hierarchy</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap hierarchy">
+                <field name="name" select="1" colspan="4"/>
+                <field name="dimension_id" select="1" attrs="{'readonly':[('dimension_id','!=','')]}"/>
+<!--                <field name="field_name" select="2"/>-->
+                <field name="sequence"/>
+                <field name="table_id" select="2" colspan="4" context="{'d_id':dimension_id}"/>
+<!--                <separator string="Levels" colspan="4"/>
+                <field name="level_ids" colspan="4" nolabel="1"/>-->
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_hierarchy_form">
+        <field name="name">Olap Hierarchies</field>
+        <field name="res_model">olap.hierarchy</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Olap Hierarchy"
+        parent = "menu_bi_conf_cubes"
+        action="action_olap_hierarchy_form"
+        id="menu_action_olap_hierarchy_form"/>
+
+
+    # ------------------------------------------------------------------
+    # Olap Levels
+    # ------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_level_tree">
+        <field name="name">olap.level.tree</field>
+        <field name="model">olap.level</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap Level">
+                <field name="name"/>
+                <field name="column_name"/>
+                <field name="column_id_name" invisible="True"/>
+                <field name="type"/>
+                <field name="table_name" invisible="True"/>
+                <field name="sequence"/>
+                <field name="hierarchy_id"/>
+
+
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_level_form">
+        <field name="name">olap.level.form</field>
+        <field name="model">olap.level</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap level">
+                <field name="name" select="1" colspan="4"/>
+                <field name="column_name" select="1" on_change="onchange_column_name(column_name)" context="{'filter_cols_hier':hierarchy_id}"/>
+                <field name="column_id_name" select="1"/>
+                <field name="type" select="1"/>
+                <field name="table_name" select="1"/>
+                <field name="sequence"/>
+                <!-- <field name="hierarchy_id" select="1"/>-->
+                <field name="hierarchy_id" select="1" attrs="{'readonly':[('hierarchy_id','!=','')]}"/>
+            </form>
+       </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_level_form">
+        <field name="name">Olap Level</field>
+        <field name="res_model">olap.level</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Olap Level"
+        parent = "menu_bi_conf_cubes"
+        action="action_olap_level_form"
+        id="menu_action_olap_level_form"/>
+
+
+    # ------------------------------------------------------------------
+    # Olap Measure
+    # ------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_measure_tree">
+        <field name="name">olap.measure.tree</field>
+        <field name="model">olap.measure</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap measure">
+                <field name="name"/>
+                <field name="cube_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_measure_form">
+        <field name="name">olap.measure.form</field>
+        <field name="model">olap.measure</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap measure">
+                <field name="name" select="1"/>
+                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
+                <field name="value_column_id_name" invisible="True"/>
+                <field name="table_name" invisible="True"/>
+                <field name="measure_type"/>
+
+<!--                <notebook colspan="4">
+                        <page string="Fact Table Column" >
+                            <newline/>
+                            <field name="value_column" select="1" on_change="onchange_measure_name(value_column)" context="{'filter_cols_cube':cube_id}"/>
+                            <field name="agregator" select="2"/>
+                            <field name="formatstring" select="2"/>
+                        </page>
+                        <page string="SQL Expression" attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
+                             <field name="value_sql" colspan="4" select="2"/>
+                             <field name="datatype" select="2"/>
+                        </page>
+                    </notebook>
+-->
+
+                <group colspan="4" attrs="{'invisible':[('measure_type','!=','fact_column')]}">
+                    <newline/>
+                    <field name="value_column" select="1" attrs="{'required':[('measure_type','=','fact_column')]}" on_change="onchange_measure_name(value_column)" context="{'filter_cols_cube':cube_id}"/>
+                    <field name="agregator" select="2"/>
+                    <field name="formatstring" select="2"/>
+                </group>
+                <group colspan="4"  attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
+                    <newline/>
+                    <field name="value_sql" colspan="4" select="2" attrs="{'required':[('measure_type','=','sql_expr')]}"/>
+                    <field name="datatype" select="2"/>
+                </group>
+            </form>
+
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_measure_form">
+        <field name="name">Olap Measures</field>
+        <field name="res_model">olap.measure</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Olap Measures"
+        parent = "menu_bi_conf_cubes"
+        action="action_olap_measure_form"
+        id="menu_action_olap_measure_form"/>
+
+    # ------------------------------------------------------------------
+    # Olap Saved Query
+    # ------------------------------------------------------------------
+    <record model="ir.ui.view" id="view_olap_saved_query_form_tree">
+        <field name="name">olap.saved.query.tree</field>
+        <field name="model">olap.saved.query</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap Saved Query">
+            	<field name="name"/>
+                <field name="cube_id"/>
+                <field name="mdx_id"/>
+                <field name="user_id"/>
+                <field name="query"/>
+                <field name="time"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_olap_saved_query_form_mdx">
+        <field name="name">olap.saved.query.mdx</field>
+        <field name="model">olap.saved.query</field>
+        <field name="type">mdx</field>
+        <field name="arch" type="xml">
+            <tree string="Olap Saved Query">
+            	<field name="name"/>
+                <field name="user_id"/>
+                <field name="query"/>
+                <field name="cube_id"/>
+                <field name="mdx_id"/>
+                <field name="axis_keys" readonly="True"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_saved_query_form">
+        <field name="name">olap.saved.query.form</field>
+        <field name="model">olap.saved.query</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap Saved Query">
+             	<field name="name" select="1" readonly="True"/>
+                <field name="query" select="1" colspan="4" readonly="True"/>
+                <field name="user_id" readonly="True"/>
+                <field name="cube_id" select="2" readonly="True"/>
+                <field name="mdx_id" select="2" readonly="True"/>
+                <field name="schema_id" select="2" readonly="True"/>
+                <field name="axis_keys" readonly="True"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_saved_query_form">
+        <field name="name">Olap Saved Query</field>
+        <field name="res_model">olap.saved.query</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form,mdx</field>
+    </record>
+    <menuitem
+        name="Olap Saved Query"
+        parent = "menu_bi_conf_tools"
+        action="action_olap_saved_query_form"
+        id="menu_action_olap_saved_query_form"/>
+
+<!--
+
+All Logs
+
+-->
+
+    <record model="ir.ui.view" id="view_olap_query_logs_tree">
+        <field name="name">olap.query.logs</field>
+        <field name="model">olap.query.logs</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="All Logs">
+                <field name="user_id"/>
+                <field name="query"/>
+                <field name="cube_id"/>
+                <field name="schema_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_query_logs_form">
+        <field name="name">olap.query.logs.form</field>
+        <field name="model">olap.query.logs</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="All Logs">
+                <field name="query" colspan="4" select="1" readonly="True"/>
+                <field name="time" select="2" readonly="True"/>
+                <field name="result_size" select="2" readonly="True"/>
+                <field name="cube_id" select="2" readonly="True"/>
+                <field name="count" readonly="True"/>
+                <field name="schema_id" readonly="True"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_query_logs_form">
+        <field name="name">All Logs</field>
+        <field name="res_model">olap.query.logs</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="All Logs"
+        action="action_olap_query_logs_form"
+        id="menu_action_olap_query_logs_form"
+        parent="menu_bi_conf_tools"/>
+
+
+
+
+
+
+<!--
+All Logs / My logs
+
+ -->
+
+
+    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
+        <field name="name">olap.query.logs</field>
+        <field name="model">olap.query.logs</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="My Logs">
+                <field name="user_id"/>
+                <field name="query"/>
+                <field name="cube_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
+        <field name="name">olap.query.logs</field>
+        <field name="model">olap.query.logs</field>
+        <field name="type">mdx</field>
+        <field name="arch" type="xml">
+            <tree string="My Logs">
+                <field name="user_id"/>
+                <field name="query"/>
+                <field name="cube_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_query_logs_my_form">
+        <field name="name">olap.query.logs.form</field>
+        <field name="model">olap.query.logs</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="My Logs">
+                <field name="user_id" select="1" readonly="True"/>
+                <!--  domain="[('uid','=',uid)]"
+                /> -->
+                <field name="query" select="1" readonly="True"/>
+                <field name="time" select="2" readonly="True"/>
+                <field name="result_size" select="2" readonly="True"/>
+                <field name="cube_id" select="2" readonly="True"/>
+
+            </form>
+        </field>
+
+
+    </record>
+    <record model="ir.actions.act_window" id="action_olap_query_logs_my_form">
+        <field name="name">My Logs</field>
+        <field name="res_model">olap.query.logs</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form,mdx</field>
+        <field name="domain">[('user_id','=',uid)]</field>
+    </record>
+    <menuitem
+        name="My Logs"
+        action="action_olap_query_logs_my_form"
+        id="menu_action_olap_query_logs_my_form"
+        parent="menu_action_olap_query_logs_form"/>
+
+
+<!--
+
+Clear All Logs
+
+ -->
+
+
+
+
+<!--
+
+Clear My logs
+
+ -->
+
+</data>
+</openerp>
diff --git a/addons/olap/data/olap_cube_workflow.xml b/addons/olap/data/olap_cube_workflow.xml
new file mode 100755
index 00000000000..cedfbcc686b
--- /dev/null
+++ b/addons/olap/data/olap_cube_workflow.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="workflow" id="wkf_schema">
+        <field name="name">olap.schema</field>
+        <field name="osv">olap.schema</field>
+        <field name="on_create">True</field>
+        </record>
+    
+        <record model="workflow.activity" id="act_none">
+            <field name="wkf_id" ref="wkf_schema"/>
+            <field name="flow_start">True</field>
+            <field name="name">none</field>
+        </record>
+        
+        <record model="workflow.activity" id="act_dbconnect">
+            <field name="wkf_id" ref="wkf_schema"/>
+            <field name="name">dbconnect</field>
+            <field name="kind">function</field>
+            <field name="action">action_dbconnect()</field>
+        </record>
+        
+        <record model="workflow.activity" id="act_dbload">
+            <field name="wkf_id" ref="wkf_schema"/>
+            <field name="name">dbload</field>
+            <field name="kind">function</field>
+            <field name="action">action_dbload()</field>
+        </record>
+        
+        <record model="workflow.activity" id="act_dbconfigure">
+            <field name="wkf_id" ref="wkf_schema"/>
+            <field name="name">dbconfigure</field>
+            <field name="kind">function</field>
+            <field name="action">action_dbconfigure()</field>
+        </record>
+        
+        <record model="workflow.activity" id="act_dbready">
+            <field name="wkf_id" ref="wkf_schema"/>
+            <field name="flow_stop">True</field>
+            <field name="name">dbready</field>
+            <field name="kind">function</field>
+            <field name="action">action_dbready()</field>           
+        </record>
+<!--        
+        <record model="workflow.activity" id="act_dbdone">
+            <field name="wkf_id" ref="wkf_schema"/>
+            <field name="flow_stop">True</field>
+            <field name="name">db_done</field>
+            <field name="kind">function</field>
+            <field name="action">action_done()</field>
+        </record>
+--> 
+
+        
+        <record model="workflow.transition" id="trans_none_dbconnect">
+            <field name="act_from" ref="act_none"/>
+            <field name="act_to" ref="act_dbconnect"/>
+            <field name="signal">dbconnect</field>
+        </record>
+
+        <record model="workflow.transition" id="trans_dbconnect_dbload">
+            <field name="act_from" ref="act_dbconnect"/>
+            <field name="act_to" ref="act_dbload"/>
+            <field name="signal">dbload</field>
+        </record>
+
+        <record model="workflow.transition" id="trans_dbload_dbconfigure">
+            <field name="act_from" ref="act_dbload"/>
+            <field name="act_to" ref="act_dbconfigure"/>
+            <field name="signal">dbconfigure</field>
+        </record>
+        
+        <record model="workflow.transition" id="trans_dbconfigure_dbready">
+            <field name="act_from" ref="act_dbconfigure"/>
+            <field name="act_to" ref="act_dbready"/>
+            <field name="signal">dbready</field>
+        </record>
+<!--
+        <record model="workflow.transition" id="trans_dbready_done">
+            <field name="act_from" ref="act_dbready"/>
+            <field name="act_to" ref="act_dbdone"/>
+            <field name="signal">dbdone</field>
+        </record>
+-->
+
+    </data>
+</openerp>
diff --git a/addons/olap/data/olap_data.xml b/addons/olap/data/olap_data.xml
new file mode 100755
index 00000000000..d36ec6161fe
--- /dev/null
+++ b/addons/olap/data/olap_data.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+</data>
+</openerp>
diff --git a/addons/olap/data/olap_demo.xml b/addons/olap/data/olap_demo.xml
new file mode 100755
index 00000000000..a57035c163a
--- /dev/null
+++ b/addons/olap/data/olap_demo.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="True">
+
+    <record model="olap.fact.database" id="fact_database_terp">
+        <field name="name">Tiny ERP database</field>
+        <field name="db_name">terp</field>
+        <field name="db_login">postgres</field>
+        <field name="db_password">postgres</field>
+    </record>
+
+    <record model="olap.database.tables" id="database_table_res_partner">
+        <field name="name">res_partner</field>
+        <field name="table_db_name">res_partner</field>
+        <field name="fact_database_id" ref="fact_database_terp"/>
+        <field name="active">True</field>
+        
+    </record>
+
+    <record model="olap.database.tables" id="database_table_res_user">
+        <field name="name">res_users</field>
+        <field name="table_db_name">res_users</field>
+        <field name="fact_database_id" ref="fact_database_terp"/>
+        <field name="active">True</field>
+        
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_partner_date">
+        <field name="name">date</field>
+        <field name="column_db_name">date</field>
+        <field name="type">date</field>
+        <field name="table_id" ref="database_table_res_partner"/>
+        <field name="active">True</field>
+    </record>
+        
+    <record model="olap.database.columns" id="columns_res_user_create_uid">
+        <field name="name">create_uid</field>
+        <field name="column_db_name">create_uid</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="database_table_res_user"/>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="columns_res_user_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="database_table_res_user"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="columns_res_partner_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="database_table_res_partner"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="columns_res_user_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="database_table_res_user"/>
+        <field name="active">True</field>
+    </record>
+        
+    <record model="olap.database.columns" id="columns_res_partner_credit_limit">
+        <field name="name">credit_limit</field>
+        <field name="column_db_name">credit_limit</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="database_table_res_partner"/>
+        <field name="active">True</field>
+    </record>
+        
+        
+    <record model="olap.database.columns" id="columns_res_partner_user_id">
+        <field name="name">user_id</field>
+        <field name="column_db_name">user_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="database_table_res_partner"/>
+        <field name="related_to" ref="database_table_res_user"></field>
+        <field name="active">True</field>
+        
+    </record>
+    <record model="olap.schema" id="schema_main">
+        <field name="name">tinyerp</field>
+        <field name="state">none</field>
+        <field name="database_id" ref="fact_database_terp"/>
+    </record>
+
+    <record model="olap.cube.table" id="table_res_partner">
+        <field name="name">Partner</field>
+        <field name="schema_id" ref="schema_main"/>
+        <field name="column_link_id" ref="columns_res_partner_id"/>
+    </record>
+    <record model="olap.cube.table" id="table_res_user">
+        <field name="name">Partner(User)</field>
+        <field name="schema_id" ref="schema_main"/>
+        <field name="column_link_id" ref="columns_res_partner_user_id"/>
+    </record>
+    <record model="olap.cube" id="cube_partner">
+        <field name="name">Partner</field>
+        <field name="table_id" ref="table_res_partner"/>
+        <field name="schema_id" ref="schema_main"/>
+    </record>
+
+
+    <record model="olap.dimension" id="dimension_date">
+        <field name="name">Date</field>
+        <field name="cube_id" ref="cube_partner"/>
+    </record>
+    <record model="olap.hierarchy" id="hierarchy_date">
+        <field name="name">Date</field>
+        <field name="dimension_id" ref="dimension_date"/>
+        <field name="primary_key_table">res_partner</field>
+        <field name="table_id" ref="table_res_partner"/>
+    </record>
+    <record model="olap.level" id="hierarchy_level_date">
+        <field name="name">Date</field>
+        <field name="column_name" ref="columns_res_partner_date"></field>
+        <field name="column_id_name">date</field>
+        <field name="type">date_year</field>
+        <field name="table_name">res_partner</field>
+        <field name="hierarchy_id" ref="hierarchy_date"/>
+    </record>
+
+
+    <record model="olap.dimension" id="dimension_user">
+        <field name="name">User</field>
+        <field name="cube_id" ref="cube_partner"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_user">
+        <field name="name">User</field>
+        <field name="dimension_id" ref="dimension_user"/>
+        <field name="primary_key_table">res_users</field>
+        <field name="table_id" ref="table_res_user"/>
+    </record>
+    <record model="olap.level" id="hierarchy_user_level">
+        <field name="name">Name</field>
+        <field name="column_id_name">name</field>
+        <field name="column_name" ref="columns_res_user_name"></field>
+        <field name="table_name">res_users</field>
+        <field name="hierarchy_id" ref="hierarchy_user"/>
+    </record>
+
+
+    <record model="olap.measure" id="measure_credit_limit">
+        <field name="name">Credit Limit</field>
+        <field name="cube_id" ref="cube_partner"/>
+        <field name="value_column" ref="columns_res_partner_credit_limit"></field>
+        <field name="value_column_id_name">credit_limit</field>
+        <field name="table_name">res_partner</field>
+    </record>
+
+    <record model="olap.measure" id="measure_count">
+        <field name="name">Count</field>
+        <field name="cube_id" ref="cube_partner"/>
+        <field name="value_column" ref="columns_res_partner_id"></field>
+        <field name="value_column_id_name">id</field>
+        <field name="table_name">res_partner</field>
+        <field name="agregator">count</field>
+    </record>
+
+
+    <record model="olap.application" id="application_openerp">
+        <field name="name">OpenERP</field>
+        <field name="query">select * from res_users</field>
+    </record>
+</data>
+</openerp>
diff --git a/addons/olap/data/olap_fact_view.xml b/addons/olap/data/olap_fact_view.xml
new file mode 100755
index 00000000000..d46669e2725
--- /dev/null
+++ b/addons/olap/data/olap_fact_view.xml
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    # --------------------------------------------------------------------
+    # Fact databases
+    # --------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_fact_database_tree">
+        <field name="name">olap.fact.database.tree</field>
+        <field name="model">olap.fact.database</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap fact database">
+                <field name="name"/>
+                <field name="db_name"/>
+                <field name="type"/>
+                <field name="loaded"/>
+            </tree>
+        </field>
+    </record>
+<record model="ir.ui.view" id="view_olap_fact_database_form">
+        <field name="name">olap.fact.database.form</field>
+        <field name="model">olap.fact.database</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Fact database">
+                <notebook>
+                    <page string="Information">
+                        <separator string="General information" colspan="4"/>
+                        <field name="name" select="1" colspan="4"/>
+                        <field name="db_name" select="2"/>
+                        <field name="type" select="2"/>
+                        <separator string="Connection parameters" colspan="4"/>
+                        <field name="connection_type"/>
+                        <newline/>
+                        <field name="db_host"/>
+                        <field name="db_port"/>
+                        <field name="db_login"/>
+                        <field name="db_password" password="True"/>
+                        <field name="loaded"/>
+                        <separator string="Connection url" colspan="4"/>
+                        <field name="connection_url" nolabel="1" colspan="2"/>
+<!--
+                        <button name="test_connection" string="Test Connection" type="object" colspan="2"/>
+-->
+                        <button name="%(bi_test_connection)d" string="Test Connection" type="action" colspan="2"/>
+                    </page>
+                    <page string="Tables">
+                        <field name="table_ids" colspan="4" nolabel="1"/>
+                    </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_view_olap_fact_database_form">
+                <field name="name">Fact Databases</field>
+                <field name="res_model">olap.fact.database</field>
+                <field name="view_type">form</field>
+            </record>
+    <menuitem
+        name="Databases"
+        action="action_view_olap_fact_database_form"
+        id="menu_view_olap_fact_database_form"
+        parent="menu_bi_conf_fact"/>
+
+
+    # --------------------------------------------------------------------
+    # Fact Database Tables
+    # --------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_database_tables_tree">
+        <field name="name">olap.database.tables.tree</field>
+        <field name="model">olap.database.tables</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap database tables">
+                <field name="name"/>
+                <field name="table_db_name"/>
+                <field name="fact_database_id" select="2"/>
+                <field name="active"/>
+                <field name="hide"/>
+<!--                <button name="show_col_view" string="Columns" type="object"/>-->
+                <!--<button string="Columns_wiz" name="%(bi_load_column)d" type="action"/>-->
+                <button name="hide_col" string="Hide" type="object"/>
+                <button name="show_col" string="Show" type="object"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_database_tables_form">
+        <field name="name">olap.database.tables.form</field>
+        <field name="model">olap.database.tables</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Database tables">
+                <field name="name" select="1" colspan="2"/>
+                <field name="table_db_name"/>
+                <field name="columns" colspan="4" mode="tree" nolabel="1">
+                    <tree string="Olap database columns">
+                        <field name="name"/>
+                        <field name="column_db_name"/>
+                        <field name="type"/>
+                        <field name="table_id"/>
+                        <field name="primary_key"/>
+                        <field name="related_to"/>
+                        <field name="active"/>
+                        <field name="hide"/>
+                        <button name="hide_col" string="Hide" type="object"/>
+                        <button name="show_col" string="Show" type="object"/>
+                    </tree>
+                </field>            
+                <field name="fact_database_id" select="1" colspan="2"/>
+                <field name="active"/>
+                <field name="hide"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_view_olap_database_tables_form">
+        <field name="name">Database Tables</field>
+        <field name="res_model">olap.database.tables</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Tables"
+        action="action_view_olap_database_tables_form"
+        id="menu_view_olap_database_tables_form"
+        parent="menu_bi_conf_fact"/>
+
+    # --------------------------------------------------------------------
+    # Fact Database Columns
+    # --------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_database_columns_tree">
+        <field name="name">olap.database.columns.tree</field>
+        <field name="model">olap.database.columns</field>
+        <field name="type">tree</field>
+        <field name="priority">2</field>
+        <field name="arch" type="xml">
+            <tree string="Olap database columns">
+                <field name="name"/>
+                <field name="column_db_name"/>
+                <field name="type"/>
+                <field name="table_id"/>
+                <field name="primary_key"/>
+                <field name="related_to"/>
+                <field name="active"/>
+                <field name="hide"/>
+                <button name="hide_col" string="Hide" type="object"/>
+                <button name="show_col" string="Show" type="object"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record model="ir.ui.view" id="view_olap_database_columns_tree_m20">
+        <field name="name">olap.database.columns.tree.m20</field>
+        <field name="model">olap.database.columns</field>
+        <field name="type">tree</field>
+        <field name="priority">1</field>
+        <field name="arch" type="xml">
+            <tree string="Olap database columns">
+                <field name="name"/>
+                <field name="column_db_name"/>
+                <field name="table_id"/>
+                <field name="related_to"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record model="ir.ui.view" id="view_olap_database_columns_form">
+        <field name="name">olap.database.columns.form</field>
+        <field name="model">olap.database.columns</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Database columns">
+                <field name="name" select="1" colspan="2"/>
+                <field name="column_db_name"/>
+                <field name="type"/>
+                <field name="table_id" select="1" colspan="2"/>
+                <field name="primary_key"/>
+                <field name="related_to"/>
+                <field name="active"/>
+                <field name="hide"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_view_olap_database_columns_form">
+        <field name="name">Database Columns</field>
+        <field name="res_model">olap.database.columns</field>
+        <field name="view_type">form</field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_view_olap_database_columns_form">
+        <field name="name">Database Columns</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_type">form</field>
+        <field name="res_model">olap.database.columns</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_olap_database_columns_tree"></field>
+    </record>
+
+    <menuitem
+        name="Columns"
+        action="action_view_olap_database_columns_form"
+        id="menu_view_olap_database_columns_form"
+        parent="menu_bi_conf_fact"/>
+
+
+
+    # --------------------------------------------------------------------
+    # Olap Application
+    # --------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_application_tree">
+        <field name="name">olap.application.tree</field>
+        <field name="model">olap.application</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap Application">
+                <field name="name"/>
+                <field name="query"/>
+                <field name="table_ids"/>
+                <field name="field_ids"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_application_form">
+        <field name="name">olap.application.form</field>
+        <field name="model">olap.application</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap Application">
+                <newline/>
+                <field name="name" select="1" colspan="2"/>
+                <field name="query" select="1" colspan="2"/>
+                <field name="table_ids" select="1" colspan="4" nolabel="1"/>
+                <field name="field_ids" select="1" colspan="4" nolabel="1" rowspan="1"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_view_olap_application_form">
+        <field name="name">Olap Applicatiion</field>
+        <field name="res_model">olap.application</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Application"
+        action="action_view_olap_application_form"
+        id="menu_view_olap_application_form"
+        parent="menu_bi_conf_known_application"/>
+
+    # --------------------------------------------------------------------
+    # Olap Application table
+    # --------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_application_table_tree">
+        <field name="name">olap.application.table.tree</field>
+        <field name="model">olap.application.table</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap Application Table">
+                <field name="name"/>
+                <field name="table_name"/>
+                <field name="is_hidden"/>
+                <field name="application_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_application_table_form">
+        <field name="name">olap.application.table.form</field>
+        <field name="model">olap.application.table</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap Application Table">
+                <newline/>
+                <field name="name" select="1" colspan="2"/>
+                <field name="table_name" select="1" />
+                <field name="is_hidden" select="1" colspan="2" />
+                <field name="application_id" select="1" />
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_view_olap_application_table_form">
+        <field name="name">Olap Applicatiion Table</field>
+        <field name="res_model">olap.application.table</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Application Table"
+        action="action_view_olap_application_table_form"
+        id="menu_view_olap_application_table_form"
+        parent="menu_bi_conf_known_application"/>
+
+
+
+    # --------------------------------------------------------------------
+    # Olap Application Field
+    # --------------------------------------------------------------------
+
+    <record model="ir.ui.view" id="view_olap_application_field_tree">
+        <field name="name">olap.application.field.tree</field>
+        <field name="model">olap.application.field</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Olap Application Field">
+                <field name="name"/>
+                <field name="table_name"/>
+                <field name="field_name"/>
+                <field name="is_hidden" />
+                <field name="application_id"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_olap_application_field_form">
+        <field name="name">olap.application.field.form</field>
+        <field name="model">olap.application.field</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Olap Application Field">
+                <newline/>
+                <field name="name" select="1" colspan="2"/>
+                <field name="field_name" select="1" />              
+                <field name="table_name" select="1" />
+                <newline/>
+                <field name="is_hidden" select="1" colspan="2"/>
+                <field name="application_id" select="1" />
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_view_olap_application_field_form">
+        <field name="name">Olap Applicatiion Field</field>
+        <field name="res_model">olap.application.field</field>
+        <field name="view_type">form</field>
+    </record>
+    <menuitem
+        name="Application Field"
+        action="action_view_olap_application_field_form"
+        id="menu_view_olap_application_field_form"
+        parent="menu_bi_conf_known_application"/>
+
+
+
+
+
+</data>
+</openerp>
diff --git a/addons/olap/data/olap_security.xml b/addons/olap/data/olap_security.xml
new file mode 100755
index 00000000000..1ca5534dae3
--- /dev/null
+++ b/addons/olap/data/olap_security.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="access_olap_application" model="ir.model.access">
+            <field name="name">Olap Application</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.application')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+          
+        <record id="access_olap_application_field" model="ir.model.access">
+            <field name="name">Olap Application Field</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.application.field')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_application_table" model="ir.model.access">
+            <field name="name">Olap Application Table</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.application.table')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_cube" model="ir.model.access">
+            <field name="name">Olap Cube</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.cube')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_cube_table" model="ir.model.access">
+            <field name="name">Olap Cube Table</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.cube.table')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_cube_table_line" model="ir.model.access">
+            <field name="name">Olap Cube Table Line</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.cube.table.line')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_database_columns" model="ir.model.access">
+            <field name="name">Olap Database Columns</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.database.columns')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_database_tables" model="ir.model.access">
+            <field name="name">Olap Database Tables</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.database.tables')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_dimension" model="ir.model.access">
+            <field name="name">Olap Dimension</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.dimension')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_fact_database" model="ir.model.access">
+            <field name="name">Olap Fact Database</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.fact.database')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_hierarchy" model="ir.model.access">
+            <field name="name">Olap Hierarchy</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.hierarchy')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_level" model="ir.model.access">
+            <field name="name">Olap Level</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.level')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_schema" model="ir.model.access">
+            <field name="name">Olap Schema</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.schema')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_measure" model="ir.model.access">
+            <field name="name">Olap Measure</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.measure')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+        <record id="access_olap_query_logs" model="ir.model.access">
+            <field name="name">Olap Query Logs</field>
+            <field model="ir.model" name="model_id" search="[('model', '=', 'olap.query.logs')]"/>
+            <field name="group_id" ref="base.group_system"/>
+            <field eval="True" name="perm_read"/>
+            <field eval="True" name="perm_write"/>
+            <field eval="True" name="perm_create"/>
+            <field eval="True" name="perm_unlink"/>
+        </record>
+        
+    </data>
+</openerp>        
diff --git a/addons/olap/data/olap_view.xml b/addons/olap/data/olap_view.xml
new file mode 100755
index 00000000000..306f9a29084
--- /dev/null
+++ b/addons/olap/data/olap_view.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+
+<!--    <menuitem-->
+<!--        name="Businesss Intelligence"-->
+<!--        id="menu_bi"-->
+<!--        icon="terp-account" parent="base.next_id_50"/>-->
+
+    <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+    <menuitem
+            id="base.next_id_50"
+            name="Configuration"
+            parent="base.reporting_menu"
+            groups="base.group_system"
+            sequence="3"/>
+    <menuitem
+        name="Custom Reports" id="base.menu_custom_reports"
+        parent="base.reporting_menu" sequence="1"/>
+    <menuitem
+        name="Businesss Intelligence Configuration"
+        id="menu_bi_configuration"
+        parent="base.next_id_50" sequence="1"/>
+
+    <menuitem
+        name="Fact Databases"
+        sequence="10"
+        id="menu_bi_conf_fact"
+        parent="menu_bi_configuration"/>
+
+    <menuitem
+        name="Known Application"
+        sequence="20"
+        id="menu_bi_conf_known_application"
+        parent="menu_bi_configuration"/>
+
+    <menuitem
+        name="Olap Cubes"
+        sequence="30"
+        id="menu_bi_conf_cubes"
+        parent="menu_bi_configuration"/>
+
+    <menuitem
+        name="Tools"
+        sequence="40"
+        id="menu_bi_conf_tools"
+        parent="menu_bi_configuration"/>
+
+
+    <record model="ir.actions.url" id="menu_url_cube_browser">
+            <field name="name">name_menu_url_cube_browser</field>
+            <field name="url">http://localhost:8080/browser</field>
+    </record>
+    <menuitem name="Cube Browser" id="menu_browser_url" type="url" action="menu_url_cube_browser" parent="base.menu_custom_reports" sequence="1"/>
+
+    <record model="ir.actions.url" id="menu_url_cube_designer">
+            <field name="name">name_menu_url_cube_designer</field>
+            <field name="url">http://localhost:8080/designer</field>
+    </record>
+    <menuitem name="Cube Designer" sequence="60" action="menu_url_cube_designer" type="url" id="menu_designer_url" parent="base.next_id_50"/>
+
+</data>
+</openerp>
diff --git a/addons/olap/data/olap_wizard.xml b/addons/olap/data/olap_wizard.xml
new file mode 100755
index 00000000000..c2cda9ef29a
--- /dev/null
+++ b/addons/olap/data/olap_wizard.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+    <wizard
+            string="Query Builder"
+            model="olap.schema"
+            name="olap.query_builder"
+            menu= "False"
+            multi="True"
+            id="bi_conf_cube_query_builder"/>
+        <!--        <menuitem name="Query Builder" action="bi_conf_cube_query_builder" type="wizard"  id="menu_bi_conf_cube_query_builder" sequence="40" parent="menu_bi_conf_tools"/>
+        -->
+
+    <wizard
+            string="Load Tables"
+            model="olap.schema"
+            name="olap.load.table"
+            menu= "False"
+            multi="True"
+            id="bi_menu_olap_load_table"/>
+
+
+        <wizard
+            string="Load Tables"
+            model="olap.schema"
+            name="olap.load.table"
+            menu= "False"
+            multi="True"
+            id="bi_menu_olap_load_table"/>
+            
+        <wizard
+            string="Open Configuration"
+            model="olap.schema"
+            name="olap.load.configuration.table"
+            menu= "False"
+            multi="True"
+            id="bi_load_configuration_table"/>          
+
+        <wizard
+            string="Configure from Application"
+            model="olap.schema"
+            name="olap.application.configuration"
+            menu="False"
+            multi="True"
+            id="bi_application_configuration"/>
+
+        <wizard
+            string="Test Connection"
+            model="olap.fact.database"
+            name="olap.fact.database.test_connection"
+            menu="False"
+            id="bi_test_connection"/> 
+
+        <wizard
+            string="Open Columns"
+            model="olap.database.columns"
+            name="olap.load.column"
+            menu= "False"
+            multi="True"
+            id="bi_load_column"/> 
+            
+        <wizard
+            string="Clear Logs"
+            model="olap.query.logs"
+            name="olap.query.logs.clear"
+            menu="True"
+            id="bi_clear_logs"/>    
+        <menuitem name="Clear Logs" action="bi_clear_logs" type="wizard"  id="menu_bi_clear_logs" sequence="30" parent="menu_bi_conf_tools"/>
+
+
+    </data>
+</openerp>
diff --git a/addons/olap/i18n/fr_BE.po b/addons/olap/i18n/fr_BE.po
new file mode 100644
index 00000000000..0866638abff
--- /dev/null
+++ b/addons/olap/i18n/fr_BE.po
@@ -0,0 +1,1370 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:24:42+0000\n"
+"PO-Revision-Date: 2009-11-26 05:24:42+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: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Hide"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_saved_query_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_saved_query_form
+#: view:olap.saved.query:0
+msgid "Olap Saved Query"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,time:0
+#: field:olap.saved.query,time:0
+msgid "Time"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Configure Structure"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Olap fact database"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,value_sql:0
+msgid "You can provide valid sql expression. Make sure it have function with fully qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) tablename.columnname)"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,schema_id:0
+msgid "Schema id"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,database_id:0
+msgid "Database Connection"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "MySQL"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_password:0
+msgid "Database password"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Olap database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection url"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.table:0
+msgid "Olap Application Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.parameters.config.wizard,host_name:0
+msgid "Server Name"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_password:0
+msgid "Password for the login."
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,application_id:0
+#: field:olap.application.table,application_id:0
+msgid "Application Id"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.todo,note:olap.config_auto_directory
+msgid "This wizard will configure the URL of the web client"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_fact_database_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_fact
+msgid "Fact Databases"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_browser_url
+msgid "Cube Browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_dimension_form
+msgid "Olap Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_columns
+msgid "Olap Database Columns"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "BI Web Client."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_port:0
+msgid " Port to be used in connection"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,primary_key:0
+msgid "Primary Key"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,table_id:0
+msgid "Table Id"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "This wizard will automatically configure the web client for BI."
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,type:0
+msgid "Database type"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query_builder,back:0
+#: wizard_view:olap.query_builder,init:0
+msgid "Cube Fetcher"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+msgid "Your database structure has been correctly loaded"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_parameters_config_wizard
+msgid "Olap Server Parameters"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_table_form
+msgid "Olap Cube Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,formatstring:0
+msgid "Format string"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,exec:0
+#: wizard_button:olap.query_builder,ok,exec:0
+msgid "Execute"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,configure,end:0
+#: wizard_button:olap.fact.database.test_connection,init,end:0
+#: wizard_button:olap.load.table,info,end:0
+#: wizard_button:olap.query.logs.clear,info,end:0
+#: wizard_button:olap.query.logs.clear,ok,end:0
+#: view:olap.warehouse.wizard:0
+msgid "Ok"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_known_application
+msgid "Known Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,level:0
+#: wizard_field:olap.query_builder,ok,level:0
+msgid "Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_id_name:0
+#: field:olap.measure,value_column_id_name:0
+msgid "Column ID"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "We will load the complete structure of the database by introspection, so that you will be able to work on it, and specify a better structure according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_form
+msgid "Olap Applicatiion"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,name:0
+msgid "Query Name"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query:0
+#: wizard_field:olap.query_builder,ok,mdx_query:0
+msgid "MDX Query"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_auto_configure_wizard
+msgid "bi.auto.configure.wizard"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key:0
+msgid "Primary key"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_auto_configure
+msgid "Auto Configuration"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,note:0
+msgid "Schema description"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_load_db_wizard
+msgid "Load database Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_level
+#: view:olap.level:0
+msgid "Olap level"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "None (0000.00)"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_host:0
+msgid "Database host"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_fact_database
+msgid "Olap Fact Database"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Congifuring Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,name:0
+msgid "Application name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,column_link_id:0
+msgid "Relational Column"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,type:0
+msgid "Level class"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,name:0
+msgid "Cube name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
+msgid "Olap Applicatiion Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_saved_query
+msgid "olap.saved.query"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_name:0
+msgid "Columns Name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_hierarchy_form
+msgid "Olap Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,ready:0
+msgid "Ready"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_column:0
+msgid "Fact Table Column"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_tables_form
+#: field:olap.application,table_ids:0
+#: view:olap.fact.database:0
+#: field:olap.fact.database,table_ids:0
+msgid "Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application
+msgid "Olap application"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Schema is ready to use"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_designer_url
+msgid "Cube Designer"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_login:0
+msgid "Database login"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_table_form
+msgid "Application Table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Logs Cleared successfully"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_schema
+#: model:ir.ui.menu,name:olap.menu_action_olap_schema_form
+#: view:olap.schema:0
+msgid "Olap Schema"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_form
+msgid "Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query_output:0
+#: wizard_field:olap.query_builder,ok,mdx_query_output:0
+msgid "MDX Query Output"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key_table:0
+msgid "Primary key table"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,table_name:0
+msgid "The name of the table on which the column is defined. If False, take the table from the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.warehouse.wizard:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_dimension_form
+msgid "Olap Dimensions"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,user_id:0
+msgid "Tiny ERP User"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_application_configuration
+msgid "Configure from Application"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_port:0
+msgid "Database port"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_port:0
+msgid "Put the port for the server. Put 8080 if                 its not clear."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Loaded"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,cube_id:0
+#: field:olap.measure,cube_id:0
+#: field:olap.query.logs,cube_id:0
+#: field:olap.saved.query,cube_id:0
+msgid "Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,available_table_ids:0
+msgid "Available Tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Manually"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,related_to:0
+msgid "Related To"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Olap database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,field_id:0
+msgid "Link Field"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Mark as Configured"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.field:0
+msgid "Olap Application Field"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Comma Seperator (0,000)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,agregator:0
+msgid "Agregator"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Your database structure (Open ERP) has been sucessfully configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_name:0
+msgid "Put here the server address or IP                 Put localhost if its not clear."
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Reload Structure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid "This will Auto Configure Application"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Data Structure"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+#: view:bi.load.db.wizard:0
+#: wizard_button:olap.application.configuration,init,end:0
+#: wizard_button:olap.load.table,init,end:0
+#: view:olap.parameters.config.wizard:0
+#: wizard_button:olap.query.logs.clear,init,end:0
+#: wizard_button:olap.query_builder,exec,end:0
+#: wizard_button:olap.query_builder,ok,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "After having loaded the structure, you will be able to hide/show or rename tables and columns to simplify end-users interface. The following database will be loaded:"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_level_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_level_form
+#: view:olap.level:0
+msgid "Olap Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,loaded:0
+msgid "Loaded"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_name:0
+msgid "Name of the database to be used for analysis."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_login:0
+msgid "Login for the database name specified."
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,dimension_id:0
+#: wizard_field:olap.query_builder,exec,dimension:0
+#: wizard_field:olap.query_builder,ok,dimension:0
+msgid "Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_table
+msgid "Olap application table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid "We will load the complete structure of the database by introspection,      so that you will be able to work on it, and specify a better structure      according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,axis_keys:0
+msgid "Axis Keys"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_log:0
+msgid "Query Logging"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,measure_type:0
+msgid "Measure Type"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,fact_database_id:0
+msgid "Database Id"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_host:0
+msgid "Give hostname to make connection to the database."
+msgstr ""
+
+#. module: olap
+#: field:olap.level,hierarchy_id:0
+msgid "Hierarchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_schema_form
+msgid "Olap Schemas"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,table_id:0
+msgid "Fact table"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "This will Auto Configure Application. This will help to increase the readability of the tables and columns by giving it meaningful and easy to comprehend name. You can hides particular data and columns by reconfiguring the structure option."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_field_form
+msgid "Olap Applicatiion Field"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,query:0
+#: field:olap.saved.query,query:0
+#: view:olap.warehouse.wizard:0
+#: field:olap.warehouse.wizard,query:0
+msgid "Query"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Auto Application Configuration"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency(0000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:bi.load.db.wizard,db_name:0
+#: wizard_field:olap.load.table,init,db_name:0
+msgid "Database Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,measure_ids:0
+msgid "Measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_conf_cube_query_builder
+#: wizard_view:olap.query_builder,exec:0
+#: wizard_view:olap.query_builder,ok:0
+msgid "Query Builder"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,dimension_ids:0
+msgid "Dimensions"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube
+#: view:olap.cube:0
+msgid "Olap cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_warehouse
+#: model:ir.model,name:olap.model_olap_warehouse_wizard
+#: model:ir.ui.menu,name:olap.menu_bi_warehouse
+msgid "Olap Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_field_form
+msgid "Application Field"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_dimension
+#: view:olap.dimension:0
+msgid "Olap dimension"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,name:0
+msgid "Application field name"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection parameters"
+msgstr ""
+
+#. module: olap
+#: field:bi.auto.configure.wizard,name:0
+#: field:bi.load.db.wizard,fact_table:0
+#: wizard_field:olap.load.table,init,fact_table:0
+msgid "Fact Name"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+msgid "Database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.table,table_name:0
+#: field:olap.cube.table,name:0
+#: field:olap.level,table_name:0
+#: field:olap.measure,table_name:0
+msgid "Table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,measure_type:0
+msgid "Select between auto column or sql expression for the measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_column
+msgid "Open Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_columns_form
+#: field:olap.database.tables,columns:0
+msgid "Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_test_connection
+#: view:olap.fact.database:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_measure_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_measure_form
+msgid "Olap Measures"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,init,configure:0
+#: view:olap.parameters.config.wizard:0
+msgid "Configure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid "After having loaded the structure, you will be able to hide/show or      rename tables and columns to simplify end-users interface. The following database      will be loaded:"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,hierarchy:0
+#: wizard_field:olap.query_builder,ok,hierarchy:0
+msgid "Hiearchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_sql:0
+msgid "SQL Expression"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_menu_olap_load_table
+msgid "Load Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,level_ids:0
+msgid "Levels"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_field
+msgid "Olap application field"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_columns_form
+msgid "Database Columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,active:0
+#: field:olap.database.tables,active:0
+msgid "Active"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Integer"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid " Auto Configure "
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Sum"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query.logs.clear,init,user_name:0
+#: field:olap.saved.query,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,count:0
+msgid "Count"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,name:0
+msgid "End-User Name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency with comma seperator (0,000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,datatype:0
+msgid "Datatype"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,back,ok:0
+#: wizard_button:olap.query_builder,init,ok:0
+msgid "Fetch Data"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency with comma seperator (EUR 0,000.00)"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_ids:0
+msgid "Queries"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "Oracle"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_cubes
+msgid "Olap Cubes"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_table_form
+msgid "Olap Cubes Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,name:0
+msgid "Measure name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+msgid "Socket"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_type:0
+msgid "Connection type"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "count"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_name:0
+msgid "Database name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,type:0
+msgid "Type"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Show"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,back:0
+#: wizard_button:olap.query_builder,ok,back:0
+msgid "Change cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_tables_form
+#: view:olap.cube.table:0
+#: field:olap.cube.table,line_ids:0
+msgid "Database Tables"
+msgstr ""
+
+#. module: olap
+#: help:olap.level,table_name:0
+msgid "The name of the table on which the column is defined. If False, take the table from the hierarchy."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Nothing has been Configured"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,name:0
+msgid "Dimension name"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.load.table,ok,end:0
+msgid "Continue and Configure Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_measure
+#: view:olap.measure:0
+msgid "Olap measure"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,table_id:0
+msgid "Table(s) for cube."
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,measure:0
+#: wizard_field:olap.query_builder,ok,measure:0
+msgid "Measure"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,column_db_name:0
+msgid "Column DBName"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "We Can Start building Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,table_id:0
+msgid "Database Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,name:0
+msgid "Schema name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_my_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_my_form
+#: view:olap.query.logs:0
+msgid "My Logs"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Information"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,back,cube_schema:0
+#: wizard_field:olap.query_builder,init,cube_schema:0
+msgid "Select Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,table_id:0
+msgid "Fact table(s)"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_designer
+msgid "name_menu_url_cube_designer"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_config_bi_parameters
+msgid "Parameters Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Connect to Database"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Database Connected"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,table_name:0
+#: field:olap.application.table,name:0
+msgid "Application table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.hierarchy,table_id:0
+msgid "Table(s) to make hierarchy on the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "General information"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,query:0
+msgid "Application Query"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,query_log:0
+msgid "Enabling  this will log all the queries in the browser"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,mdx_id:0
+msgid "Module"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,is_hidden:0
+#: field:olap.application.table,is_hidden:0
+#: field:olap.database.columns,hide:0
+#: field:olap.database.tables,hide:0
+msgid "Hidden"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,hierarchy_ids:0
+msgid "Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,result_size:0
+msgid "Result Size"
+msgstr ""
+
+#. module: olap
+#: view:olap.application:0
+msgid "Olap Application"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_tables
+msgid "Olap Database Tables"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency (EUR 0000.00)"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Olap cube_table"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "Parameters Configure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_hierarchy
+#: view:olap.hierarchy:0
+msgid "Olap hierarchy"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube_table
+#: model:ir.model,name:olap.model_olap_cube_table_line
+msgid "Olap cube table"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,field_name:0
+msgid "Field name"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_query_logs
+msgid "Olap query logs"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,name:0
+msgid "Fact name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,formatstring:0
+msgid " Let you specify how the measure to be displayed in cube browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_server_parameters
+msgid "Server Parameters"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+#: wizard_button:olap.load.table,init,ok:0
+#: view:olap.schema:0
+msgid "Load Database Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,name:0
+msgid "Level name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,schema_id:0
+#: field:olap.query.logs,schema_id:0
+#: field:olap.saved.query,schema_id:0
+msgid "Schema"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_url:0
+#: field:olap.schema,app_detect:0
+msgid "Connection URL"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,cube_ids:0
+msgid "Cubes"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "ReConfigure Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Average"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Database Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_hierarchy_form
+msgid "Olap Hierarchy"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,cube_table_id:0
+msgid "Cube Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi
+msgid "Businesss Intelligence"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_load_db_wizard
+msgid "bi.load.db.wizard"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_browser
+msgid "name_menu_url_cube_browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_fact_database_form
+msgid "Databases"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,name:0
+msgid "Hierarchy name"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,description:olap.module_meta_information
+msgid "\n"
+"    Base module to manage Olap schemas. Cube designer.\n"
+"    "
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,loaded:0
+msgid "Loading Datastructure"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Table"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "PostgreSQL"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,init:0
+msgid " To Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,sequence:0
+#: field:olap.level,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_tools
+msgid "Tools"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,state:0
+msgid "Schema State"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Float"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_form
+#: view:olap.query.logs:0
+msgid "All Logs"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+#: field:olap.parameters.config.wizard,host_port:0
+msgid "Port"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Fact database"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,shortdesc:olap.module_meta_information
+msgid "olap"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,table_db_name:0
+msgid "Table Name"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Auto Configure"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,configure:0
+msgid "Configuring Datastructure"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_configuration_table
+msgid "Open Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Automatically "
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_clear_logs
+#: model:ir.ui.menu,name:olap.menu_bi_clear_logs
+#: wizard_button:olap.query.logs.clear,init,ok:0
+msgid "Clear Logs"
+msgstr ""
+
diff --git a/addons/olap/i18n/olap.pot b/addons/olap/i18n/olap.pot
new file mode 100644
index 00000000000..0866638abff
--- /dev/null
+++ b/addons/olap/i18n/olap.pot
@@ -0,0 +1,1370 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:24:42+0000\n"
+"PO-Revision-Date: 2009-11-26 05:24:42+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: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Hide"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_saved_query_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_saved_query_form
+#: view:olap.saved.query:0
+msgid "Olap Saved Query"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,time:0
+#: field:olap.saved.query,time:0
+msgid "Time"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Configure Structure"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Olap fact database"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,value_sql:0
+msgid "You can provide valid sql expression. Make sure it have function with fully qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) tablename.columnname)"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,schema_id:0
+msgid "Schema id"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,database_id:0
+msgid "Database Connection"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "MySQL"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_password:0
+msgid "Database password"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Olap database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection url"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.table:0
+msgid "Olap Application Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.parameters.config.wizard,host_name:0
+msgid "Server Name"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_password:0
+msgid "Password for the login."
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,application_id:0
+#: field:olap.application.table,application_id:0
+msgid "Application Id"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.todo,note:olap.config_auto_directory
+msgid "This wizard will configure the URL of the web client"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_fact_database_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_fact
+msgid "Fact Databases"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_browser_url
+msgid "Cube Browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_dimension_form
+msgid "Olap Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_columns
+msgid "Olap Database Columns"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "BI Web Client."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_port:0
+msgid " Port to be used in connection"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,primary_key:0
+msgid "Primary Key"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,table_id:0
+msgid "Table Id"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "This wizard will automatically configure the web client for BI."
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,type:0
+msgid "Database type"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query_builder,back:0
+#: wizard_view:olap.query_builder,init:0
+msgid "Cube Fetcher"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+msgid "Your database structure has been correctly loaded"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_parameters_config_wizard
+msgid "Olap Server Parameters"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_table_form
+msgid "Olap Cube Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,formatstring:0
+msgid "Format string"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,exec:0
+#: wizard_button:olap.query_builder,ok,exec:0
+msgid "Execute"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,configure,end:0
+#: wizard_button:olap.fact.database.test_connection,init,end:0
+#: wizard_button:olap.load.table,info,end:0
+#: wizard_button:olap.query.logs.clear,info,end:0
+#: wizard_button:olap.query.logs.clear,ok,end:0
+#: view:olap.warehouse.wizard:0
+msgid "Ok"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_known_application
+msgid "Known Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,level:0
+#: wizard_field:olap.query_builder,ok,level:0
+msgid "Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_id_name:0
+#: field:olap.measure,value_column_id_name:0
+msgid "Column ID"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "We will load the complete structure of the database by introspection, so that you will be able to work on it, and specify a better structure according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_form
+msgid "Olap Applicatiion"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,name:0
+msgid "Query Name"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query:0
+#: wizard_field:olap.query_builder,ok,mdx_query:0
+msgid "MDX Query"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_auto_configure_wizard
+msgid "bi.auto.configure.wizard"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key:0
+msgid "Primary key"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_auto_configure
+msgid "Auto Configuration"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,note:0
+msgid "Schema description"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_load_db_wizard
+msgid "Load database Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_level
+#: view:olap.level:0
+msgid "Olap level"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "None (0000.00)"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_host:0
+msgid "Database host"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_fact_database
+msgid "Olap Fact Database"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Congifuring Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,name:0
+msgid "Application name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,column_link_id:0
+msgid "Relational Column"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,type:0
+msgid "Level class"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,name:0
+msgid "Cube name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
+msgid "Olap Applicatiion Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_saved_query
+msgid "olap.saved.query"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_name:0
+msgid "Columns Name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_hierarchy_form
+msgid "Olap Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,ready:0
+msgid "Ready"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_column:0
+msgid "Fact Table Column"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_tables_form
+#: field:olap.application,table_ids:0
+#: view:olap.fact.database:0
+#: field:olap.fact.database,table_ids:0
+msgid "Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application
+msgid "Olap application"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Schema is ready to use"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_designer_url
+msgid "Cube Designer"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_login:0
+msgid "Database login"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_table_form
+msgid "Application Table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Logs Cleared successfully"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_schema
+#: model:ir.ui.menu,name:olap.menu_action_olap_schema_form
+#: view:olap.schema:0
+msgid "Olap Schema"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_form
+msgid "Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query_output:0
+#: wizard_field:olap.query_builder,ok,mdx_query_output:0
+msgid "MDX Query Output"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key_table:0
+msgid "Primary key table"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,table_name:0
+msgid "The name of the table on which the column is defined. If False, take the table from the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.warehouse.wizard:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_dimension_form
+msgid "Olap Dimensions"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,user_id:0
+msgid "Tiny ERP User"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_application_configuration
+msgid "Configure from Application"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_port:0
+msgid "Database port"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_port:0
+msgid "Put the port for the server. Put 8080 if                 its not clear."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Loaded"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,cube_id:0
+#: field:olap.measure,cube_id:0
+#: field:olap.query.logs,cube_id:0
+#: field:olap.saved.query,cube_id:0
+msgid "Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,available_table_ids:0
+msgid "Available Tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Manually"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,related_to:0
+msgid "Related To"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Olap database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,field_id:0
+msgid "Link Field"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Mark as Configured"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.field:0
+msgid "Olap Application Field"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Comma Seperator (0,000)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,agregator:0
+msgid "Agregator"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Your database structure (Open ERP) has been sucessfully configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_name:0
+msgid "Put here the server address or IP                 Put localhost if its not clear."
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Reload Structure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid "This will Auto Configure Application"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Data Structure"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+#: view:bi.load.db.wizard:0
+#: wizard_button:olap.application.configuration,init,end:0
+#: wizard_button:olap.load.table,init,end:0
+#: view:olap.parameters.config.wizard:0
+#: wizard_button:olap.query.logs.clear,init,end:0
+#: wizard_button:olap.query_builder,exec,end:0
+#: wizard_button:olap.query_builder,ok,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "After having loaded the structure, you will be able to hide/show or rename tables and columns to simplify end-users interface. The following database will be loaded:"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_level_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_level_form
+#: view:olap.level:0
+msgid "Olap Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,loaded:0
+msgid "Loaded"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_name:0
+msgid "Name of the database to be used for analysis."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_login:0
+msgid "Login for the database name specified."
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,dimension_id:0
+#: wizard_field:olap.query_builder,exec,dimension:0
+#: wizard_field:olap.query_builder,ok,dimension:0
+msgid "Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_table
+msgid "Olap application table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid "We will load the complete structure of the database by introspection,      so that you will be able to work on it, and specify a better structure      according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,axis_keys:0
+msgid "Axis Keys"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_log:0
+msgid "Query Logging"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,measure_type:0
+msgid "Measure Type"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,fact_database_id:0
+msgid "Database Id"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_host:0
+msgid "Give hostname to make connection to the database."
+msgstr ""
+
+#. module: olap
+#: field:olap.level,hierarchy_id:0
+msgid "Hierarchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_schema_form
+msgid "Olap Schemas"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,table_id:0
+msgid "Fact table"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "This will Auto Configure Application. This will help to increase the readability of the tables and columns by giving it meaningful and easy to comprehend name. You can hides particular data and columns by reconfiguring the structure option."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_field_form
+msgid "Olap Applicatiion Field"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,query:0
+#: field:olap.saved.query,query:0
+#: view:olap.warehouse.wizard:0
+#: field:olap.warehouse.wizard,query:0
+msgid "Query"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Auto Application Configuration"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency(0000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:bi.load.db.wizard,db_name:0
+#: wizard_field:olap.load.table,init,db_name:0
+msgid "Database Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,measure_ids:0
+msgid "Measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_conf_cube_query_builder
+#: wizard_view:olap.query_builder,exec:0
+#: wizard_view:olap.query_builder,ok:0
+msgid "Query Builder"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,dimension_ids:0
+msgid "Dimensions"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube
+#: view:olap.cube:0
+msgid "Olap cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_warehouse
+#: model:ir.model,name:olap.model_olap_warehouse_wizard
+#: model:ir.ui.menu,name:olap.menu_bi_warehouse
+msgid "Olap Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_field_form
+msgid "Application Field"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_dimension
+#: view:olap.dimension:0
+msgid "Olap dimension"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,name:0
+msgid "Application field name"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection parameters"
+msgstr ""
+
+#. module: olap
+#: field:bi.auto.configure.wizard,name:0
+#: field:bi.load.db.wizard,fact_table:0
+#: wizard_field:olap.load.table,init,fact_table:0
+msgid "Fact Name"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+msgid "Database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.table,table_name:0
+#: field:olap.cube.table,name:0
+#: field:olap.level,table_name:0
+#: field:olap.measure,table_name:0
+msgid "Table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,measure_type:0
+msgid "Select between auto column or sql expression for the measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_column
+msgid "Open Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_columns_form
+#: field:olap.database.tables,columns:0
+msgid "Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_test_connection
+#: view:olap.fact.database:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_measure_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_measure_form
+msgid "Olap Measures"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,init,configure:0
+#: view:olap.parameters.config.wizard:0
+msgid "Configure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid "After having loaded the structure, you will be able to hide/show or      rename tables and columns to simplify end-users interface. The following database      will be loaded:"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,hierarchy:0
+#: wizard_field:olap.query_builder,ok,hierarchy:0
+msgid "Hiearchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_sql:0
+msgid "SQL Expression"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_menu_olap_load_table
+msgid "Load Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,level_ids:0
+msgid "Levels"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_field
+msgid "Olap application field"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_columns_form
+msgid "Database Columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,active:0
+#: field:olap.database.tables,active:0
+msgid "Active"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Integer"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid " Auto Configure "
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Sum"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query.logs.clear,init,user_name:0
+#: field:olap.saved.query,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,count:0
+msgid "Count"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,name:0
+msgid "End-User Name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency with comma seperator (0,000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,datatype:0
+msgid "Datatype"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,back,ok:0
+#: wizard_button:olap.query_builder,init,ok:0
+msgid "Fetch Data"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency with comma seperator (EUR 0,000.00)"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_ids:0
+msgid "Queries"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "Oracle"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_cubes
+msgid "Olap Cubes"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_table_form
+msgid "Olap Cubes Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,name:0
+msgid "Measure name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+msgid "Socket"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_type:0
+msgid "Connection type"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "count"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_name:0
+msgid "Database name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,type:0
+msgid "Type"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Show"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,back:0
+#: wizard_button:olap.query_builder,ok,back:0
+msgid "Change cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_tables_form
+#: view:olap.cube.table:0
+#: field:olap.cube.table,line_ids:0
+msgid "Database Tables"
+msgstr ""
+
+#. module: olap
+#: help:olap.level,table_name:0
+msgid "The name of the table on which the column is defined. If False, take the table from the hierarchy."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Nothing has been Configured"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,name:0
+msgid "Dimension name"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.load.table,ok,end:0
+msgid "Continue and Configure Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_measure
+#: view:olap.measure:0
+msgid "Olap measure"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,table_id:0
+msgid "Table(s) for cube."
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,measure:0
+#: wizard_field:olap.query_builder,ok,measure:0
+msgid "Measure"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,column_db_name:0
+msgid "Column DBName"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "We Can Start building Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,table_id:0
+msgid "Database Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,name:0
+msgid "Schema name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_my_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_my_form
+#: view:olap.query.logs:0
+msgid "My Logs"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Information"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,back,cube_schema:0
+#: wizard_field:olap.query_builder,init,cube_schema:0
+msgid "Select Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,table_id:0
+msgid "Fact table(s)"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_designer
+msgid "name_menu_url_cube_designer"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_config_bi_parameters
+msgid "Parameters Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Connect to Database"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Database Connected"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,table_name:0
+#: field:olap.application.table,name:0
+msgid "Application table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.hierarchy,table_id:0
+msgid "Table(s) to make hierarchy on the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "General information"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,query:0
+msgid "Application Query"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,query_log:0
+msgid "Enabling  this will log all the queries in the browser"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,mdx_id:0
+msgid "Module"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,is_hidden:0
+#: field:olap.application.table,is_hidden:0
+#: field:olap.database.columns,hide:0
+#: field:olap.database.tables,hide:0
+msgid "Hidden"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,hierarchy_ids:0
+msgid "Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,result_size:0
+msgid "Result Size"
+msgstr ""
+
+#. module: olap
+#: view:olap.application:0
+msgid "Olap Application"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_tables
+msgid "Olap Database Tables"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency (EUR 0000.00)"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Olap cube_table"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "Parameters Configure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_hierarchy
+#: view:olap.hierarchy:0
+msgid "Olap hierarchy"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube_table
+#: model:ir.model,name:olap.model_olap_cube_table_line
+msgid "Olap cube table"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,field_name:0
+msgid "Field name"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_query_logs
+msgid "Olap query logs"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,name:0
+msgid "Fact name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,formatstring:0
+msgid " Let you specify how the measure to be displayed in cube browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_server_parameters
+msgid "Server Parameters"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+#: wizard_button:olap.load.table,init,ok:0
+#: view:olap.schema:0
+msgid "Load Database Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,name:0
+msgid "Level name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,schema_id:0
+#: field:olap.query.logs,schema_id:0
+#: field:olap.saved.query,schema_id:0
+msgid "Schema"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_url:0
+#: field:olap.schema,app_detect:0
+msgid "Connection URL"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,cube_ids:0
+msgid "Cubes"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "ReConfigure Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Average"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Database Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_hierarchy_form
+msgid "Olap Hierarchy"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,cube_table_id:0
+msgid "Cube Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi
+msgid "Businesss Intelligence"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_load_db_wizard
+msgid "bi.load.db.wizard"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_browser
+msgid "name_menu_url_cube_browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_fact_database_form
+msgid "Databases"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,name:0
+msgid "Hierarchy name"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,description:olap.module_meta_information
+msgid "\n"
+"    Base module to manage Olap schemas. Cube designer.\n"
+"    "
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,loaded:0
+msgid "Loading Datastructure"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Table"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "PostgreSQL"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,init:0
+msgid " To Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,sequence:0
+#: field:olap.level,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_tools
+msgid "Tools"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,state:0
+msgid "Schema State"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Float"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_form
+#: view:olap.query.logs:0
+msgid "All Logs"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+#: field:olap.parameters.config.wizard,host_port:0
+msgid "Port"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Fact database"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,shortdesc:olap.module_meta_information
+msgid "olap"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,table_db_name:0
+msgid "Table Name"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Auto Configure"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,configure:0
+msgid "Configuring Datastructure"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_configuration_table
+msgid "Open Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Automatically "
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_clear_logs
+#: model:ir.ui.menu,name:olap.menu_bi_clear_logs
+#: wizard_button:olap.query.logs.clear,init,ok:0
+msgid "Clear Logs"
+msgstr ""
+
diff --git a/addons/olap/olap.py b/addons/olap/olap.py
new file mode 100644
index 00000000000..349d204086f
--- /dev/null
+++ b/addons/olap/olap.py
@@ -0,0 +1,1718 @@
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import psycopg2
+import sqlalchemy
+import time
+from pyparsing import *
+
+import wizard
+import pooler
+from osv import osv
+from osv import fields,osv
+import netsvc
+import cube
+from cube import levels
+
+
+class olap_fact_database(osv.osv):
+    _name = "olap.fact.database"
+    _description = "Olap Fact Database"
+
+
+
+    def _connection_get(self,cr,uid,ids,field_name,arg,context = {}):
+        """
+            Return a connection string url needed by SQL Alchemy. Exemple:
+            'postgres://scott:tiger@localhost:5432/mydatabase'
+        """
+        res = {}
+        for obj in self.browse(cr,uid,ids,context):
+            res[obj.id] = '%s://%s:%s@%s:%d/%s' % (obj.type,obj.db_login,obj.db_password,obj.db_host,obj.db_port,obj.db_name)
+        return res
+
+    def test_connection(self,cr,uid,ids,context = {}):
+        try:
+            self_obj = self.browse(cr,uid,ids,context)
+            for obj in self_obj:
+                host = obj.db_host
+                port = obj.db_port
+                db_name = obj.db_name
+                user = obj.db_login
+                password = obj.db_password
+                type = obj.type
+                if type == 'postgres':
+                    tdb = psycopg2.connect('host=%s port=%s dbname=%s user=%s password=%s' % (host,port,db_name,user,password))
+                elif type == 'mysql':
+                    try:
+                        import MySQLdb
+                        tdb = MySQLdb.connect(host = host,port = port,db = db,user = user,passwd = passwd)
+
+                    except Exception,e:
+                        raise osv.except_osv('Error (MySQLdb) : ',e)
+                elif type == 'oracle':
+                    try:
+                        import cx_Oracle
+                        tdb = cx_Oracle.connect(user,password,host)
+
+                    except Exception,e:
+                        raise osv.except_osv('Error (cx_Oracle) : ',e)
+
+        except Exception,e:
+            raise osv.except_osv('BI Error !',e)
+
+        return True
+
+    _columns = {
+        'name': fields.char('Fact name',size = 64,required = True),
+        'db_name': fields.char('Database name',size = 64,required = True , help = "Name of the database to be used for analysis."),
+        'db_login': fields.char('Database login',size = 64,required = True, help = "Login for the database name specified."),
+        'db_password': fields.char('Database password',size = 64,invisible = True,required = True, help = "Password for the login."),
+        'db_host': fields.char('Database host',size = 64,required = True , help= "Give hostname to make connection to the database."),
+        'db_port': fields.integer('Database port',required = True, help = " Port to be used in connection"),
+        'type': fields.selection([('mysql','MySQL' ),('postgres','PostgreSQL' ),('oracle','Oracle' )],'Database type',required = True ),
+        'connection_type': fields.selection([('socket','Socket' ),('port','Port' )],'Connection type',required = True ),
+        'connection_url': fields.function(_connection_get,method = True,type = 'char',string = 'Connection URL',size = 128 ),
+        'table_ids': fields.one2many('olap.database.tables','fact_database_id','Tables' ),
+        'loaded': fields.boolean('Loaded',readonly = True ),
+    }
+    _defaults = {
+        'type': lambda * args: 'postgres',
+        'connection_type': lambda * args: 'port',
+        'db_host': lambda * args: 'localhost',
+        'db_name': lambda * args: 'terp',
+        'db_port': lambda * args: '5432',
+        'loaded' : lambda * args: False,
+    }
+olap_fact_database()
+
+class olap_schema(osv.osv ):
+    _name = "olap.schema"
+    _description = "Olap Schema"
+
+    def _app_detect(self,cr,uid,ids,field_name,arg,context = {}):
+        """
+            Return a Application type
+        """
+        res = {}
+
+        for obj in self.browse(cr,uid,ids,context):
+            if obj.database_id.type == 'postgres':
+                e = sqlalchemy.create_engine(obj.database_id.connection_url)
+                app_objs = self.pool.get('olap.application')
+                app_ids = app_objs.search(cr,uid,[] )
+                app_res = app_objs.browse(cr,uid,app_ids)
+                for app_obj in app_res:
+                    try:
+                        result = e.execute(app_obj.query)
+                        if result:
+                            res[obj.id] = app_obj.name + ' Application'
+                        continue
+                    except:
+                        continue
+                if not res.has_key(obj.id):
+                    res[obj.id] = "Unknown Application"
+            else:
+                res[obj.id] = "Unknown Application"
+        return res
+
+    _columns = {
+        'name': fields.char('Schema name',size = 64,required = True),
+        'note': fields.text('Schema description' ),
+        'cube_ids': fields.one2many('olap.cube','schema_id','Cubes'),
+        'database_id': fields.many2one('olap.fact.database','Database Connection',required = True),
+        'loaded': fields.boolean('Loading Datastructure',readonly = True),
+        'configure': fields.boolean('Configuring Datastructure',readonly = True),
+        'ready': fields.boolean('Ready',readonly = True),
+        'state': fields.selection([
+            ('none','Nothing has been Configured'),
+            ('dbconnect','Database Connected' ),
+            ('dbload','The Structure is Loaded'),
+            ('dbconfigure','The Structure is Configured.'),
+            ('dbready','Schema is ready to use'),
+            ('done','We Can Start building Cube'),
+            ],'Schema State',readonly = True),
+        'app_detect': fields.function(_app_detect,method = True,type = 'char',string = 'Connection URL',size = 128),
+
+    }
+    _defaults = {
+        'loaded' : lambda * args: False,
+        'state': lambda * a: 'none',
+        'configure': lambda * a: False,
+        'ready': lambda * a: False
+        }
+
+    def action_dbconnect(self,cr,uid,ids,context = {}):
+        schema = self.browse(cr,uid,ids,context)[0]
+        type = schema.database_id.type
+        maxconn = 64
+        try:
+            if type == 'postgres':
+                host = schema.database_id.db_host and "host=%s" % schema.database_id.db_host or ''
+                port = schema.database_id.db_port and "port=%s" % schema.database_id.db_port or ''
+                name = schema.database_id.db_name and "dbname=%s" % schema.database_id.db_name or ''
+                user = schema.database_id.db_login and "user=%s" % schema.database_id.db_login or ''
+                password = schema.database_id.db_password and "password=%s" % schema.database_id.db_password or ''
+                tdb = psycopg2.connect('%s %s %s %s %s' % (host,port,name,user,password))
+
+            elif type == 'mysql':
+                try:
+                    import MySQLdb
+                    host = schema.database_id.db_host or ''
+                    port = schema.database_id.db_port or ''
+                    db = schema.database_id.db_name or ''
+                    user = schema.database_id.db_login or ''
+                    passwd = schema.database_id.db_password or ''
+                    tdb = MySQLdb.connect(host = host,port = port,db = db,user = user,passwd = passwd)
+                except Exception,e:
+                    raise osv.except_osv('Error (MySQLdb) : ',e)
+
+            elif type == 'oracle':
+                try:
+                    import cx_Oracle
+                    host = schema.database_id.db_host or ''
+                    port = schema.database_id.db_port or ''
+                    db = schema.database_id.db_name or ''
+                    user = schema.database_id.db_name.upper() or ''
+                    password = int(schema.database_id.db_password) or ''
+                    tdb = cx_Oracle.connect(user,password,host)
+                except Exception,e:
+                    raise osv.except_osv('Error (cx_Oracle) : ',e)
+
+            for id in ids:
+                self.write(cr,uid,id,{'state':'dbconnect'})
+        except Exception,e:
+
+            raise osv.except_osv('BI Error !',e)
+
+        return True
+
+    def action_dbload(self,cr,uid,ids,context = {}):
+        for id in ids:
+            id_change = self.browse(cr,uid,id)
+            self.write(cr,uid,id,{'loaded':True})
+            self.write(cr,uid,id,{'state':'dbload'})
+        return True
+
+
+    def action_dbconfigure(self,cr,uid,ids,context = {}):
+        for id in ids:
+            id_browsed = self.browse(cr,uid,id)
+            if not id_browsed.state == 'dbconfigure':
+                self.write(cr,uid,id,{'state':'dbconfigure'})
+                self.write(cr,uid,id,{'configure':True})
+        return True
+
+    def action_dbready(self,cr,uid,ids,context = {}):
+        for id in ids:
+            self.write(cr,uid,id,{'ready':True})
+            self.write(cr,uid,id,{'state':'done'})
+        return True
+
+    def action_done(self,cr,uid,ids,context = {}):
+        for id in ids:
+            self.write(cr,uid,id,{'state':'done'})
+        return True
+
+    def create_xml_schema(self,cr,uid,xml_schema,context = {}):
+        """
+            This function fill in the database according to a XML schema.
+            Exemple of schema:
+            <Schema>
+            <Cube name="Sales">
+                <Table name="sales_fact_1997"/>
+                <Dimension name="Gender" foreignKey="customer_id">
+                    <Hierarchy hasAll="true" allMemberName="All Genders" primaryKey="customer_id">
+                        <Table name="customer"/>
+                        <Level name="Gender" column="gender" uniqueMembers="true"/>
+                    </Hierarchy>
+                </Dimension>
+                <Dimension name="Time" foreignKey="time_id">
+                    <Hierarchy hasAll="false" primaryKey="time_id">
+                        <Table name="time_by_day"/>
+                        <Level name="Year" column="the_year" type="Numeric" uniqueMembers="true"/>
+                        <Level name="Quarter" column="quarter" uniqueMembers="false"/>
+                        <Level name="Month" column="month_of_year" type="Numeric" uniqueMembers="false"/>
+                    </Hierarchy>
+                </Dimension>
+                <Measure name="Store Sales" column="store_sales" aggregator="sum" formatString="#,###.##"/>
+                <Measure name="Store Cost" column="store_cost" aggregator="sum" formatString="#,###.00"/>
+                <CalculatedMember name="Profit" dimension="Measures" formula="[Measures].
+                    [Store Sales]-[Measures].[Store Cost]">
+                    <CalculatedMemberProperty name="FORMAT_STRING" value="$#,##0.00"/>
+                </CalculatedMember>
+            </Cube>
+            </Schema
+        """
+        raise 'Not implemented !'
+
+    def request(self,cr,uid,name,request,context = {}):
+        ids = self.search(cr,uid,[('name','=',name)])
+        if not len(ids):
+            raise 'Schema not found !'
+        schema = self.browse(cr,uid,ids[0],context)
+#        warehouse = cube.warehouse()
+#        find_table = warehouse.match_table(cr, uid, request, context)
+        print 'Parsing MDX...'
+        print '\t',request
+        mdx_parser = cube.mdx_parser()
+        mdx = mdx_parser.parse(request)
+
+        print 'Validating MDX...'
+        mdx.preprocess()
+        validate,cubex = mdx.validate(schema)
+
+        print 'Running MDX...'
+        res_comp = self.pool.get('res.company').search(cr,uid,([]))
+        res_comp = self.pool.get('res.company').browse(cr,uid,res_comp)
+        currency = res_comp[0].currency_id.name
+        print " Default Currency",currency
+        data = mdx.run(currency)
+#        qry_obj = self.pool.get('olap.query.logs')
+#        qry_id = qry_obj.search(cr, uid, [('query','=', request)])
+#        
+#        flag = True
+#        if qry_id:
+#            qry = qry_obj.browse(cr, uid, qry_id)[0]
+#            
+#            if qry.count >=3 and qry.table_name!='':
+#                data = warehouse.run(currency, qry)
+#                flag = False
+#                qry.count = qry.count +1
+#                qry_obj.write(cr, uid, qry_id, {'count': qry.count})
+#            else:
+#                data = mdx.run(currency)
+#        else:
+#            data = mdx.run(currency)
+        print 'Running Done...'
+        print 'Formatting Output...'
+#        if cubex.query_log and flag:
+        if cubex.query_log:
+            log = context.get('log')
+            if log:
+                connection = schema.database_id.connection_url
+#                warehouse.log(cr,uid,cubex,request,data,connection,context)
+                mdx.log(cr,uid,cubex,request,context)
+        return cube.mdx_output(data)
+olap_schema()
+
+class olap_database_tables(osv.osv):
+    _name = "olap.database.tables"
+    _description = "Olap Database Tables"
+    _columns = {
+        'table_db_name': fields.char('Table Name',size = 64,required = True,readonly = True),
+        'name': fields.char('End-User Name',size = 64,required = True),
+        'columns': fields.one2many('olap.database.columns','table_id','Columns'),
+        'fact_database_id': fields.many2one('olap.fact.database','Database Id',required = True,ondelete = 'cascade',readonly = True),
+        'active': fields.boolean('Active'),
+        'hide': fields.boolean('Hidden'),
+    }
+    _defaults = {
+        'active': lambda * args: True,
+        'hide': lambda * args: False
+    }
+    def name_get(self,cr,uid,ids,context = {}):
+        result = []
+        for t in self.browse(cr,uid,ids,context):
+            if t.name <> t.table_db_name:
+                result.append((t.id,t.name + ' (' + t.table_db_name + ')'))
+            else:
+                result.append((t.id,t.name))
+        return result
+
+    def show_col_view(self,cr,uid,ids,context = {}):
+        ids_cols = self.pool.get('olap.database.columns').search(cr,uid,([('table_id','=',ids[0])]))
+        id = self.pool.get('ir.ui.view').search(cr,uid,([('name','=','olap.database.columns.tree')]),context = {})[0]
+        return {
+            'domain': "[('id','in', [" + ','.join(map(str,ids_cols)) + "])]",
+            'name': 'Database Columns',
+            'view_type': 'form',
+            'view_mode': 'tree',
+            'res_model': 'olap.database.columns',
+            'views': [(id,'tree'),(False,'form')],
+            'type': 'ir.actions.act_window',
+        }
+
+    def hide_col(self,cr,uid,ids,context = {}):
+        # To hide all the related columns also
+        for id in ids:
+             self.write(cr,uid,id,{'hide':True})
+        return {}
+
+    def show_col(self,cr,uid,ids,context = {}):
+        # To show or unhide all the columns also
+        for id in ids:
+             self.write(cr,uid,id,{'hide':False})
+        return {}
+
+
+olap_database_tables()
+
+class olap_database_columns(osv.osv):
+    _name = "olap.database.columns"
+    _description = "Olap Database Columns"
+    datatypes = {
+        'timestamp': 'TimeStamp without Time Zone',
+        'timestampz': 'TimeStamp with Time Zone',
+        'numeric': 'Numeric',
+        'int': 'Integer',
+        'float8': 'Double Precesion',
+        'varchar': 'Character Varying',
+        'bool': 'Boolean',
+        'bytea':'Byte A',
+        'int2':'Small Integer',
+        'int4':'Integer',
+        'int8':'Big Integer',
+        'text':'Text',
+        'date':'Date',
+        'time': 'TimeStamp without Time Zone',
+    'number':'NUMBER',
+    }
+    def _datatypes_get(self,*args,**argv):
+        return self.datatypes.items()
+    _columns = {
+        'column_db_name': fields.char('Column DBName',size = 64,required = True,readonly = True),
+        'name': fields.char('Column Name',size = 64,required = True),
+        'table_id': fields.many2one('olap.database.tables','Table Id',required = True,ondelete = 'cascade',select = True,readonly = True),
+        'primary_key': fields.boolean('Primary Key'),
+        'type': fields.selection(_datatypes_get,'Type',size = 64,required = True,readonly = True),
+        'related_to': fields.many2one('olap.database.tables','Related To',required = False,readonly = True),
+        'active': fields.boolean('Active'),
+        'hide': fields.boolean('Hidden'),
+    }
+    _defaults = {
+        'hide': lambda * args: False,
+        'active': lambda * args: True,
+        'primary_key': lambda * args: False,
+    }
+    def name_get(self,cr,uid,ids,context = {}):
+        result = []
+        for t in self.browse(cr,uid,ids,context):
+            if t.name <> t.column_db_name:
+                result.append((t.id,t.table_id.table_db_name + ' (' + t.name + ')'))
+            else:
+                result.append((t.id,t.table_id.table_db_name + ' (' + t.name + ')'))
+        return result
+
+
+    def search(self,cr,uid,args,offset = 0,limit = None,order = None,
+            context = None,count = False):
+        if not context:
+            return super(olap_database_columns,self).search(cr,uid,args,offset,limit,
+                    order,context = context,count = count)
+        col_pool = self.pool.get('olap.database.columns')
+        if context and context.has_key('fk') and context['fk']:
+            if context.has_key('dim_x') and context['dim_x']:
+                dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['dim_x']))
+                make_ids = []
+                make_ids.append(dim_obj.cube_id.table_id.column_link_id.table_id.id)
+
+                for lines in  dim_obj.cube_id.table_id.line_ids:
+                    make_ids.append(lines.field_id.related_to.id)
+                    make_ids.append(lines.field_id.table_id.id)
+                args = [('table_id','in',make_ids),('related_to','<>',False),('hide','<>',True),('active','<>',False)]
+                return super(olap_database_columns,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+
+        if args and context and context.has_key('flag') and context['flag']:
+            ids = args[0][2][0][2]
+
+            if ids:
+                col_obj = col_pool.browse(cr,uid,ids)
+                make_ids = []
+                for lines in col_obj:
+                    make_ids.append(lines.related_to.id)
+                link_id = col_pool.browse(cr,uid,int(context['link_col']))
+                make_ids.append(link_id.table_id.id)
+                args = ['|',('table_id','in',make_ids),('related_to','in',make_ids),('primary_key','<>',True),('hide','<>',True),('active','<>',False)]
+                ids = super(olap_database_columns,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+                return ids
+            elif context and context.has_key('master_dim') and context['master_dim']:
+                make_ids = []
+                col_obj = col_pool.browse(cr,uid,int(context['link_col']))
+                args = ['|',('table_id','=',col_obj.related_to.id),('related_to','=',col_obj.table_id.id),('hide','<>',True),('active','<>',False)]
+                return  super(olap_database_columns,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+            else:
+                col = col_pool.browse(cr,uid,int(context['link_col']))
+                base_table = col.table_id
+                args = ['|',('table_id','=',base_table.id),('related_to','=',base_table.id),('hide','<>',True),('active','<>',False)]
+                return super(olap_database_columns,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+
+
+        if context and context.has_key('filter_cols_cube'):
+            cube_obj = self.pool.get('olap.cube').browse(cr,uid,int(context['filter_cols_cube']))
+            make_ids = []
+            make_ids.append(cube_obj.table_id.column_link_id.related_to.id)
+            for lines in cube_obj.table_id.line_ids:
+                make_ids.append(lines.table_id.id)
+            if make_ids:
+                make_ids.append(cube_obj.table_id.line_ids[len(cube_obj.table_id.line_ids) - 1].field_id.related_to.id)
+                args = [('table_id','in',make_ids),('related_to','=',False),('primary_key','<>',True),('type','not in',['date','timestamp','timestampz','time']),('hide','<>',True),('active','<>',False)]
+                ids = super(olap_database_columns,self).search(cr,uid,args,offset,limit,
+                    order,context = context,count = count)
+                return ids
+
+        elif context and context.has_key('filter_cols_hier'):
+            hier_obj = self.pool.get('olap.hierarchy').browse(cr,uid,int(context['filter_cols_hier']))
+            make_ids = []
+            if hier_obj.table_id.line_ids:
+                for lines in hier_obj.table_id.line_ids:
+                    make_ids.append(lines.field_id.related_to.id)
+
+                if make_ids:
+                    make_ids.append(hier_obj.table_id.column_link_id.related_to.id)
+                    make_ids.append(hier_obj.table_id.column_link_id.table_id.id)
+                    args = [('table_id','in',make_ids),('hide','<>',True),('active','<>',False)]
+                    ids = super(olap_database_columns,self).search(cr,uid,args,offset,limit,
+                        order,context = context,count = count)
+                    return ids
+            else:
+                args = [('table_id','=',hier_obj.table_id.column_link_id.related_to.id)]
+                ids = super(olap_database_columns,self).search(cr,uid,args,offset,limit,
+                        order,context = context,count = count)
+                return ids
+        elif context and context.has_key('fk') and context['fk']:
+            args = [('primary_key','=',True),('hide','<>',True),('active','<>',False)]
+
+        else:
+            if context and context.has_key('master_dim') and context['master_dim']:
+                dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['master_dim']))
+                lines = dim_obj.cube_id.table_id.line_ids
+                table_ids = []
+                for line in lines:
+                    table_ids.append(line.table_id.id)
+                args = [('table_id','in',table_ids),('related_to','<>',False),('hide','<>',True),('active','<>',False)]
+            elif context and context.has_key('master_schema') and context['master_schema']:
+                    args = [('primary_key','=','True')]
+        return super(olap_database_columns,self).search(cr,uid,args,offset,limit,
+                    order,context = context,count = count)
+
+
+    def hide_col(self,cr,uid,ids,context = {}):
+        for id in ids:
+             self.write(cr,uid,id,{'hide':True})
+        return {}
+
+    def show_col(self,cr,uid,ids,context = {}):
+        for id in ids:
+             self.write(cr,uid,id,{'hide':True})
+        return {}
+
+    def field_add(self,cr,uid,ids,context = {}):
+        col_data = self.pool.get('olap.database.columns').read(cr,uid,ids,[],context)[0]
+        ctx_list = []
+        if col_data['related_to']:
+            table_id = col_data['related_to'][0]
+        else:
+            table_id = col_data['table_id'][0]
+        if context['parent_id']:
+            parent_id = context['parent_id']
+            val = {
+            'cube_table_id':parent_id,
+            'table_id':table_id,
+            'field_id':ids[0]
+            }
+            id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context)
+        else:
+            parent_id = self.pool.get('olap.cube.table').create(cr,uid,{'name':col_data['table_id'][1]},context)
+            ctx_list = [('client','web'),('app','bi'),('id',parent_id)]
+        return ctx_list
+
+    def make_hierarchy(self,cr,uid,ids,context = {}):
+        col_data = self.pool.get('olap.database.columns').read(cr,uid,ids,[],context)[0]
+        ctx_list = []
+        if context and context.has_key('hier_parent_id')and context['hier_parent_id']:
+            hier_obj = self.pool.get('olap.hierarchy').browse(cr,uid,context['hier_parent_id'])
+            pk_table = hier_obj.table_id.name
+        elif context and context.has_key('hier_parent_table'):
+            cube_table_obj = self.pool.get('olap.cube.table').browse(cr,uid,context['hier_parent_table'])
+            pk_table = cube_table_obj.name
+        val = {
+             'field_name':col_data['name'],
+             'name':col_data['name'],
+             'primary_key_table':pk_table
+        }
+        if context['hier_parent_id']:
+            id = self.pool.get('olap.hierarchy').write(cr,uid,context['hier_parent_id'],val,context)
+        else:
+            if context['parent_name']: val['name'] = context['parent_name']
+            if context['parent_dimension'] :val['dimension_id'] = context['parent_dimension']
+            if context['hier_parent_table'] : val['table_id'] = context['hier_parent_table']
+            if context['parent_field_name'] : val['field_name'] = context['parent_field_name']
+            if context['parent_level'] : val['level_ids'] = conext['parent_level']
+            if context['parent_member_all']: val['member_all'] = context['parent_member_all']
+            if context['parent_member_default'] : val['member_default'] = context['parent_member_default']
+            if context['parent_type']: val['type'] = context['parent_type']
+            val['primary_key_table'] = col_data['table_id'][1]
+            id = self.pool.get('olap.hierarchy').create(cr,uid,val,context)
+            ctx_list = [('client','web'),('app','bi'),('id',id)]
+        return ctx_list
+
+olap_database_columns()
+
+class olap_cube_table(osv.osv):
+    _name = "olap.cube.table"
+    _description = "Olap cube table"
+
+    def write(self,cr,uid,ids,vals,context = None):
+        if vals and vals.get('available_table_ids',0) and context and (context.has_key('master_dim') or context.has_key('d_id') or context.has_key('parent_schema_id')):
+            new_fields = vals['available_table_ids'][0][2]
+            final = []
+            for data in self.browse(cr,uid,ids):
+                orignal_lines = []
+                for line in data.line_ids:
+                    orignal_lines.append(line.id)
+
+                orignal_fields = []
+                for line in data.line_ids:
+                    orignal_fields.append(line.field_id.id)
+                if len(orignal_fields) < len(new_fields):
+                    if new_fields[:len(orignal_fields)] == orignal_fields:
+                        new_fields = new_fields[len(orignal_fields):]
+                        cols_obj = self.pool.get('olap.database.columns').browse(cr,uid,new_fields)
+                        val = {}
+                        val['cube_table_id'] = ids[0]
+                        for col in cols_obj:
+                            val['table_id'] = col.table_id.id
+                            val['field_id'] = col.id
+                        id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context = context)
+                    else:
+                        cols_obj = self.pool.get('olap.database.columns').unlink(cr,uid,orignal_lines)
+                        cols_obj = self.pool.get('olap.database.columns').browse(cr,uid,new_fields)
+                        val = {}
+                        val['cube_table_id'] = ids[0]
+                        for col in cols_obj:
+                            val['table_id'] = col.table_id.id
+                            val['field_id'] = col.id
+                        id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context = context)
+
+                elif len(orignal_fields) > len(new_fields):
+                    if orignal_fields[:len(new_fields)] == new_fields:
+                        remove_id = orignal_lines[len(new_fields):]
+                        id = self.pool.get('olap.cube.table.line').unlink(cr,uid,remove_id,context = context)
+                    else:
+                        val = {}
+                        id = self.pool.get('olap.cube.table.line').unlink(cr,uid,orignal_lines ,context = context)
+                        cols_obj = self.pool.get('olap.database.columns').browse(cr,uid,new_fields)
+                        val = {}
+                        val['cube_table_id'] = ids[0]
+                        for col in cols_obj:
+                            val['table_id'] = col.table_id.id
+                            val['field_id'] = col.id
+                        id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context = context)
+            return  super(olap_cube_table,self).write(cr,uid,ids,vals,context)
+
+    def create(self,cr,uid,vals,context = None):
+        cube_table_id = super(olap_cube_table,self).create(cr,uid,vals,context)
+        if vals and vals.get('available_table_ids',0) and context and (context.has_key('d_id') or context.has_key('parent_schema_id') or context.has_key('master_dim') or context.has_key('d_id')):
+            lines_ids = vals['available_table_ids'][0][2]
+            cols_obj = self.pool.get('olap.database.columns').browse(cr,uid,lines_ids)
+            val = {}
+            val['cube_table_id'] = cube_table_id
+            for col in cols_obj:
+                val['table_id'] = col.table_id.id
+                val['field_id'] = col.id
+                id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context = context)
+        return cube_table_id
+
+    def search(self,cr,uid,args,offset = 0,limit = None,order = None,
+            context = None,count = False):
+        if context and context.has_key('parent_schema_id'):
+            args = [('schema_id','=',context['parent_schema_id'])]
+        if context and context.has_key('d_id'):
+            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['d_id']))
+            args = [('schema_id','=',dim_obj.cube_id.schema_id.id)]
+        return super(olap_cube_table,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+
+    def _available_table_get(self,cr,uid,ids,name,arg,context = None):
+        result = {}
+        parent_table_id = []
+        parent_table_ids = []
+        field_obj = self.pool.get('olap.database.columns')
+        for table in self.browse(cr,uid,ids,context):
+            if table.line_ids:
+                ids = []
+                ids = map(lambda x: x.field_id.id,table.line_ids)
+                result[table.id] = ids
+            else:
+                result[table.id] = []
+        return result
+
+    def _set_schema(self,cr,uid,context = {}):
+        if context and context.has_key('d_id'):
+            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['d_id']))
+            return dim_obj.cube_id.schema_id.id
+        if context and context.has_key('parent_schema_id'):
+            return context['parent_schema_id']
+
+    def _set_name(self,cr,uid,context = {}):
+        if context and context.has_key('d_id'):
+            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['d_id']))
+            return dim_obj.cubeAid.table_id.name
+
+    def _get_id(self,cr,uid,ids,context = {}):
+        if context and context.has_key('d_id'):
+            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['d_id']))
+            table_id = self.pool.get('olap.database.tables').search(cr,uid,[('table_db_name','in',[dim_obj.cube_id.table_id.name]),('fact_database_id','=',dim_obj.cube_id.schema_id.database_id.id)])
+            col_ids = self.pool.get('olap.database.columns').search(cr,uid,[('table_id','in',table_id),('hide','<>',True),('related_to','<>',False)])
+        else:
+            col_ids = self.pool.get('olap.database.columns').search(cr,uid,[('primary_key','=',True),('hide','<>',True)])
+        return col_ids
+
+    def _def_set(self,cr,uid,context = {}):
+        return []
+
+    _columns = {
+        'name': fields.char('Table name',size = 64,required = True),
+        'line_ids': fields.one2many('olap.cube.table.line','cube_table_id','Database Tables',required = True),
+        'schema_id':fields.many2one('olap.schema','Schema id',ondelete = 'cascade'),
+        'column_link_id':fields.many2one('olap.database.columns','Relational Column' ,required = True),
+        'available_table_ids': fields.function(
+            _available_table_get,
+            method = True,
+            relation = 'olap.database.columns',
+            string = 'Available Tables',
+            type = "many2many"
+       ),
+    }
+    _defaults = {
+        'schema_id':_set_schema,
+    }
+    def field_add(self,cr,uid,ids,context = {}):
+        return {}
+olap_cube_table()
+
+class olap_cube_table_line(osv.osv):
+    _name = "olap.cube.table.line"
+    _description = "Olap cube table"
+    _rec_name = 'table_id'
+    _columns = {
+        'cube_table_id': fields.many2one('olap.cube.table','Cube Table',required = True,ondelete = 'cascade'),
+        'table_id': fields.many2one('olap.database.tables','Database Table',required = True,ondelete = 'cascade'),
+        'field_id': fields.many2one('olap.database.columns','Link Field'),
+    }
+    # Set the Table when changing field_id
+    def onchange_field_id(self,*args,**argv):
+        pass
+olap_cube_table_line()
+
+class olap_cube(osv.osv):
+    _name = "olap.cube"
+    _description = "Olap cube"
+
+    def _set_schema(self,cr,uid,context = {}):
+        if context and context.has_key('schema_id'):
+            return context['schema_id']
+        return False
+
+    _columns = {
+        'name': fields.char('Cube name',size = 64,required = True),
+        'table_id': fields.many2one('olap.cube.table','Fact table',size = 64,required = True, help="Table(s) for cube."),
+        'schema_id': fields.many2one('olap.schema','Schema',readonly = True),
+        'dimension_ids': fields.one2many('olap.dimension','cube_id','Dimensions'),
+        'measure_ids': fields.one2many('olap.measure','cube_id','Measures'),
+        'query_log': fields.boolean('Query Logging', help = "Enabling  this will log all the queries in the browser"),
+        'query_ids': fields.one2many('olap.query.logs','cube_id','Queries'),
+    }
+    _defaults = {
+                 'schema_id':_set_schema
+                 }
+olap_cube()
+
+class olap_query_logs(osv.osv):
+    _name = "olap.query.logs"
+    _description = "Olap query logs"
+    _columns = {
+        'user_id' : fields.many2one('res.users','Tiny ERP User'),
+        'query':fields.text('Query',required = True),
+        'time':fields.datetime('Time',required = True),
+        'result_size':fields.integer('Result Size',readonly = True),
+        'cube_id': fields.many2one('olap.cube','Cube',required = True),
+        'count': fields.integer('Count', readonly=True),
+        'schema_id': fields.many2one('olap.schema','Schema',readonly = True),
+#        'table_name': fields.char('Table Name', size=164, readonly = True),
+    }
+    
+    _defaults = {
+                 'count':lambda * args: 0
+                 }
+olap_query_logs()
+
+
+class olap_dimension(osv.osv):
+    _name = "olap.dimension"
+    _description = "Olap dimension"
+
+    def _set_cube(self,cr,uid,context = {}):
+        if context and context.has_key('cube_id'):
+            return context['cube_id']
+        return False
+
+    _columns = {
+        'name': fields.char('Dimension name',size = 64,required = True),
+        'cube_id': fields.many2one('olap.cube','Cube',required = True),
+        'hierarchy_ids': fields.one2many('olap.hierarchy','dimension_id','Hierarchies'),
+    }
+    _defaults = {
+                 'cube_id':_set_cube,
+    }
+
+olap_dimension()
+
+class olap_hierarchy(osv.osv):
+    _name = "olap.hierarchy"
+    _description = "Olap hierarchy"
+    _order = "sequence, id"
+    hierarchy_type = {
+        'date': 'Date',
+        'date_year': 'Year of Date',
+        'date_quarter': 'Quarter of Date',
+        'date_month': 'Month of Date',
+        'many2one': 'Many2one'
+    }
+
+    def _set_dimension(self,cr,uid,context = {}):
+        if context and context.has_key('dimension_id'):
+            return context['dimension_id']
+        return False
+
+    def _set_name(self,cr,uid,context = {}):
+        if context and context.has_key('dimension_id'):
+            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['dimension_id']))
+            return dim_obj.name
+        return False
+
+    def _hierarchy_get(self,*args,**argv):
+        return self.hierarchy_type.items()
+
+    _columns = {
+        'name': fields.char('Hierarchy name',size = 64,required = True),
+        'primary_key': fields.char('Primary key',size = 64),
+        'primary_key_table': fields.char('Primary key table',size = 64),
+        'sequence': fields.integer('Sequence',required = True),
+        'dimension_id': fields.many2one('olap.dimension','Dimension',required = True),
+        'level_ids': fields.one2many('olap.level','hierarchy_id','Levels'),
+        'table_id': fields.many2one('olap.cube.table','Fact table(s)',required = True , help ="Table(s) to make hierarchy on the cube."),
+    }
+    _defaults = {
+        'sequence': lambda * args: 1,
+        'primary_key': lambda * args: 'id',
+        'dimension_id':_set_dimension,
+        'name':_set_name
+    }
+
+olap_hierarchy()
+
+class olap_level(osv.osv):
+    _name = "olap.level"
+    _description = "Olap level"
+    _order = "sequence, id"
+    _types = {
+        'normal': levels.level_normal(),
+        'date_year': levels.level_date_year(),
+        'date_quarter': levels.level_date_quarter(),
+        'date_month': levels.level_date_month()
+    }
+
+    def _set_hierarchy(self,cr,uid,context = {}):
+        if context and context.has_key('hierarchy_id'):
+            return context['hierarchy_id']
+        return False
+
+    def _set_name(self,cr,uid,context = {}):
+        if context and context.has_key('hierarchy_id'):
+            hier_obj = self.pool.get('olap.hierarchy').browse(cr,uid,int(context['hierarchy_id']))
+            return hier_obj.name
+
+    def onchange_column_name(self,cr,uid,ids,column,context = {}):
+        if not column:
+            return {}
+        val = {}
+        col = self.pool.get('olap.database.columns').browse(cr,uid,column)
+        val['table_name'] = col.table_id.table_db_name
+        val['column_id_name'] = col.column_db_name
+        if (col.type == 'date'):
+            val['type'] = 'date_year'
+        return {'value':val}
+
+    def _type_get(self,cr,uid,*args,**argv):
+        keys = self._types.keys()
+        return map(lambda x: (x,x),keys)
+
+
+    _columns = {
+        'name': fields.char('Level name',size = 64,required = True),
+        'column_name':fields.many2one('olap.database.columns','Columns Name',required = True),
+        'column_id_name': fields.char('Column ID',size = 64,required = True),
+        'type': fields.selection(selection = _type_get,string = 'Level class',size = 64,required = True),
+        'table_name': fields.char('Table name',size = 64,required = True,help = "The name of the table on which the column is defined. If False, take the table from the hierarchy."),
+        'sequence': fields.integer('Sequence',required = True),
+        'hierarchy_id': fields.many2one('olap.hierarchy','Hierarchy',required = True),
+    }
+
+    _defaults = {
+        'column_id_name': lambda * args: 'name',
+        'sequence':lambda * args: '1',
+        'type':lambda * args:'normal',
+        'hierarchy_id':_set_hierarchy,
+        'name':_set_name
+    }
+
+olap_level()
+
+
+class olap_measure(osv.osv):
+    _name = "olap.measure"
+    _description = "Olap measure"
+
+    def _set_cube(self,cr,uid,context = {}):
+        if context and context.has_key('cube_id'):
+            return context['cube_id']
+        return False
+
+    def onchange_measure_name(self,cr,uid,ids,column,context = {}):
+        val = {}
+        if not column:
+            return {}
+        col = self.pool.get('olap.database.columns').browse(cr,uid,column)
+        val['table_name'] = col.table_id.table_db_name
+        val['value_column_id_name'] = col.column_db_name
+        val['name'] = col.column_db_name
+        return {'value':val}
+
+    _columns = {
+        'name': fields.char('Measure name',size = 64,required = True),
+        'cube_id': fields.many2one('olap.cube','Cube',required = True),
+        'value_column': fields.many2one('olap.database.columns','Fact Table Column'),
+        'value_column_id_name': fields.char('Column ID',size = 64),
+        'table_name': fields.char('Table name',size = 64,help = "The name of the table on which the column is defined. If False, take the table from the cube."),
+        'measure_type':fields.selection([('fact_column','Fact Table Column'),('sql_expr','SQL Expression')],'Measure Type',required = True,help = "Select between auto column or sql expression for the measures"),
+        'value_sql': fields.char('SQL Expression',size = 200,help = "You can provide valid sql expression. Make sure it have function with fully qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) tablename.columnname)"),
+        'agregator': fields.selection([('sum','Sum'),('count','count'),('avg','Average')],'Agregator',required = True),
+        'datatype': fields.selection([('int','Integer'),('float','Float')],'Datatype',required = True),
+        'formatstring': fields.selection([
+                                           ('none','None (0000.00)'),
+                                           ('cr_prefix','Prefix Default Currency (EUR 0000.00)'),
+                                           ('cr_postfix','Postfix Default Currency(0000.00 EUR)'),
+                                           ('cr_prefix_comma','Prefix Default Currency with comma seperator (EUR 0,000.00)'),
+                                           ('cr_postfix_comma','Postfix Default Currency with comma seperator (0,000.00 EUR)'),
+                                           ('comma_sep', 'Comma Seperator (0,000)')
+                                           ],
+                                           'Format string',required = True, help=" Let you specify how the measure to be displayed in cube browser"),
+    }
+    _defaults = {
+        'agregator': lambda * args: 'sum',
+        'datatype': lambda * args: 'float',
+        'formatstring': lambda * args: 'none',
+        'cube_id':_set_cube,
+        'measure_type':lambda * args:'fact_column',
+    }
+olap_measure()
+
+class olap_application(osv.osv):
+    _name = "olap.application"
+    _description = "Olap application"
+    _columns = {
+        'name': fields.char('Application name',size = 64,required = True),
+        'query':fields.text('Application Query'),
+        'table_ids':fields.one2many('olap.application.table','application_id','Tables'),
+        'field_ids': fields.one2many('olap.application.field','application_id','Fields'),
+    }
+olap_application()
+
+
+class olap_application_table(osv.osv):
+    _name = "olap.application.table"
+    _description = "Olap application table"
+    _columns = {
+        'name': fields.char('Application table name',size = 64,required = True),
+        'table_name': fields.char('Table name',size = 64,required = True),
+        'is_hidden': fields.boolean('Hidden'),
+        'application_id':  fields.many2one('olap.application','Application Id',required = True),
+    }
+olap_application_table()
+
+class olap_application_field(osv.osv):
+    _name = "olap.application.field"
+    _description = "Olap application field"
+    _columns = {
+        'name': fields.char('Application field name',size = 64,required = True),
+        'table_name':  fields.char('Application table name',size = 64),
+        'field_name':fields.char('Field name',size = 64),
+        'is_hidden': fields.boolean('Hidden'),
+        'application_id':  fields.many2one('olap.application','Application Id',required = True),
+    }
+olap_application_field()
+
+class olap_saved_query(osv.osv):
+    _name = "olap.saved.query"
+    _decription = "Olap Saved Query"
+#   _rec_name = 'user_id'
+    _columns = {
+                'name': fields.text('Query Name',size = 64),
+                'user_id' : fields.many2one('res.users','User'),
+                'query': fields.text('Query',required = True),
+                'cube_id': fields.many2one('olap.cube','Cube',required = True),
+                'mdx_id': fields.char('Module', size=64),
+                'schema_id': fields.many2one('olap.schema','Schema',required = True),
+                'time':fields.datetime('Time',required = True),
+                'axis_keys': fields.text('Axis Keys'),
+                }
+olap_saved_query()
+# Wizard for the Load Data Structure
+# Replacement for the Load Wizard according to the new structure
+class bi_load_db_wizard(osv.osv_memory):
+    _name = 'bi.load.db.wizard'
+
+    def _get_fact_table(self,cr,uid,ctx):
+        if ctx and ctx.has_key('active_id'):
+            schema_obj = self.pool.get('olap.schema').browse(cr,uid,ctx['active_id'])
+            return schema_obj.name
+        return False
+
+    def _get_db_name(self,cr,uid,ctx):
+        if ctx and ctx.has_key('active_id'):
+            schema_obj = self.pool.get('olap.schema').browse(cr,uid,ctx['active_id'])
+            return schema_obj.database_id.name
+        return False
+
+    _columns = {
+        'fact_table':fields.char('Fact Name' ,size = 64,readonly = True),
+        'db_name':fields.char('Database Name',size = 64,readonly = True)
+    }
+
+    _defaults = {
+        'fact_table':_get_fact_table,
+        'db_name':_get_db_name,
+    }
+
+    def action_load(self,cr,uid,ids,context = None):
+        if context and context.has_key('active_id'):
+            lines = self.pool.get('olap.schema').browse(cr,uid,context['active_id'])
+            pool = pooler.get_pool(cr.dbname)
+#            lines=pool.get('olap.schema').browse(cr, uid, part['id'],context)
+            id_db = lines.database_id.id
+            type = lines.database_id.type
+            db_name = lines.database_id.db_name
+            tobj = pool.get('olap.database.tables')
+            tcol = pool.get('olap.database.columns')
+            if type == 'postgres':
+#                host = lines.database_id.db_host and "host=%s" % lines.database_id.db_host or ''
+#                port = lines.database_id.db_port and "port=%s" % lines.database_id.db_port or ''
+#                name = lines.database_id.db_name and "dbname=%s" % lines.database_id.db_name or ''
+#                user = lines.database_id.db_login and "user=%s" % lines.database_id.db_login or ''
+#                password = lines.database_id.db_password and "password=%s" % lines.database_id.db_password or ''
+#                tdb = psycopg2.connect('%s %s %s %s %s' % (host, port, name, user, password))
+#                cr_db = tdb.cursor()
+#                cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d', (id_db,))
+#                tables = dict(cr.fetchall())
+#                # Format for storing the tables
+#                # tables['table_db_name']=id
+#                tables_id = map(lambda x: str(tables[x]),tables)
+#                cols={}
+#                if tables_id:
+#                    cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) +')')
+#                else:
+#                    cr.execute('select column_db_name,id,table_id from olap_database_columns')
+#              
+#                for data in cr.fetchall():
+#                    cols[str(data[1])]=(data[0],int(data[2]))
+#                # Format of storing the cols 
+#                # cols['id']=(col_db_name,table_id)    
+#                print 'Creating / Updating Tables...' 
+#                cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables as a where a.table_schema = 'public'")
+#                for table in cr_db.fetchall():
+#                    val = {
+#                        'fact_database_id':id_db,
+#                        'table_db_name':table[0]
+#                    }
+#                   
+#                    if table[0] in tables.keys():
+#                        table_id=tobj.write(cr,uid,[tables[table[0]]], val, context)
+#                    else:
+#                        val['name']=table[0]
+#                        tables[val['name']] = tobj.create(cr,uid,val, context)    
+#                print 'Creating / Updating Columns...' 
+#                cr_db.execute("""SELECT
+#                        table_name, column_name, udt_name
+#                    from
+#                        INFORMATION_SCHEMA.columns
+#                    WHERE table_schema = 'public'""")
+#                
+#                for col in cr_db.fetchall():
+#                    val={
+#                        'table_id': tables[col[0]],
+#                        'column_db_name': col[1],
+#                        'type': col[2],
+#                    }
+#                    
+#                    id_made=filter(lambda x:(int(cols[x][1])==int(tables[col[0]])),cols)
+#                    if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
+#                        col_id=tcol.write(cr,uid,cols[tables[str(col[0])]], val, context)
+#                    else:
+#                        val['name']=col[1]
+#                        id_made = tcol.create(cr,uid,val, context)
+#                        cols[str(id_made)] = (val['name'],int(val['table_id']))
+#                print 'Creating / Updating Constraints...' 
+#                cr_db.execute("""select 
+#                        table_name,column_name 
+#                    from 
+#                        INFORMATION_schema.key_column_usage
+#                    where 
+#                        constraint_name in (
+#                                    select constraint_name from INFORMATION_SCHEMA .table_constraints
+#                                    where 
+#                                        constraint_type = 'PRIMARY KEY')""")
+#                print "Updating the Primary Key Constraint" 
+#                for constraint in cr_db.fetchall():
+#                    val={
+#                        'primary_key':True
+#                    }
+#                    
+#                    id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and(constraint[1]==cols[x][0])),cols)
+#                    col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context) 
+#                print "Updating the Foreign key constraint" 
+#                cr_db.execute("""select 
+#                            constraint_name,table_name 
+#                    from 
+#                        INFORMATION_schema.constraint_column_usage 
+#                    where
+#                        constraint_name in (
+#                                    select constraint_name from INFORMATION_SCHEMA.table_constraints 
+#                                    where 
+#                                        constraint_type = 'FOREIGN KEY')""")
+#                for_key=dict(cr_db.fetchall())
+#                
+#                cr_db.execute("""select 
+#                             table_name,column_name,constraint_name 
+#                         from 
+#                             INFORMATION_schema.key_column_usage
+#                         where 
+#                             constraint_name in (
+#                                         select constraint_name from INFORMATION_SCHEMA.table_constraints 
+#                                         where 
+#                                             constraint_type = 'FOREIGN KEY')""") 
+
+#                for constraint in cr_db.fetchall():
+#                    val={
+#                        'related_to':tables[for_key[constraint[2]]]
+#                    }
+#                    id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and (constraint[1]==cols[x][0])),cols)
+#                    col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context) 
+
+                host = lines.database_id.db_host and "host=%s" % lines.database_id.db_host or ''
+                port = lines.database_id.db_port and "port=%s" % lines.database_id.db_port or ''
+                name = lines.database_id.db_name and "dbname=%s" % lines.database_id.db_name or ''
+                user = lines.database_id.db_login and "user=%s" % lines.database_id.db_login or ''
+                password = lines.database_id.db_password and "password=%s" % lines.database_id.db_password or ''
+                tdb = psycopg2.connect('%s %s %s %s %s' % (host,port,name,user,password))
+                cr_db = tdb.cursor()
+                cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d',(id_db,))
+                tables = dict(cr.fetchall())
+                # Format for storing the tables
+                # tables['table_db_name']=id
+                tables_id = map(lambda x: str(tables[x]),tables)
+                # Format of storing the cols 
+                # cols['id']=(col_db_name,table_id)    
+                print 'Creating / Updating Tables...'
+                cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables as a where a.table_schema = 'public'")
+                for table in cr_db.fetchall():
+                    val = {
+                        'fact_database_id':id_db,
+                        'table_db_name':table[0]
+                    }
+                    if table[0] in tables.keys():
+                        table_id = tobj.write(cr,uid,[tables[table[0]]],val,context)
+                    else:
+                        val['name'] = table[0]
+                        tables[val['name']] = tobj.create(cr,uid,val,context)
+
+                print 'Creating / Updating Columns ....'
+                cols = {}
+                if tables_id:
+                    cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) + ')')
+                else:
+#                    cr.execute('select column_db_name,id,table_id from olap_database_columns ')
+                    cr.execute("select olap_database_columns.column_db_name, olap_database_columns.id, olap_database_columns.table_id from olap_database_columns join olap_database_tables on olap_database_columns.table_id = olap_database_tables.id where olap_database_tables.fact_database_id=%d",(id_db,))
+                table_col = {}
+                cols_name = {}
+                for x in tables:
+                    table_col[str(tables[x])] = [{}]
+                for data in cr.fetchall():
+                    cols[str(data[1])] = (data[0],int(data[2]))
+                    table_col[str(data[2])][0][data[0]] = data[1]
+                    cols_name[str(data[0])] = (data[1],int(data[2]))
+                cr_db.execute("""SELECT
+                        table_name, column_name, udt_name
+                    from
+                        INFORMATION_SCHEMA.columns
+                    WHERE table_schema = 'public'""")
+                for col in cr_db.fetchall():
+                    val = {
+                        'table_id': tables[col[0]],
+                        'column_db_name': col[1],
+                        'type': col[2],
+                    }
+                    id_made = filter(lambda x:(int(cols[x][1]) == int(tables[col[0]])),cols)
+                    if col[0] in tables.keys() and col[1] in cols_name.keys() and id_made:
+                        if table_col[str(tables[col[0]])][0] and col[1] in table_col[str(tables[col[0]])][0].keys():
+                            col_id = tcol.write(cr,uid,table_col[str(tables[col[0]])][0][col[1]],val,context)
+                        else:
+                            val['name'] = col[1]
+                            id_made = tcol.create(cr,uid,val,context)
+                            cols[str(id_made)] = (val['name'],int(val['table_id']))
+                    else:
+                        val['name'] = col[1]
+                        id_made = tcol.create(cr,uid,val,context)
+                        cols[str(id_made)] = (val['name'],int(val['table_id']))
+
+                print 'Creating / Updating Constraints...'
+                cr_db.execute("""select 
+                        table_name,column_name 
+                    from 
+                        INFORMATION_schema.key_column_usage
+                    where 
+                        constraint_name in (
+                                    select constraint_name from INFORMATION_SCHEMA .table_constraints
+                                    where 
+                                        constraint_type = 'PRIMARY KEY')""")
+
+                print "Updating the Primary Key Constraint"
+                for constraint in cr_db.fetchall():
+                    val = {
+                        'primary_key':True
+                    }
+
+                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])and(constraint[1] == cols[x][0])),cols)
+                    col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+
+                print "Updating the Foreign key constraint"
+                cr_db.execute("""select 
+                            constraint_name,table_name 
+                    from 
+                        INFORMATION_schema.constraint_column_usage 
+                    where
+                        constraint_name in (
+                                    select constraint_name from INFORMATION_SCHEMA.table_constraints 
+                                    where 
+                                        constraint_type = 'FOREIGN KEY')""")
+                for_key = dict(cr_db.fetchall())
+
+                cr_db.execute("""select 
+                             table_name,column_name,constraint_name 
+                         from 
+                             INFORMATION_schema.key_column_usage
+                         where 
+                             constraint_name in (
+                                         select constraint_name from INFORMATION_SCHEMA.table_constraints 
+                                         where 
+                                             constraint_type = 'FOREIGN KEY')""")
+
+                for constraint in cr_db.fetchall():
+                    val = {
+                        'related_to':tables[for_key[constraint[2]]]
+                    }
+                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])and (constraint[1] == cols[x][0])),cols)
+                    if id_to_write:
+                        col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+
+
+            elif type == 'mysql':
+                try:
+                    import MySQLdb
+                    host = lines.database_id.db_host or ''
+                    port = lines.database_id.db_port or ''
+                    db = lines.database_id.db_name or ''
+                    user = lines.database_id.db_login or ''
+                    passwd = lines.database_id.db_password or ''
+                    tdb = MySQLdb.connect(host = host,port = port,db = db,user = user,passwd = passwd)
+
+                except Exception,e:
+                    raise osv.except_osv('MySQLdb Packages Not Installed.',e)
+
+                cr_db = tdb.cursor()
+                cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d',(id_db,))
+                tables = dict(cr.fetchall())
+                tables_id = map(lambda x: str(tables[x]),tables)
+                cols = {}
+                if tables_id:
+                    cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) + ')')
+                else:
+                    cr.execute('select column_db_name,id,table_id from olap_database_columns')
+
+                for data in cr.fetchall():
+                    cols[str(data[1])] = (data[0],int(data[2]))
+                cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables where table_schema =%s",(db_name))
+
+                for table in cr_db.fetchall():
+                    val = {
+                        'fact_database_id':id_db,
+                        'table_db_name':table[0]
+                    }
+
+                    if table[0] in tables.keys():
+                        table_id = tobj.write(cr,uid,[tables[table[0]]],val,context)
+
+                    else:
+                        val['name'] = table[0]
+                        tables[val['name']] = tobj.create(cr,uid,val,context)
+                cr_db.execute("""SELECT
+                        table_name, column_name, data_type
+                    from
+                        INFORMATION_SCHEMA.columns
+                    WHERE table_schema = %s""",(db_name))
+
+                for col in cr_db.fetchall():
+
+                    val = {
+                        'table_id': tables[col[0]],
+                        'column_db_name': col[1],
+                        'type': col[2],
+                    }
+
+                    id_made = filter(lambda x:(int(cols[x][1]) == int(tables[col[0]])),cols)
+                    if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
+                        col_id = tcol.write(cr,uid,cols[tables[str(col[0])]],val,context)
+                    else:
+                        val['name'] = col[1]
+                        id_made = tcol.create(cr,uid,val,context)
+                        cols[str(id_made)] = (val['name'],int(val['table_id']))
+
+                cr_db.execute("""select 
+                        REFERENCED_COLUMN_NAME,REFERENCED_TABLE_NAME,COLUMN_NAME,TABLE_NAME
+                    from 
+                        INFORMATION_schema.key_column_usage
+                    where table_schema= %s and 
+                        constraint_name in (
+                                    select constraint_name from INFORMATION_SCHEMA .table_constraints
+                                    where 
+                                        constraint_type in('PRIMARY KEY','FOREIGN KEY'))
+                                    """,(db_name))
+        #            lines=pool.get('olap.schema').browse(cr, uid, part['id'],context)
+                for constraint in cr_db.fetchall():
+
+                    if constraint[0]:
+                        val = {
+                             'related_to':tables[constraint[1]]
+                             }
+                    else:
+
+                        val = {
+                             'primary_key':True
+                             }
+                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[3]])and(constraint[2] == cols[x][0])),cols)
+                    col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+
+            elif type == 'oracle':
+                try:
+                    import cx_Oracle
+                    host = lines.database_id.db_host or ''
+                    port = lines.database_id.db_port or ''
+                    db = lines.database_id.db_name or ''
+                    user = lines.database_id.db_login.upper() or ''
+                    passwd = lines.database_id.db_password or ''
+                    tdb = cx_Oracle.connect(user,passwrd,host)
+
+                except Exception,e:
+                            raise osv.except_osv('cx_Oracle Packages Not Installed.',e)
+
+                cr_db = tdb.cursor()
+                cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d',(id_db,))
+                tables = dict(cr.fetchall())
+                tables_id = map(lambda x: str(tables[x]),tables)
+                cols = {}
+                if tables_id:
+                    cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) + ')')
+                else:
+                    cr.execute('select column_db_name,id,table_id from olap_database_columns')
+
+                for data in cr.fetchall():
+                    cols[str(data[1])] = (data[0],int(data[2]))
+
+                cr_db.execute("select table_name from all_tables where owner =%s",(user))
+                temp = cr_db.fetchall()
+                for table in temp:
+                    val = {
+                        'fact_database_id':id_db,
+                        'table_db_name':table[0]
+                    }
+
+                    if table[0] in tables.keys():
+                        table_id = tobj.write(cr,uid,[tables[table[0]]],val,context)
+
+                    else:
+                        val['name'] = table[0]
+                        tables[val['name']] = tobj.create(cr,uid,val,context)
+
+                cr_db.execute("""SELECT
+                        table_name, column_name, data_type
+                    from
+                        all_tab_columns 
+                    WHERE owner = %s""",(user))
+                temp = cr_db.fetchall()
+                for col in temp:
+                    if col[2] == 'NUMBER':
+                        type_col = 'numeric'
+                    elif col[2] == 'DATE':
+                        type_col = 'date'
+                    elif col[2] == 'VARCHAR2':
+                        type_col = 'varchar'
+                    else:
+                        type_col = col[2]
+                    val = {
+                        'table_id': tables[col[0]],
+                        'column_db_name': col[1],
+                        'type': type_col,
+                    }
+
+                    id_made = filter(lambda x:(int(cols[x][1]) == int(tables[col[0]])),cols)
+                    if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
+                        col_id = tcol.write(cr,uid,cols[tables[str(col[0])]],val,context)
+                    else:
+                        val['name'] = col[1]
+                        id_made = tcol.create(cr,uid,val,context)
+                        cols[str(id_made)] = (val['name'],int(val['table_id']))
+
+                cr_db.execute("""select 
+                        table_name,column_name,constraint_name
+                    from 
+                        all_cons_columns
+                    where
+                        constraint_name in (
+                                    select constraint_name from all_constraints
+                                    where 
+                                        constraint_type = 'P' and owner= %s)
+                                    """,(user))
+                temp = cr_db.fetchall()
+                pk_table = {}
+                for constraint in temp:
+                    val = {
+                        'primary_key' : True
+                    }
+                    pk_table[constraint[2]] = constraint[0]
+
+                    id_to_write = filter(lambda x : (int(cols[x][1]) == int(tables[constraint[0]])and(constraint[1] == cols[x][0])),cols)
+                    col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+
+                cr_db.execute("""select 
+                                constraint_name,r_constraint_name from all_constraints
+                                    where 
+                                        constraint_type = 'R'  and owner = %s
+                                    """,(user))
+                constraints_map = {}
+                for data in cr_db.fetchall():
+                    constraints_map[data[0]] = data[1]
+
+                cr_db.execute("""select 
+                        table_name,column_name,constraint_name
+                    from 
+                        all_cons_columns
+                    where
+                        constraint_name in (
+                                    select constraint_name from all_constraints
+                                    where 
+                                        constraint_type = 'R' and owner = %s)
+                                    """,(user))
+
+
+                temp = cr_db.fetchall()
+                for constraint in temp:
+                    rel_constraint_name = constraints_map[constraint[2]]
+                    req_table = pk_table[rel_constraint_name]
+                    val = {
+                        'related_to' : tables[req_table]
+                    }
+                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])and (constraint[1] == cols[x][0])),cols)
+                    col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+
+            temp = pooler.get_pool(cr.dbname).get('olap.fact.database').write(cr,uid,[id_db],{'loaded':True})
+            wf_service = netsvc.LocalService('workflow')
+            wf_service.trg_validate(uid,'olap.schema',context['active_id'],'dbload',cr)
+            model_data_ids = self.pool.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_olap_schema_form')])
+            resource_id = self.pool.get('ir.model.data').read(cr,uid,model_data_ids,fields = ['res_id'])[0]['res_id']
+
+            return {'type':'ir.actions.act_window_close' }
+#            return{
+#           'domain': [],
+#           'name': 'view_olap_schema_form',
+#           'view_type': 'form',
+#           'view_mode': 'form,tree',
+#           'res_id': context['active_id'],
+#           'res_model': 'olap.schema',
+#           'view': [(resource_id,'form')],
+#           'type': 'ir.actions.act_window_close'
+#            }
+#
+
+    def action_cancel(self,cr,uid,ids,context = None):
+
+        return {'type':'ir.actions.act_window_close' }
+
+bi_load_db_wizard()
+
+
+
+# Wizard for the Automatic Application Configuration
+# Replacement for the Load Wizard according to the new structure
+class bi_auto_configure_wizard(osv.osv_memory):
+    _name = 'bi.auto.configure.wizard'
+
+
+    def _get_name(self,cr,uid,ctx):
+        if ctx and ctx.has_key('active_id'):
+            schema_obj = self.pool.get('olap.schema').browse(cr,uid,ctx['active_id'])
+            return schema_obj.name
+        return False
+
+    _columns = {
+        'name':fields.char('Fact Name' ,size = 64,readonly = True),
+
+        }
+
+    _defaults = {
+                   'name':_get_name,
+                   }
+
+    def action_load(self,cr,uid,ids,context = None):
+        vals = {}
+        apptabnew_vals = {}
+        appfieldnew_vals = {}
+
+        ids = pooler.get_pool(cr.dbname).get('olap.schema').browse(cr,uid,context['active_id'])
+
+        if ids.app_detect == "Unknown Application":
+            raise wizard.except_wizard('Warning','The Application is Unknown, we can not configure it automatically.')
+
+        else:
+            app_objs = pooler.get_pool(cr.dbname).get('olap.application')
+            app_ids = app_objs.search(cr,uid,[])
+            app_res = app_objs.browse(cr,uid,app_ids)
+            app_id = ''
+            for x_app in app_res:
+                  app_id = x_app['id']
+
+            apptab_objs = pooler.get_pool(cr.dbname).get('olap.application.table')
+            apptab_ids = apptab_objs.search(cr,uid,[])
+            apptab_res = apptab_objs.browse(cr,uid,apptab_ids)
+            apptab_name = []
+            map_apptab_name = {}
+            map_apptab_name_id = {}
+            for aptab in apptab_res:
+                apptab_name.append(aptab.name)
+                map_apptab_name_id[aptab.table_name] = aptab
+
+            appfield_objs = pooler.get_pool(cr.dbname).get('olap.application.field')
+            appfield_ids = appfield_objs.search(cr,uid,[])
+            appfield_res = appfield_objs.browse(cr,uid,appfield_ids)
+            appfield_data_res = appfield_objs.browse(cr,uid,appfield_ids)
+            appcol_name = []
+            for apcol in appfield_res:
+                appcol_name.append(apcol.name)
+
+            dbtab_obj = pooler.get_pool(cr.dbname).get('olap.database.tables')
+#            id_tables=dbtab_obj.search(cr,uid,[('fact_database_id','=',ids.database_id.id),('table_db_name','not in',['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel'])])
+            id_tables = dbtab_obj.search(cr,uid,[('fact_database_id','=',ids.database_id.id)])
+            tables_main = dbtab_obj.read(cr,uid,id_tables,context = {'wizard':True})
+            for tables in tables_main:
+                end_user_name = {'name':(" ").join(map(lambda x:x.capitalize(),tables['table_db_name'].split("_")))}
+                table_new = dbtab_obj.write(cr,uid,tables['id'],end_user_name)
+                if not(tables['table_db_name'].startswith('ir') or tables['table_db_name'].startswith('wkf') or tables['table_db_name'].startswith('res_groups') or tables['table_db_name'].startswith('res_role')) and tables['table_db_name'] not in ['inherit','user_rule_group_rel','group_rule_group_rel']:
+                    vals = {}
+
+                    if len(apptab_ids) == 0 and (tables['table_db_name'] not in apptab_name):
+                        vals['table_name'] = tables['table_db_name']
+                        vals['name'] = (" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
+                        vals['is_hidden'] = tables['hide']
+                        vals['application_id'] = app_id
+                        table_new = dbtab_obj.write(cr,uid,tables['id'],{'hide':False})
+                        apptab_new_obj = apptab_objs.create(cr,uid,vals)
+                    else:
+                        if map_apptab_name_id.has_key(tables['table_db_name']):
+                            app_table = map_apptab_name_id[tables['table_db_name']]
+                            if ((app_table['table_name'] == tables['table_db_name']) and not (app_table['table_name'] == tables['name'])):
+                                vals['name'] = (" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
+                                vals['is_hidden'] = tables['hide']
+                                tables_obj_new = apptab_objs.write(cr,uid,app_table['id'],vals)
+                        else:
+                            vals['table_name'] = tables['table_db_name']
+                            vals['name'] = (" ").join(map(lambda x:x.capitalize(),tables['table_db_name'].split("_")))
+                            vals['is_hidden'] = tables['hide']
+                            vals['application_id'] = app_id
+                            apptab_new_obj = apptab_objs.create(cr,uid,vals)
+            id_columns = pooler.get_pool(cr.dbname).get('olap.database.columns').search(cr,uid,[('table_id','in',id_tables)])
+            columns = pooler.get_pool(cr.dbname).get('olap.database.columns').read(cr,uid,id_columns,[])
+            for columns in columns:
+                vals = {}
+                if len(appfield_ids) == 0 and (columns['column_db_name'] not in appcol_name):
+                    vals['field_name'] = columns['column_db_name']
+                    vals['table_name'] = columns['table_id'][1]
+                    vals['name'] = (" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                    vals['is_hidden'] = columns['hide']
+                    vals['application_id'] = x_app['id']
+                    appfield_new_obj = appfield_objs.create(cr,uid,vals)
+                else:
+                    filter_column = filter(lambda x: columns['column_db_name'] == x['field_name'] and columns['table_id'][1] == x['table_name'],appfield_data_res)
+                    if map_apptab_name_id.has_key(columns['table_id'][1]) and filter_column:
+                        table_id_write = map_apptab_name_id[columns['table_id'][1]]
+                        vals['name'] = (" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                        vals['is_hidden'] = columns['hide']
+                        appfield_new_obj = appfield_objs.write(cr,uid,filter_column[0]['id'],vals)
+                    else:
+                        vals['field_name'] = columns['column_db_name']
+                        vals['table_name'] = columns['table_id'][1]
+                        vals['name'] = (" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                        vals['is_hidden'] = columns['hide']
+                        vals['application_id'] = x_app['id']
+                        appfield_new_obj = appfield_objs.create(cr,uid,vals)
+
+
+            database_tables = pooler.get_pool(cr.dbname).get('olap.database.tables')
+            id_tables = database_tables.search(cr,uid,[('fact_database_id','=',ids.database_id.id)])
+            tables = database_tables.read(cr,uid,id_tables,[])
+            make_id = []
+            for table in tables:
+                vals = {}
+                if (table['table_db_name'].startswith('ir') or table['table_db_name'].startswith('wkf')) or (table['table_db_name'].startswith('res_groups')) or (table['table_db_name'] in ['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel']):
+                    vals['hide'] = True
+                    vals['active'] = False
+                    make_id.append(table['id'])
+                    database_tables.write(cr,uid,table['id'],vals)
+
+            database_columns = pooler.get_pool(cr.dbname).get('olap.database.columns')
+            id_columns = database_columns.search(cr,uid,[('table_id','in',make_id)])
+            columns = database_columns.read(cr,uid,id_columns,[])
+            for col in columns:
+                val = {}
+                vals['hide'] = True
+                vals['active'] = False
+                database_columns.write(cr,uid,col['id'],vals)
+
+
+            wf_service = netsvc.LocalService('workflow')
+            wf_service.trg_validate(uid,'olap.schema',context['active_id'],'dbconfigure',cr)
+            model_data_ids = self.pool.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_olap_schema_form')])
+            resource_id = self.pool.get('ir.model.data').read(cr,uid,model_data_ids,fields = ['res_id'])[0]['res_id']
+
+            return {'type':'ir.actions.act_window_close' }
+
+    def action_cancel(self,cr,uid,ids,context = None):
+
+        return {'type':'ir.actions.act_window_close' }
+
+bi_auto_configure_wizard()
+
+
+class olap_warehouse_wizard(osv.osv_memory):
+    _name = "olap.warehouse.wizard"
+    _description = "Olap Warehouse"
+    
+    def _get_queries(self, cr, uid, context = {}):
+        query_obj = self.pool.get('olap.query.logs')
+        qry_ids = query_obj.search(cr, uid, [('user_id','=',uid),('count','>=',3)])
+        if qry_ids:
+            query = ''
+            for id in query_obj.browse(cr,uid,qry_ids,context):
+                if query == '':
+                    query = id.query
+                else:
+                    query = query + '\n'+id.query
+            return query
+        else:
+            return ''
+    def action_ok(self, cr, uid, ids, context = {}):
+        return {'type':'ir.actions.act_window_close' }
+    
+    _columns = {
+                'query': fields.text('Query', readonly=True),
+                }
+    _defaults = {
+        'query': _get_queries,
+        }
+olap_warehouse_wizard()
+class olap_parameters_config_wizard(osv.osv_memory):
+    _name = "olap.parameters.config.wizard"
+    _description = "Olap Server Parameters"
+
+    def _get_host(self,cr,uid,context = None):
+        obj = self.pool.get('olap')
+        objid = self.pool.get('ir.model.data')
+        aid = objid._get_id(cr,uid,'olap','menu_url_cube_browser')
+        aid = objid.browse(cr,uid,aid,context = context).res_id
+        aid = self.pool.get('ir.actions.url').browse(cr,uid,aid,context = context)
+        s_p = Literal("http://").suppress() + Word(alphanums + "_" + ".") + Literal(":").suppress() + Word(nums) + Literal("/").suppress() + Word(alphanums + "_" + " ").suppress()
+        return s_p.parseString(aid.url)[0]
+
+    def _get_port(self,cr,uid,context = None):
+        obj = self.pool.get('olap')
+        objid = self.pool.get('ir.model.data')
+        aid = objid._get_id(cr,uid,'olap','menu_url_cube_browser')
+        aid = objid.browse(cr,uid,aid,context = context).res_id
+        aid = self.pool.get('ir.actions.url').browse(cr,uid,aid,context = context)
+        s_p = Literal("http://").suppress() + Word(alphanums + "_" + ".") + Literal(":").suppress() + Word(nums) + Literal("/").suppress() + Word(alphanums + "_" + " ").suppress()
+        return s_p.parseString(aid.url)[1]
+
+    _columns = {
+        'host_name' : fields.char('Server Name',size = 64,help = "Put here the server address or IP \
+                Put localhost if its not clear.",required = True),
+        'host_port' : fields.char('Port',size = 4,help = "Put the port for the server. Put 8080 if \
+                its not clear.",required = True),
+            }
+
+    _defaults = {
+        'host_name': _get_host,
+        'host_port': _get_port,
+        }
+
+    def action_cancel(self,cr,uid,ids,conect = None):
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.actions.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+         }
+
+    def action_config(self,cr,uid,ids,context = None):
+        conf = self.browse(cr,uid,ids[0],context)
+        obj = self.pool.get('olap')
+        objid = self.pool.get('ir.model.data')
+        aid = objid._get_id(cr,uid,'olap','menu_url_cube_browser')
+        aid = objid.browse(cr,uid,aid,context = context).res_id
+        self.pool.get('ir.actions.url').write(cr,uid,[aid],{'url': 'http://' + (conf.host_name or 'localhost') + ':' + (conf.host_port or '8080') + '/browser'})
+
+        aid = objid._get_id(cr,uid,'olap','menu_url_cube_designer')
+        aid = objid.browse(cr,uid,aid,context = context).res_id
+        self.pool.get('ir.actions.url').write(cr,uid,[aid],{'url': 'http://' + (conf.host_name or 'localhost') + ':' + (conf.host_port or '8080') + '/designer'})
+
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.actions.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+        }
+olap_parameters_config_wizard()
+
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/wizard/__init__.py b/addons/olap/wizard/__init__.py
new file mode 100755
index 00000000000..a7b3a6af17f
--- /dev/null
+++ b/addons/olap/wizard/__init__.py
@@ -0,0 +1,34 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import wizard_query_builder
+import wizard_load_data
+import wizard_load_configured_table
+import wizard_clear_logs
+import wizard_application_configure
+import wizard_load_columns
+import wizard_test_connection
diff --git a/addons/olap/wizard/wizard_application_configure.py b/addons/olap/wizard/wizard_application_configure.py
new file mode 100755
index 00000000000..3dfac9e2974
--- /dev/null
+++ b/addons/olap/wizard/wizard_application_configure.py
@@ -0,0 +1,194 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import time
+
+import wizard
+import pooler
+from osv import osv
+import netsvc
+
+info = '''<?xml version="1.0"?>
+<form string="Auto Configure">
+    <label string="Your database structure (Open ERP) has been sucessfully configured."/>
+</form>'''
+
+form1 = '''<?xml version="1.0"?>
+<form string=" Auto Configure ">
+    <label string="This will Auto Configure Application"/>
+</form>'''
+
+class wizard_application_configure(wizard.interface):
+    
+    def configure_application(self,cr,uid,data,context):
+        
+        vals={}
+        apptabnew_vals={}
+        appfieldnew_vals={}
+        
+        ids=pooler.get_pool(cr.dbname).get('olap.schema').browse(cr,uid,data['id'])
+        
+        if ids.app_detect == "Unknown Application":
+            raise wizard.except_wizard('Warning', 'The Application is Unknown, we can not configure it automatically.')
+
+        else:
+            app_objs = pooler.get_pool(cr.dbname).get('olap.application')
+            app_ids = app_objs.search(cr, uid, [])
+            app_res = app_objs.browse(cr,uid, app_ids)
+            app_id=''
+            for x_app in app_res:
+                  app_id = x_app['id']
+                  
+            apptab_objs = pooler.get_pool(cr.dbname).get('olap.application.table')
+            apptab_ids = apptab_objs.search(cr, uid, [])
+            apptab_res = apptab_objs.browse(cr,uid, apptab_ids)
+            apptab_name=[]
+            for aptab in apptab_res:
+                apptab_name.append(aptab.name)
+
+            appfield_objs = pooler.get_pool(cr.dbname).get('olap.application.field')
+            appfield_ids = appfield_objs.search(cr, uid, [])
+            appfield_res = appfield_objs.browse(cr,uid, appfield_ids)
+            appcol_name=[]
+            for apcol in appfield_res:
+                appcol_name.append(apcol.name)
+            
+
+            apptab_objs = pooler.get_pool(cr.dbname).get('olap.application.table')
+            apptab_ids = apptab_objs.search(cr, uid, [])
+            apptab_res = apptab_objs.browse(cr,uid, apptab_ids)
+#            apptab_data_res = apptab_objs.read(cr,uid, apptab_ids,[])[0]
+            
+            apptab_name=[]
+            map_apptab_name_id={}
+            for aptab in apptab_res:
+                apptab_name.append(aptab.name)
+                map_apptab_name_id[aptab.table_name]=aptab
+            
+            appfield_objs = pooler.get_pool(cr.dbname).get('olap.application.field')
+            appfield_ids = appfield_objs.search(cr, uid, [])
+            appfield_res = appfield_objs.browse(cr,uid, appfield_ids)
+            appfield_data_res = appfield_objs.read(cr,uid, appfield_ids,[])
+            
+            appcol_name=[]
+            for apcol in appfield_res:
+                appcol_name.append(apcol.name)
+                
+            id_tables=pooler.get_pool(cr.dbname).get('olap.database.tables').search(cr,uid,[('fact_database_id','=',ids.database_id.id),('table_db_name','not in',['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel'])])
+            tables=pooler.get_pool(cr.dbname).get('olap.database.tables').read(cr,uid,id_tables,[])
+            
+            for tables in tables:
+                if not(tables['table_db_name'].startswith('ir') or tables['table_db_name'].startswith('wkf') or tables['table_db_name'].startswith('res_groups')):
+                    vals={}
+                    if len(apptab_ids)==0 and (tables['table_db_name'] not in apptab_name):
+                        vals['table_name']=tables['table_db_name']
+                        vals['name']=(" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
+                        vals['is_hidden']=tables['hide']
+                        vals['application_id']=app_id
+                        apptab_new_obj=apptab_objs.create(cr,uid,vals)
+                    else:
+                        if map_apptab_name_id.has_key(tables['table_db_name']):
+                            app_table = map_apptab_name_id[tables['table_db_name']]
+                            if ((app_table['table_name']==tables['table_db_name']) and not (app_table['table_name']==tables['name'])):
+                                vals['name']=aptable_obj.table_name
+                                vals['hide']=aptable_obj.is_hidden
+                                tables_obj_new=apptab_objs.write(cr,uid,tables['id'],vals)
+                        else:
+                            vals['table_name']=tables['table_db_name']
+                            vals['name']=(" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
+                            vals['is_hidden']=tables['hide']
+                            vals['application_id']=app_id
+                            apptab_new_obj=apptab_objs.create(cr,uid,vals)
+                    
+            id_columns=pooler.get_pool(cr.dbname).get('olap.database.columns').search(cr,uid,[('table_id','in',id_tables)])
+            columns=pooler.get_pool(cr.dbname).get('olap.database.columns').read(cr,uid,id_columns,[])
+            for columns in columns:
+                vals={}
+                if len(appfield_ids) == 0 and (columns['column_db_name'] not in appcol_name):
+                    vals['field_name']=columns['column_db_name']
+                    vals['table_name']=columns['table_id'][1]
+                    vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                    vals['is_hidden']=columns['hide']
+                    vals['application_id']=x_app['id']                      
+                    appfield_new_obj=appfield_objs.create(cr,uid,vals)
+                else:
+                    if map_apptab_name_id.has_key(columns['table_id'][1]):
+                        table_id_write = map_apptab_name_id[columns['table_id'][1]]
+                        filter_column=filter(lambda x: columns['column_db_name']==x['field_name'] and columns['table_id'][1]==x['table_name'],appfield_data_res)
+                        vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                        vals['is_hidden']=columns['hide']
+                        appfield_new_obj=appfield_objs.write(cr,uid,filter_column[0]['id'],vals)
+                    else:
+                        vals['field_name']=columns['column_db_name']
+                        vals['table_name']=columns['table_id'][1]
+                        vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                        vals['is_hidden']=columns['hide']
+                        vals['application_id']=x_app['id']                      
+                        appfield_new_obj=appfield_objs.create(cr,uid,vals)
+        
+        
+            database_tables = pooler.get_pool(cr.dbname).get('olap.database.tables')
+            id_tables=database_tables.search(cr,uid,[('fact_database_id','=',ids.database_id.id)])
+            tables=database_tables.read(cr,uid,id_tables,[])
+            make_id=[]
+            for table in tables:
+                vals={}
+                if (table['table_db_name'].startswith('ir') or table['table_db_name'].startswith('wkf')) or (table['table_db_name'].startswith('res_groups')) or (table['table_db_name'] in ['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel']):            
+                    vals['hide']=True
+                    vals['active']=False
+                    make_id.append(table['id'])
+                    database_tables.write(cr,uid,table['id'],vals)
+                    
+            database_columns=pooler.get_pool(cr.dbname).get('olap.database.columns')
+            id_columns=database_columns.search(cr,uid,[('table_id','in',make_id)])
+            columns=database_columns.read(cr,uid,id_columns,[])
+            for col in columns:
+                val={}
+                vals['hide']=True
+                vals['active']=False
+                database_columns.write(cr,uid,col['id'],vals)
+                
+            
+        wf_service = netsvc.LocalService('workflow')
+        wf_service.trg_validate(uid, 'olap.schema', data['id'], 'dbconfigure', cr)
+        return {}
+      
+    
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':form1, 'fields':{}, 'state':[('configure','Configure'),('end','Cancel')]}
+        },
+        'configure': {
+            'actions': [configure_application],
+            'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','Ok')]}   
+        },
+
+      }
+
+
+wizard_application_configure('olap.application.configuration')
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/wizard/wizard_clear_logs.py b/addons/olap/wizard/wizard_clear_logs.py
new file mode 100755
index 00000000000..38b6531485a
--- /dev/null
+++ b/addons/olap/wizard/wizard_clear_logs.py
@@ -0,0 +1,83 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import time
+
+import wizard
+import pooler
+from osv import osv
+
+
+info = '''<?xml version="1.0"?>
+<form string="Load Data">
+    <label string="Logs Cleared successfully"/>
+</form>'''
+
+form1 = '''<?xml version="1.0"?>
+<form string=" To Load Data">
+    <field name='user_name'/>
+</form>'''
+
+field1 = {
+ #   'account_id': {'string':"Analytic Account", 'type':'many2one', 'relation':'account.analytic.account', 'required':True, 'domain':"[('type','=','normal')]"},
+    'user_name': {'string':'User', 'type':'char','size':'64', 'required':True, 'readonly':True},
+#    'db_name': {'string':'Database Name', 'type':'char','size':'64', 'required':True, 'readonly':True},
+
+}
+
+def clear_logs(self,cr,uid,part,context={}):
+    ids=pooler.get_pool(cr.dbname).get('olap.query.logs').search(cr,uid,[('user_id','=',uid)])
+    pooler.get_pool(cr.dbname).get('olap.query.logs').unlink(cr, uid,ids,context)
+    return {}
+
+def _getdata(self,cr,uid,part,context={}):
+    ids=pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid)
+    part['form']['user_name']=ids['name']
+#    part['form']['db_name']=lines.database_id.db_name
+    return part['form']
+
+class wizard_clear_logs(wizard.interface):
+
+    states = {
+
+       'init': {
+            'actions': [_getdata],
+            'result': {'type':'form','arch':form1, 'fields':field1, 'state':[('end','Cancel'),('ok','Clear Logs')]}
+        },
+
+        'ok': {
+            'actions': [clear_logs],
+            'result': {'type':'form','arch':info,'fields':{}, 'state':[('end','Ok')]}
+                },
+
+         'info': {
+            'actions': [],
+            'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','Ok')]}
+                },
+
+      }
+
+wizard_clear_logs('olap.query.logs.clear')
diff --git a/addons/olap/wizard/wizard_load_columns.py b/addons/olap/wizard/wizard_load_columns.py
new file mode 100755
index 00000000000..f64a94399b4
--- /dev/null
+++ b/addons/olap/wizard/wizard_load_columns.py
@@ -0,0 +1,55 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import time
+
+import wizard
+import pooler
+
+class wizard_load_columns(wizard.interface):
+    def _get_table_data(self, cr, uid, data, context={}):
+        pool_obj = pooler.get_pool(cr.dbname)
+        ids_cols=pool_obj.get('olap.database.columns').search(cr, uid, ([('table_id','=',data['id'])]),context={})
+        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_olap_database_columns_form')],context={})
+        resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+        return {
+            'domain': "[('id','in', ["+','.join(map(str,ids_cols))+"])]",
+            'name': 'Database Columns',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'olap.database.columns',
+            'views': [(False,'tree'),(resource_id,'form')],
+            'type': 'ir.actions.act_window',
+        }
+        
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'action' ,'action':_get_table_data,'state':'end'}
+        }
+      }
+
+wizard_load_columns('olap.load.column')
diff --git a/addons/olap/wizard/wizard_load_configured_table.py b/addons/olap/wizard/wizard_load_configured_table.py
new file mode 100755
index 00000000000..da9a23cd1ba
--- /dev/null
+++ b/addons/olap/wizard/wizard_load_configured_table.py
@@ -0,0 +1,67 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import time
+
+import wizard
+import pooler
+import netsvc
+
+class wizard_load_configured_table(wizard.interface):
+    def _get_table_data(self, cr, uid, data, context={}):
+        pool_obj = pooler.get_pool(cr.dbname)
+        
+#        vals={}
+#        vals['configure']=True
+#        vals['state']='dbconfigure'
+#        pooler.get_pool(cr.dbname).get('olap.schema').write(cr,uid,data['id'],vals)
+        
+        wf_service = netsvc.LocalService('workflow')
+        wf_service.trg_validate(uid, 'olap.schema', data['id'], 'dbconfigure', cr)
+        
+        lines=pool_obj.get('olap.schema').read(cr, uid, data['id'],context={})
+        fact_ids=pool_obj.get('olap.database.tables').search(cr, uid, ([('fact_database_id','=',lines['database_id'][0])]),context={})
+        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_olap_database_tables_form')],context={})
+        resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+        
+        return {
+            'domain': "[('id','in', ["+','.join(map(str,fact_ids))+"])]",
+            'name': 'Database Tables',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'olap.database.tables',
+            'views': [(False,'tree'),(resource_id,'form')],
+            'type': 'ir.actions.act_window'
+        }
+        
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'action' ,'action':_get_table_data,'state':'end'}
+        }
+      }
+
+wizard_load_configured_table('olap.load.configuration.table')
diff --git a/addons/olap/wizard/wizard_load_data.py b/addons/olap/wizard/wizard_load_data.py
new file mode 100755
index 00000000000..320c69683ec
--- /dev/null
+++ b/addons/olap/wizard/wizard_load_data.py
@@ -0,0 +1,406 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import psycopg2
+import time
+
+import wizard
+import pooler
+import netsvc
+
+info = '''<?xml version="1.0"?>
+<form string="Load Data">
+    <label string="Your database structure has been correctly loaded"/>
+</form>'''
+
+form1 = '''<?xml version="1.0"?>
+
+<form string="Load Database Structure">
+
+    <label align="0.0" string="We will load the complete structure of the database by introspection,
+     so that you will be able to work on it, and specify a better structure 
+    according to your reporting needs." colspan="4" />
+    <newline/>
+    <label align="0.0" string="After having loaded the structure, you will be able to hide/show or 
+    rename tables and columns to simplify end-users interface. The following database 
+    will be loaded:" colspan="4"/>
+    <field align="0.0" name='fact_table'/>
+    <newline/>
+    <field align="0.0" name='db_name' colspan="4"/>
+</form>'''
+
+field1 = {
+    'fact_table': {'string':'Fact Name', 'type':'char','size':'64', 'required':True, 'readonly':True},
+    'db_name': {'string':'Database Name', 'type':'char','size':'64', 'required':True, 'readonly':True},
+}
+
+def olap_db_connect(self,cr,uid,part,context={}):
+    pool = pooler.get_pool(cr.dbname)
+    lines=pool.get('olap.schema').browse(cr, uid, part['id'],context)
+    id_db=lines.database_id.id
+    type = lines.database_id.type
+    db_name = lines.database_id.db_name
+    tobj = pool.get('olap.database.tables')
+    tcol = pool.get('olap.database.columns')
+    if type == 'postgres':
+        host = lines.database_id.db_host and "host=%s" % lines.database_id.db_host or ''
+        port = lines.database_id.db_port and "port=%s" % lines.database_id.db_port or ''
+        name = lines.database_id.db_name and "dbname=%s" % lines.database_id.db_name or ''
+        user = lines.database_id.db_login and "user=%s" % lines.database_id.db_login or ''
+        password = lines.database_id.db_password and "password=%s" % lines.database_id.db_password or ''
+        tdb = psycopg2.connect('%s %s %s %s %s' % (host, port, name, user, password))
+        cr_db = tdb.cursor()
+        cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d', (id_db,))
+        tables = dict(cr.fetchall())
+        tables_id = map(lambda x: str(tables[x]),tables)
+        cols={}
+        if tables_id:
+            cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) +')')
+        else:
+            cr.execute('select column_db_name,id,table_id from olap_database_columns')
+      
+        for data in cr.fetchall():
+            cols[str(data[1])]=(data[0],int(data[2]))
+            
+        print 'Creating / Updating Tables...' 
+        cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables as a where a.table_schema = 'public'")
+        for table in cr_db.fetchall():
+            val = {
+                'fact_database_id':id_db,
+                'table_db_name':table[0]
+            }
+           
+            if table[0] in tables.keys():
+                table_id=tobj.write(cr,uid,[tables[table[0]]], val, context)
+            else:
+                val['name']=table[0]
+                tables[val['name']] = tobj.create(cr,uid,val, context)    
+        print 'Creating / Updating Columns...' 
+        cr_db.execute("""SELECT
+                table_name, column_name, udt_name
+            from
+                INFORMATION_SCHEMA.columns
+            WHERE table_schema = 'public'""")
+        
+        for col in cr_db.fetchall():
+            val={
+                'table_id': tables[col[0]],
+                'column_db_name': col[1],
+                'type': col[2],
+            }
+            
+            id_made=filter(lambda x:(int(cols[x][1])==int(tables[col[0]])),cols)
+            if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
+                col_id=tcol.write(cr,uid,cols[tables[str(col[0])]], val, context)
+            else:
+                val['name']=col[1]
+                id_made = tcol.create(cr,uid,val, context)
+                cols[str(id_made)] = (val['name'],int(val['table_id']))
+        print 'Creating / Updating Constraints...' 
+        cr_db.execute("""select 
+                table_name,column_name 
+            from 
+                INFORMATION_schema.key_column_usage
+            where 
+                constraint_name in (
+                            select constraint_name from INFORMATION_SCHEMA .table_constraints
+                            where 
+                                constraint_type = 'PRIMARY KEY')""")
+        print "Updating the Primary Key Constraint" 
+        for constraint in cr_db.fetchall():
+            val={
+                'primary_key':True
+            }
+            
+            id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and(constraint[1]==cols[x][0])),cols)
+            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context) 
+        print "Updating the Foreign key constraint" 
+        cr_db.execute("""select 
+                    constraint_name,table_name 
+            from 
+                INFORMATION_schema.constraint_column_usage 
+            where
+                constraint_name in (
+                            select constraint_name from INFORMATION_SCHEMA.table_constraints 
+                            where 
+                                constraint_type = 'FOREIGN KEY')""")
+        for_key=dict(cr_db.fetchall())
+        
+        cr_db.execute("""select 
+                     table_name,column_name,constraint_name 
+                 from 
+                     INFORMATION_schema.key_column_usage
+                 where 
+                     constraint_name in (
+                                 select constraint_name from INFORMATION_SCHEMA.table_constraints 
+                                 where 
+                                     constraint_type = 'FOREIGN KEY')""") 
+
+        for constraint in cr_db.fetchall():
+            val={
+                'related_to':tables[for_key[constraint[2]]]
+            }
+            id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and (constraint[1]==cols[x][0])),cols)
+            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context) 
+    
+    
+    elif type =='mysql':
+        try:
+            import MySQLdb
+            host = lines.database_id.db_host or ''
+            port = lines.database_id.db_port or ''
+            db = lines.database_id.db_name or ''
+            user = lines.database_id.db_login or ''
+            passwd = lines.database_id.db_password or ''
+            tdb = MySQLdb.connect(host = host,port = port, db = db, user = user, passwd = passwd)
+            
+        except Exception, e:
+            raise osv.except_osv('MySQLdb Packages Not Installed.',e )
+        
+        cr_db = tdb.cursor()
+        cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d', (id_db,))
+        tables = dict(cr.fetchall())
+        tables_id = map(lambda x: str(tables[x]),tables)
+        cols={}
+        if tables_id:
+            cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) +')')
+        else:
+            cr.execute('select column_db_name,id,table_id from olap_database_columns')
+        
+        for data in cr.fetchall():
+            cols[str(data[1])]=(data[0],int(data[2]))
+        cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables where table_schema =%s",(db_name))
+        
+        for table in cr_db.fetchall():
+            val = {
+                'fact_database_id':id_db,
+                'table_db_name':table[0]
+            }
+           
+            if table[0] in tables.keys():
+                table_id=tobj.write(cr,uid,[tables[table[0]]], val, context)
+                
+            else:
+                val['name']=table[0]
+                tables[val['name']] = tobj.create(cr,uid,val, context)
+        cr_db.execute("""SELECT
+                table_name, column_name, data_type
+            from
+                INFORMATION_SCHEMA.columns
+            WHERE table_schema = %s""",(db_name))
+        
+        for col in cr_db.fetchall():
+            
+            val={
+                'table_id': tables[col[0]],
+                'column_db_name': col[1],
+                'type': col[2],
+            }
+            
+            id_made=filter(lambda x:(int(cols[x][1])==int(tables[col[0]])),cols)
+            if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
+                col_id=tcol.write(cr,uid,cols[tables[str(col[0])]], val, context)
+            else:
+                val['name']=col[1]
+                id_made = tcol.create(cr,uid,val, context)
+                cols[str(id_made)] = (val['name'],int(val['table_id']))
+       
+        cr_db.execute("""select 
+                REFERENCED_COLUMN_NAME,REFERENCED_TABLE_NAME,COLUMN_NAME,TABLE_NAME
+            from 
+                INFORMATION_schema.key_column_usage
+            where table_schema= %s and 
+                constraint_name in (
+                            select constraint_name from INFORMATION_SCHEMA .table_constraints
+                            where 
+                                constraint_type in('PRIMARY KEY','FOREIGN KEY'))
+                            """,(db_name)) 
+
+        for constraint in cr_db.fetchall():
+            
+            if constraint[0]:
+                val={
+                     'related_to':tables[constraint[1]]
+                     }
+            else:
+                
+                val={
+                     'primary_key':True
+                     }
+            id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[3]])and(constraint[2]==cols[x][0])),cols)
+            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context)  
+    
+    elif type == 'oracle':
+        try:
+            import cx_Oracle
+            host = lines.database_id.db_host or ''
+            port = lines.database_id.db_port or ''
+            db = lines.database_id.db_name or ''
+            user = lines.database_id.db_login.upper() or ''
+            passwd = lines.database_id.db_password or ''
+            tdb = cx_Oracle.connect(user, passwrd, host)
+            
+        except Exception, e:
+                    raise osv.except_osv('cx_Oracle Packages Not Installed.',e )
+
+        cr_db = tdb.cursor()
+        cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d', (id_db,))
+        tables = dict(cr.fetchall())
+        tables_id = map(lambda x: str(tables[x]),tables)
+        cols={}
+        if tables_id:
+            cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) +')')
+        else:
+            cr.execute('select column_db_name,id,table_id from olap_database_columns')
+        
+        for data in cr.fetchall():
+            cols[str(data[1])]=(data[0],int(data[2]))
+
+        cr_db.execute("select table_name from all_tables where owner =%s",(user))
+        temp = cr_db.fetchall()
+        for table in temp:
+            val = {
+                'fact_database_id':id_db,
+                'table_db_name':table[0]
+            }
+            
+            if table[0] in tables.keys():
+                table_id=tobj.write(cr,uid,[tables[table[0]]], val, context)
+                
+            else:
+                val['name']=table[0]
+                tables[val['name']] = tobj.create(cr,uid,val, context)
+
+        cr_db.execute("""SELECT
+                table_name, column_name, data_type
+            from
+                all_tab_columns 
+            WHERE owner = %s""",(user))
+        temp = cr_db.fetchall()
+        for col in temp:
+            if col[2]=='NUMBER':
+                type_col='numeric'
+            elif col[2]=='DATE':
+                type_col='date'
+            elif col[2]=='VARCHAR2':
+                type_col='varchar'
+            else:
+                type_col=col[2]
+            val={
+                'table_id': tables[col[0]],
+                'column_db_name': col[1],
+                'type': type_col,
+            }
+            
+            id_made=filter(lambda x:(int(cols[x][1])==int(tables[col[0]])),cols)
+            if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
+                col_id=tcol.write(cr,uid,cols[tables[str(col[0])]], val, context)
+            else:
+                val['name']=col[1]
+                id_made = tcol.create(cr,uid,val, context)
+                cols[str(id_made)] = (val['name'],int(val['table_id']))
+
+        cr_db.execute("""select 
+                table_name,column_name,constraint_name
+            from 
+                all_cons_columns
+            where
+                constraint_name in (
+                            select constraint_name from all_constraints
+                            where 
+                                constraint_type = 'P' and owner= %s)
+                            """,(user)) 
+        temp = cr_db.fetchall()
+        pk_table = {}        
+        for constraint in temp:
+            val={
+                'primary_key' : True
+            }
+            pk_table[constraint[2]] = constraint[0]
+
+            id_to_write=filter(lambda x : (int(cols[x][1])==int(tables[constraint[0]])and(constraint[1]==cols[x][0])),cols)
+            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context)
+
+        cr_db.execute("""select 
+                        constraint_name,r_constraint_name from all_constraints
+                            where 
+                                constraint_type = 'R'  and owner = %s
+                            """,(user))
+        constraints_map={}
+        for data in cr_db.fetchall():
+            constraints_map[data[0]]=data[1]
+
+        cr_db.execute("""select 
+                table_name,column_name,constraint_name
+            from 
+                all_cons_columns
+            where
+                constraint_name in (
+                            select constraint_name from all_constraints
+                            where 
+                                constraint_type = 'R' and owner = %s)
+                            """,(user))
+            
+
+        temp = cr_db.fetchall()
+        for constraint in temp:
+            rel_constraint_name=constraints_map[constraint[2]]
+            req_table = pk_table[rel_constraint_name]
+            val={
+                'related_to' : tables[req_table]
+            }
+            id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and (constraint[1]==cols[x][0])),cols)
+            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context)
+            
+    pooler.get_pool(cr.dbname).get('olap.fact.database').write(cr,uid,[id_db],{'loaded':True})
+    wf_service = netsvc.LocalService('workflow')
+    wf_service.trg_validate(uid, 'olap.schema', part['id'], 'dbload', cr)
+    return {}
+
+def _getdata(self,cr,uid,part,context={}):
+    lines=pooler.get_pool(cr.dbname).get('olap.schema').browse(cr, uid, part['id'],context)
+    part['form']['fact_table']=lines.database_id.name
+    part['form']['db_name']=lines.database_id.db_name
+    return part['form']
+
+class wizard_data_loader(wizard.interface):
+    states = {
+       'init': {
+            'actions': [_getdata],
+            'result': {'type':'form','arch':form1, 'fields':field1, 'state':[('end','Cancel'),('ok','Load Database Structure')]}
+        },
+        'ok': {
+            'actions': [olap_db_connect],
+            'result': {'type':'form','arch':info,'fields':{}, 'state':[('end','Continue and Configure Structure')]}
+        },
+        'info': {
+            'actions': [],
+            'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','Ok')]}
+        },
+      }
+wizard_data_loader('olap.load.table')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/olap/wizard/wizard_query_builder.py b/addons/olap/wizard/wizard_query_builder.py
new file mode 100755
index 00000000000..3b69c1cf996
--- /dev/null
+++ b/addons/olap/wizard/wizard_query_builder.py
@@ -0,0 +1,240 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import wizard
+import threading
+import pooler
+from osv import osv
+import optparse
+import xmlrpclib
+import time
+
+import netsvc
+
+
+
+class Log:
+    def __init__(self):
+        self.content= ""
+        self.error= False
+    def add(self,s,error=True):
+        self.content= self.content + s
+        if error:
+            self.error= error
+    def __call__(self):
+        return self.content
+
+
+def get_cube(self, cr, uid, context):
+        pool = pooler.get_pool(cr.dbname).get('olap.cube')
+        ids = pool.search(cr, uid, [])
+        res = pool.read(cr, uid, ids, ['schema_id','name'], context)
+        res=[(r['schema_id'], r['name']) for r in res]
+
+        return res
+
+def get_details(self, cr, uid,data, context):
+         """
+         To Fetch dimension of selected schema
+         """
+         pool = pooler.get_pool(cr.dbname).get('olap.cube')
+
+         search_id=data['form']['cube_schema'][0]
+
+         ids=pool.search(cr,uid,[('schema_id','=',search_id)])
+
+         """
+         ids now have the cube id from schema user selected
+         """
+
+         """
+         To Fetch hiearchy of selected schema
+         """
+         pool = pooler.get_pool(cr.dbname).get('olap.dimension')
+
+         id_dimension=pool.search(cr,uid,[('cube_id','=',ids[0])])
+         res=pool.read(cr,uid,id_dimension,['id','name'],context)
+         log_d=Log()
+         for r in res:
+             log_d.add(r['name'])
+             log_d.add("\n")
+
+
+         """
+         To Fetch hiearchy id
+         """
+         pool=pooler.get_pool(cr.dbname).get('olap.hierarchy')
+
+         id_hierarchy=pool.search(cr,uid,[('dimension_id','in',tuple(id_dimension))])
+         res=pool.read(cr,uid,id_hierarchy,['id','name'],context)
+         log_h=Log()
+         for r in res:
+             log_h.add(r['name'])
+             log_h.add("\n")
+
+
+
+         """
+         To fetch level id
+         """
+         pool=pooler.get_pool(cr.dbname).get('olap.level')
+         id_level=pool.search(cr,uid,[('hierarchy_id','in',tuple(id_hierarchy))])
+         res=pool.read(cr,uid,id_level,['id','name'],context)
+         log_l=Log()
+         for r in res:
+             log_l.add(r['name'])
+             log_l.add("\n")
+
+         """
+         To fetch measures id
+         """
+         pool=pooler.get_pool(cr.dbname).get('olap.measure')
+         id_level=pool.search(cr,uid,[('cube_id','in',tuple(ids))])
+         res=pool.read(cr,uid,id_level,['id','name'],context)
+         log_m=Log()
+         for r in res:
+             log_m.add(r['name'])
+             log_m.add("\n")
+
+
+         return {'hierarchy':log_h(),'dimension':log_d(),'level':log_l(),'measure':log_m()}
+
+
+
+
+query_builder_form = """<?xml version="1.0"?>
+<form string="Query Builder">
+ <field name="dimension"/>
+ <field name="hierarchy"/>
+ <field name="level"/>
+ <field name="measure"/>
+ <field name="mdx_query" colspan="4" height="100" width="800"/>
+ <field name="mdx_query_output" colspan="4" height="100" width="800"/>
+</form>"""
+query_builder_fields={
+
+
+                      'dimension':{'string':'Dimension','type':'text'},
+                      'hierarchy':{'string':'Hiearchy','type':'text'},
+                      'level':{'string':'Level','type':'text'},
+                      'measure':{'string':'Measure','type':'text'},
+                      'mdx_query':{'string':'MDX Query','type':'text'},
+                      'mdx_query_output':{'string':'MDX Query Output','type':'text'},
+                      }
+
+query_builder_fetch_form = """<?xml version="1.0"?>
+<form string="Cube Fetcher">
+  <field name="cube_schema"/>
+</form>"""
+
+query_builder_fetch_fields = {
+    'cube_schema':{'string':'Select Cube','type':'selection','selection':get_cube},
+}
+
+
+
+def _execute_mdx(self, cr, uid, data, context):
+
+    log=Log()
+
+    pool = pooler.get_pool(cr.dbname).get('olap.schema')
+    ids = pool.search(cr, uid, [('database_id','=',data['form']['cube_schema'][0])])
+    res1 = pool.read(cr, uid, ids,['name'], context)
+
+    """
+        doing same using request method of olap.schema
+        creating the object of olpa.schema and using its request method for parsing the query
+    """
+    r=data['form']['mdx_query']
+    n=res1[0]['name']
+    service=netsvc.LocalService("object_proxy")
+    axis,data1=service.execute(cr.dbname,uid,'olap.schema','request',n,r,context={})
+    output=''
+
+    COLSPAN = 18
+    ROWSPAN = 18
+    if len(axis)>1:
+        for i in range(8):
+            ok = False
+            for x in axis[1]:
+                if len(x[0])==i:
+                    ok = True
+            if not ok:
+                   continue
+            #print ' '*COLSPAN,
+            output =' '*COLSPAN
+            log.add(output)
+           # print (('%-'+str(ROWSPAN)+'s ' ) * len(axis[1])) % tuple(map(lambda x: str(len(x[0])==i and x[1] or ''),axis[1]))
+            output=(('%-'+str(ROWSPAN)+'s ' ) * len(axis[1])) % tuple(map(lambda x: str(len(x[0])==i and x[1] or ''),axis[1]))
+            log.add(output)
+
+        for col in data1:
+            x=(' '*(len(axis[0][0][0])-1)*2)
+            print "--------------------------------------",x
+            temp=(axis[0].pop(0)[1])
+            print "--------------------------------------",temp
+          #  print ('%-'+str(COLSPAN)+'s')% (' '*(len(axis[0][0][0])-1)*2 + (temp),),
+            output =('%-'+str(COLSPAN)+'s')% (str(x)+str(temp))
+            log.add("\n")
+            log.add(output)
+            #output=(temp)
+
+            for row in col:
+                if row==[False]:
+          #          print ('%-'+str(ROWSPAN)+'s')%('',),
+                    output=('%-'+str(ROWSPAN)+'s')%('')
+                    log.add(output)
+
+                else:
+         #            print ('%-'+str(ROWSPAN)+'s')%(row,),
+                     output=('%-'+str(ROWSPAN)+'s')%(row)
+                     log.add(output)
+        #print
+        log.add("\n")
+    return {'mdx_query_output':log()}
+
+class wizard_query_builder(wizard.interface):
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type':'form', 'arch':query_builder_fetch_form, 'fields':query_builder_fetch_fields, 'state':[('ok', 'Fetch Data')]}
+        },
+        'ok':{
+            'actions' : [get_details],
+            'result' : {'type':'form', 'arch':query_builder_form, 'fields':query_builder_fields, 'state':[('back','Change cube'),('exec', 'Execute'),('end', 'Cancel')]}
+              },
+
+        'exec': {
+            'actions': [_execute_mdx],
+            'result': {'type':'form','arch':query_builder_form,'fields':query_builder_fields,'state':[('back','Change cube'),('exec', 'Execute'),('end', 'Cancel')]},
+        },
+        'back':{
+            'actions':[],
+            'result':{'type':'form','arch':query_builder_fetch_form,'fields':query_builder_fetch_fields,'state':[('ok', 'Fetch Data')]},
+        },
+    }
+wizard_query_builder('olap.query_builder')
\ No newline at end of file
diff --git a/addons/olap/wizard/wizard_test_connection.py b/addons/olap/wizard/wizard_test_connection.py
new file mode 100755
index 00000000000..0ea5aa29edf
--- /dev/null
+++ b/addons/olap/wizard/wizard_test_connection.py
@@ -0,0 +1,52 @@
+import psycopg2
+
+import wizard
+import pooler
+import netsvc
+from tools.misc import UpdateableStr, UpdateableDict
+
+
+_connection_arch = UpdateableStr()
+
+def _test_connection(self,cr,uid,part,context={}):
+    lines=pooler.get_pool(cr.dbname).get('olap.fact.database').browse(cr, uid, part['id'],context)
+    host = lines.db_host
+    port = lines.db_port
+    db_name = lines.db_name
+    user = lines.db_login
+    password = lines.db_password
+    type = lines.type
+    return_str = "Connection Successful"
+    try:	
+        if type == 'postgres':
+            tdb = psycopg2.connect('host=%s port=%s dbname=%s user=%s password=%s' % (host, port, db_name, user, password))
+
+        elif type == 'mysql':
+            import MySQLdb
+            tdb = MySQLdb.connect(host = host,port = port, db = db_name, user = user, passwd = password)
+                
+
+        elif type == 'oracle':
+            import cx_Oracle
+            tdb = cx_Oracle.connect(user, password, host)
+                
+    except Exception, e:
+            return_str = e.message
+
+    _arch = ['''<?xml version="1.0"?>''', '''<form string="Connection Status">''']
+    _arch.append('''<label string='%s' />''' % (return_str))
+    _arch.append('''</form>''')
+    _connection_arch.string = '\n'.join(_arch)
+
+    return {}
+
+
+
+class wizard_test_connection(wizard.interface):
+    states = {
+        'init': {
+            'actions': [_test_connection],
+            'result': {'type':'form', 'arch': _connection_arch, 'fields':{}, 'state':[('end','Ok')]}
+        },
+    }
+wizard_test_connection('olap.fact.database.test_connection')
diff --git a/addons/olap_crm/__init__.py b/addons/olap_crm/__init__.py
new file mode 100755
index 00000000000..40d842dcc48
--- /dev/null
+++ b/addons/olap_crm/__init__.py
@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import olap_crm
\ No newline at end of file
diff --git a/addons/olap_crm/__terp__.py b/addons/olap_crm/__terp__.py
new file mode 100644
index 00000000000..794b65138b4
--- /dev/null
+++ b/addons/olap_crm/__terp__.py
@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+{
+    "name" : "olap_crm",
+    "version" : "0.1",
+    "author" : "Tiny",
+    "website" : "http://www.openerp.com",
+    "depends" : ["olap"],
+    "category" : "Generic Modules/Olap",
+    "description": """
+    Sale module will load the data in olap tables
+    """,
+    "init_xml" :  ['olap_data.xml'],
+    "update_xml" :[],
+    "demo_xml" : ['olap_crm.xml'],
+    "active": False,
+    "installable": True
+}
diff --git a/addons/olap_crm/i18n/fr_BE.po b/addons/olap_crm/i18n/fr_BE.po
new file mode 100644
index 00000000000..f93a3dfa8e2
--- /dev/null
+++ b/addons/olap_crm/i18n/fr_BE.po
@@ -0,0 +1,29 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap_crm
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:29:03+0000\n"
+"PO-Revision-Date: 2009-11-26 05:29:03+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: 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 ""
+
diff --git a/addons/olap_crm/i18n/olap_crm.pot b/addons/olap_crm/i18n/olap_crm.pot
new file mode 100644
index 00000000000..f93a3dfa8e2
--- /dev/null
+++ b/addons/olap_crm/i18n/olap_crm.pot
@@ -0,0 +1,29 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap_crm
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:29:03+0000\n"
+"PO-Revision-Date: 2009-11-26 05:29:03+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: 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 ""
+
diff --git a/addons/olap_crm/olap_crm.xml b/addons/olap_crm/olap_crm.xml
new file mode 100755
index 00000000000..96dadb7d783
--- /dev/null
+++ b/addons/olap_crm/olap_crm.xml
@@ -0,0 +1,462 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="True">
+
+<!--
+CUSTOM CUBE FOR CRM
+-->
+
+  <record model="olap.fact.database" id="fact_databases_BI">
+    <field name="name">Open ERP CRM Database</field>
+    <field name="db_name">crm</field>
+    <field name="db_login">postgres</field>
+    <field name="db_password">postgres</field>
+  </record>
+<!--
+Schema
+-->
+  <record model="olap.schema" id="schema_crm">
+    <field name="name">OpenERPCRM</field>
+    <field name="state">none</field>
+    <field name="database_id" ref="fact_databases_BI"/>
+  </record>
+
+<!--
+Adding the database tables and database columns to be used and making up the of the
+cube table and cube table line
+-->
+
+
+<!-- Olap Database Tables -->
+    <record model="olap.database.tables" id="table_crm_case">
+        <field name="name">crm_case</field>
+        <field name="table_db_name">crm_case</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_crm_case_categ">
+        <field name="name">crm_case_categ</field>
+        <field name="table_db_name">crm_case_categ</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_crm_case_stage">
+        <field name="name">crm_case_stage</field>
+        <field name="table_db_name">crm_case_stage</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_res_partner">
+        <field name="name">res_partner</field>
+        <field name="table_db_name">res_partner</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+     <record model="olap.database.tables" id="table_crm_case_section">
+        <field name="name">crm_case_section</field>
+        <field name="table_db_name">crm_case_section</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.tables" id="table_res_partner_canal">
+        <field name="name">res_partner_canal</field>
+        <field name="table_db_name">res_partner_canal</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+   
+<!-- Olap Database Columns -->
+
+    
+    <record model="olap.database.columns" id="crm_case_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="crm_case_planned_revenue">
+        <field name="name">planned_revenue</field>
+        <field name="column_db_name">planned_revenue</field>
+        <field name="type">float8</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="crm_case_partner_id">
+        <field name="name">parnter_id</field>
+        <field name="column_db_name">partner_id</field>
+        <field name="type">float8</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="active">True</field>
+        <field name="related_to" ref="table_res_partner"/>
+    </record>
+ 
+    <record model="olap.database.columns" id="crm_case_planned_cost">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">float8</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="crm_case_probability">
+        <field name="name">probability</field>
+        <field name="column_db_name">probability</field>
+        <field name="type">float8</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="crm_case_state">
+        <field name="name">state</field>
+        <field name="column_db_name">state</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="res_partner_canal_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_partner_canal"/>
+        <field name="active">True</field>
+    </record>
+
+
+
+
+
+    <record model="olap.database.columns" id="crm_case_categ_id">
+        <field name="name">categ_id</field>
+        <field name="column_db_name">categ_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="related_to" ref="table_crm_case_categ"/>
+    </record>
+
+    <record model="olap.database.columns" id="crm_case_partner_id">
+        <field name="name">partner_id</field>
+        <field name="column_db_name">partner_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="related_to" ref="table_res_partner"/>
+    </record>    
+
+    <record model="olap.database.columns" id="crm_case_canal_id">
+        <field name="name">canal_id</field>
+        <field name="column_db_name">canal_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="related_to" ref="table_res_partner_canal"/>
+    </record>
+
+
+    <record model="olap.database.columns" id="res_partner_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_partner"/>
+    </record>
+
+    <record model="olap.database.columns" id="crm_case_section_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_crm_case_section"/>
+    </record>
+    <record model="olap.database.columns" id="crm_case_stage_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_crm_case_stage"/>
+    </record>
+
+    <record model="olap.database.columns" id="crm_case_stage_id">
+        <field name="name">stage_id</field>
+        <field name="column_db_name">stage_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="related_to" ref="table_crm_case_stage"/>
+    </record>
+
+    <record model="olap.database.columns" id="crm_case_stage_section_id">
+        <field name="name">section_id</field>
+        <field name="column_db_name">section_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_crm_case_stage"/>
+        <field name="related_to" ref="table_crm_case_section"/>
+    </record>
+
+    <record model="olap.database.columns" id="crm_case_categ_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_crm_case_categ"/>
+    </record>
+
+
+
+<!-- Cube-->
+
+    <!-- Cube Table -->
+    <record model="olap.cube.table" id="crm_cube_table">
+        <field name="name">crm_cube</field>
+        <field name='schema_id' ref='schema_crm'/>
+        <field name='column_link_id' ref='crm_case_id'/>
+    </record>
+
+
+    <record model="olap.cube.table" id="crm_cube_section_table">
+        <field name="name">crm_cube_section</field>
+        <field name='schema_id' ref='schema_crm'/>
+        <field name='column_link_id' ref='crm_case_stage_id'/>
+    </record>
+
+    <record model="olap.cube.table" id="crm_cube_stage_table">
+        <field name="name">crm_cube_stage_parnter</field>
+        <field name='schema_id' ref='schema_crm'/>
+        <field name='column_link_id' ref='crm_case_stage_id'/>
+    </record>
+    <record model="olap.cube.table" id="crm_cube_parnter_table">
+        <field name="name">crm_cube_parnter</field>
+        <field name='schema_id' ref='schema_crm'/>
+        <field name='column_link_id' ref='crm_case_partner_id'/>
+    </record>
+
+
+    <record model="olap.cube.table" id="crm_cube_categ_table">
+        <field name="name">crm_cube_categ</field>
+        <field name='schema_id' ref='schema_crm'/>
+        <field name='column_link_id' ref='crm_case_categ_id'/>
+    </record>
+
+    <record model="olap.cube.table" id="crm_cube_channel_table">
+        <field name="name">crm_cube_channel</field>
+        <field name='schema_id' ref='schema_crm'/>
+        <field name='column_link_id' ref='crm_case_canal_id'/>
+    </record>
+
+
+    <!-- Cube  Table Line -->
+    <record model="olap.cube.table.line" id="crm_cube_table_line">
+        <field name="field_id" ref="crm_case_categ_id"/>
+        <field name="table_id" ref="table_crm_case"/>
+        <field name="cube_table_id" ref="crm_cube_table"/>
+    </record>
+
+    <record model="olap.cube.table.line" id="crm_section_table_line">
+        <field name="field_id" ref="crm_case_stage_section_id"/>
+        <field name="table_id" ref="table_crm_case_stage"/>
+        <field name="cube_table_id" ref="crm_cube_section_table"/>
+    </record>
+    <!-- Cube -->
+
+    <record model="olap.cube" id="cube_crm">
+        <field name="name">CRM</field>
+        <field name="table_id" ref="crm_cube_table"/>
+        <field name="schema_id" ref="schema_crm"/>
+    </record>
+
+<!--
+DIMENSION Sections
+
+-->
+    
+    <record model="olap.dimension" id="dimension_crm_section">
+        <field name="name">Sections</field>
+        <field name="cube_id" ref="cube_crm"/>
+    </record>
+
+
+    <record model="olap.hierarchy" id="hierarchy_crm_section">
+        <field name="name">Sections</field>
+        <field name="dimension_id" ref="dimension_crm_section"/>
+        <field name="table_id" ref="crm_cube_section_table"/>
+    </record>
+
+    <record model="olap.level" id="level_crm_section">
+        <field name="name">Sections</field>
+        <field name="column_name" ref="crm_case_section_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">crm_case_section</field>
+        <field name="hierarchy_id" ref="hierarchy_crm_section"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record model="olap.level" id="level_crm_section_seq_2">
+        <field name="name">States</field>
+        <field name="column_name" ref="crm_case_stage_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">crm_case_stage</field>
+        <field name="hierarchy_id" ref="hierarchy_crm_section"/>
+        <field name="sequence">2</field>
+    </record>
+
+<!-- Dimension State-->
+
+    <record model="olap.dimension" id="dimension_crm_state">
+        <field name="name">States</field>
+        <field name="cube_id" ref="cube_crm"/>
+    </record>
+
+
+    <record model="olap.hierarchy" id="hierarchy_crm_state">
+        <field name="name">States</field>
+        <field name="dimension_id" ref="dimension_crm_state"/>
+        <field name="table_id" ref="crm_cube_table"/>
+    </record>
+
+    <record model="olap.level" id="level_crm_section">
+        <field name="name">States</field>
+        <field name="column_name" ref="crm_case_state"></field>
+        <field name="column_id_name">state</field>
+        <field name="table_name">crm_case</field>
+        <field name="hierarchy_id" ref="hierarchy_crm_state"/>
+        <field name="sequence">1</field>
+    </record>
+
+    <record model="olap.level" id="level_crm_section_seq_2">
+        <field name="name">States</field>
+        <field name="column_name" ref="crm_case_stage_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">crm_case_stage</field>
+        <field name="hierarchy_id" ref="hierarchy_crm_section"/>
+        <field name="sequence">2</field>
+    </record>
+
+
+
+<!--
+Category
+-->
+    <record model="olap.dimension" id="dimension_crm_category">
+        <field name="name">Category</field>
+        <field name="cube_id" ref="cube_crm"/>
+    </record>
+
+
+    <record model="olap.hierarchy" id="hierarchy_crm_category">
+        <field name="name">Category</field>
+        <field name="dimension_id" ref="dimension_crm_category"/>
+        <field name="primary_key_table">crm_case</field>
+        <field name="table_id" ref="crm_cube_categ_table"/>
+    </record>
+
+    <record model="olap.level" id="level_crm_categorys">
+        <field name="name">name</field>
+        <field name="column_name" ref="crm_case_categ_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">crm_case_categ</field>
+        <field name="hierarchy_id" ref="hierarchy_crm_category"/>
+    </record>
+
+<!--
+    Customer
+-->
+    <record model="olap.dimension" id="dimension_crm_customer">
+        <field name="name">Customer</field>
+        <field name="cube_id" ref="cube_crm"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_crm_customer">
+        <field name="name">Customer</field>
+        <field name="dimension_id" ref="dimension_crm_customer"/>
+        <field name="primary_key_table">crm_case</field>
+        <field name="table_id" ref="crm_cube_parnter_table"/>
+    </record>
+
+    <record model="olap.level" id="level_crm_category">
+        <field name="name">name</field>
+        <field name="column_name" ref="res_partner_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">res_partner</field>
+        <field name="hierarchy_id" ref="hierarchy_crm_customer"/>
+    </record>
+
+
+    
+    <record model="olap.dimension" id="dimension_crm_channel">
+        <field name="name">Channels</field>
+        <field name="cube_id" ref="cube_crm"/>
+    </record>
+
+
+    <record model="olap.hierarchy" id="hierarchy_crm_channel">
+        <field name="name">Channel</field>
+        <field name="dimension_id" ref="dimension_crm_channel"/>
+        <field name="table_id" ref="crm_cube_channel_table"/>
+    </record>
+
+    <record model="olap.level" id="level_crm_channel">
+        <field name="name">Channel</field>
+        <field name="column_name" ref="res_partner_canal_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">res_partner_canal</field>
+        <field name="hierarchy_id" ref="hierarchy_crm_channel"/>
+        <field name="sequence">1</field>
+    </record>
+
+
+
+<!--
+Measures
+-->
+
+    <record model="olap.measure" id="measure_crm_total_cases">
+        <field name="name">Total Cases</field>
+        <field name="cube_id" ref="cube_crm"/>
+        <field name="measure_type">sql_expr</field>
+        <field name="value_sql">count(crm_case.id)</field>
+    </record>
+
+    <record model="olap.measure" id="measure_crm_avg_planned_cost">
+        <field name="name">Average Planned Revenue</field>
+        <field name="cube_id" ref="cube_crm"/>
+        <field name="measure_type">sql_expr</field>
+        <field name="value_sql">avg(crm_case.planned_revenue)</field>
+        <field name="formatstring">cr_postfix_comma</field>
+    </record>
+
+    <record model="olap.measure" id="measure_crm_avg_planned_revenue">
+        <field name="name">Average Planned Cost</field>
+        <field name="cube_id" ref="cube_crm"/>
+        <field name="measure_type">sql_expr</field>
+        <field name="value_sql">avg(crm_case.planned_cost)</field>
+        <field name="formatstring">cr_postfix_comma</field>
+    </record>
+    
+     <record model="olap.measure" id="measure_planned_revenue">
+        <field name="name">Planned Revenue</field>
+        <field name="cube_id" ref="cube_crm"/>
+        <field name="value_column" ref="crm_case_planned_cost"></field>
+        <field name="value_column_id_name">planned_cost</field>
+        <field name="table_name">crm_case</field>
+        <field name="agregator">sum</field>
+        <field name="formatstring">cr_postfix_comma</field>
+    </record>
+ 
+    <record model="olap.measure" id="measure_planned_revenue">
+        <field name="name">Planned Revenue</field>
+        <field name="cube_id" ref="cube_crm"/>
+        <field name="value_column" ref="crm_case_planned_revenue"></field>
+        <field name="value_column_id_name">planned_revenue</field>
+        <field name="table_name">crm_case</field>
+        <field name="agregator">sum</field>
+    </record>
+    
+    <record model="olap.measure" id="measure_probability">
+        <field name="name">Probability</field>
+        <field name="cube_id" ref="cube_crm"/>
+        <field name="value_column" ref="crm_case_probability"></field>
+        <field name="value_column_id_name">probability</field>
+        <field name="table_name">crm_case</field>
+        <field name="agregator">sum</field>
+    </record>
+d
+</data>
+</openerp>
+
diff --git a/addons/olap_crm/olap_data.xml b/addons/olap_crm/olap_data.xml
new file mode 100755
index 00000000000..d36ec6161fe
--- /dev/null
+++ b/addons/olap_crm/olap_data.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+</data>
+</openerp>
diff --git a/addons/olap_extract/__init__.py b/addons/olap_extract/__init__.py
new file mode 100755
index 00000000000..8ec082d25fb
--- /dev/null
+++ b/addons/olap_extract/__init__.py
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import olap_extract
+import wizard_olap_extract
\ No newline at end of file
diff --git a/addons/olap_extract/__terp__.py b/addons/olap_extract/__terp__.py
new file mode 100644
index 00000000000..6e44d5e7e43
--- /dev/null
+++ b/addons/olap_extract/__terp__.py
@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+{
+    "name" : "Module to extracts the schema structure",
+    "version" : "0.1",
+    "author" : "Tiny",
+    "website" : "http://www.openerp.com",
+    "depends" : ["olap"],
+    "category" : "Generic Modules/Olap",
+    "description": """
+    Extracts the schema structure.
+    """,
+    "init_xml" :  [],
+    "update_xml" : ["olap_extract_wizard.xml"],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}
diff --git a/addons/olap_extract/i18n/fr_BE.po b/addons/olap_extract/i18n/fr_BE.po
new file mode 100644
index 00000000000..92f455fcebd
--- /dev/null
+++ b/addons/olap_extract/i18n/fr_BE.po
@@ -0,0 +1,54 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap_extract
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:29:21+0000\n"
+"PO-Revision-Date: 2009-11-26 05:29:21+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: olap_extract
+#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
+msgid "olap_extract"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,ok:0
+msgid "OK"
+msgstr ""
+
+#. 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 ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_view:olap.extract.schema,init:0
+msgid "New Module Name"
+msgstr ""
+
diff --git a/addons/olap_extract/i18n/olap_extract.pot b/addons/olap_extract/i18n/olap_extract.pot
new file mode 100644
index 00000000000..92f455fcebd
--- /dev/null
+++ b/addons/olap_extract/i18n/olap_extract.pot
@@ -0,0 +1,54 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap_extract
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:29:21+0000\n"
+"PO-Revision-Date: 2009-11-26 05:29:21+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: olap_extract
+#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
+msgid "olap_extract"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,ok:0
+msgid "OK"
+msgstr ""
+
+#. 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 ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_view:olap.extract.schema,init:0
+msgid "New Module Name"
+msgstr ""
+
diff --git a/addons/olap_extract/olap_extract_wizard.xml b/addons/olap_extract/olap_extract_wizard.xml
new file mode 100755
index 00000000000..7de48f3c7ac
--- /dev/null
+++ b/addons/olap_extract/olap_extract_wizard.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+		<wizard
+			string="Olap Extract"
+			model="olap.schema"
+			name="olap.extract.schema"
+			menu= "True"
+ 			id="bi_olap_extract_schema"/>
+
+	</data>
+</openerp>
diff --git a/addons/olap_extract/wizard_olap_extract.py b/addons/olap_extract/wizard_olap_extract.py
new file mode 100755
index 00000000000..e71d2cb7fe6
--- /dev/null
+++ b/addons/olap_extract/wizard_olap_extract.py
@@ -0,0 +1,249 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import wizard
+import pooler
+import csv
+import os
+import time
+import netsvc
+import zipfile
+
+
+form1 = '''<?xml version="1.0"?>
+<form string="New Module Name">
+    <field name='module_name'/>
+</form>'''
+
+field1 = {
+    'module_name': {'string':'Module Name', 'type':'char','size':'64', 'required':True},
+}
+
+
+class wizard_olap_extract(wizard.interface):
+    
+    def zipper(self,zipname,filename,mode="a"):
+        z = zipfile.ZipFile(zipname+".zip", mode)
+        z.write(filename)
+        print "\n",z.printdir()
+ 
+    
+    def write_csv(self,filename,content=[]):
+        fid = open(filename, 'w')        
+        if fid == -1:
+            print 'File: temp.csv not found or could not be opened'
+            return False
+        else:
+            writer=csv.writer(fid, 'TINY',delimiter=',')
+            for row in content:
+                writer.writerow(row)
+            fid.close    
+        return True
+    
+    def table_depth(self,cr,uid,list=[],context={}):
+
+        res={}
+        templeft={}
+        tempright={}
+        for table_id in list:
+            lines=pooler.get_pool(cr.dbname).get('olap.cube.table').browse(cr, uid,table_id,context)            
+            res[str(lines.id)] = ["cubetable_"+str(lines.id),lines.name and lines.name or '',lines.table_alias and lines.table_alias or '',lines.key_left and lines.key_left or '',lines.key_right and lines.key_right or '',lines.table_left_id.id and "cubetable_"+str(lines.table_left_id.id) or '',lines.table_right_id.id and "cubetable_"+str(lines.table_right_id.id) or '']
+            if(lines.table_left_id.id):
+                templeft = self.table_depth(cr,uid,[lines.table_left_id.id],context)
+        
+                if templeft:
+                    for temp in templeft:
+                        if not res.has_key(temp):
+                            res[temp]= templeft[temp]
+
+
+            if(lines.table_right_id.id):
+                tempright = self.table_depth(cr,uid,[lines.table_right_id.id],context) 
+        
+                if tempright:
+                    for temp in tempright:
+                        if not res.has_key(temp):
+                            res[temp]= tempright[temp]
+        return res
+        
+    
+    def _extract_schema(self, cr, uid, data, context={}):
+
+        _name = data['form']['module_name']
+        _modulename = "olap_"+_name
+        
+        dirname = _modulename
+        if not os.path.isdir("./addons/" + dirname + "/"):
+            os.mkdir("./addons/" + dirname + "/")        
+        
+        os.chdir("./addons/"+dirname)
+
+        _init = "import %s" % _modulename
+        f = open("__init__.py","w")
+        f.write(_init)
+        f.close()
+        self.zipper(_modulename, "__init__.py","w")
+        
+        _init_files = {
+                       "1":"olap.fact.database.csv",
+                       "2":"olap.schema.csv",
+                       "5":"olap.cube.table.csv",
+                       "6":"olap.cube.csv",
+                       "7":"olap.dimension.csv",
+                       "8":"olap.hierarchy.csv",
+                       "9":"olap.level.csv",
+                       "10":"olap.measure.csv"                    
+                       }        
+        _init_xml = """"%(1)s",
+                    "%(2)s",
+                    "%(5)s",
+                    "%(6)s",
+                    "%(7)s",
+                    "%(8)s",
+                    "%(9)s",
+                    "%(10)s",
+        """ % _init_files
+        
+        data['modulename'] = _modulename
+        data['init_xml'] = _init_xml
+
+        _terp= """{
+                "name" : "%(modulename)s",
+                "version" : "0.1",
+                "author" : "Tiny",
+                "website" : "http://tinyerp.com/",
+                "depends" : ["olap"],
+                "category" : "Generic Modules/Others",
+                "description": "Module will load the data in olap tables",
+                "init_xml" :[
+                    %(init_xml)s
+                    ],
+                "update_xml" : [],
+                "demo_xml" : [],
+                "active": False,
+                "installable": True
+            }"""%data
+
+        f = open("__terp__.py","w")
+        f.write(_terp)
+        f.close()        
+        self.zipper(_modulename, "__terp__.py")  
+                  
+
+        schema_id = data['id']
+
+        lines=pooler.get_pool(cr.dbname).get('olap.schema').browse(cr, uid, schema_id,context)
+        
+        _extract=[]
+        _extract.append(['id','name','db_name','db_login','db_password'])
+        _extract.append(["db_"+str(lines.database_id.id),lines.database_id.name,lines.database_id.db_name,lines.database_id.db_login,lines.database_id.db_password])
+        self.write_csv('olap.fact.database.csv',_extract)
+        self.zipper(_modulename, "olap.fact.database.csv")
+        
+        _extract=[]
+        _extract.append(['id','name','database_id:id','loaded','configure','ready','state','note'])
+        _extract.append(["schema_"+str(lines.id),lines.name,"db_"+str(lines.database_id.id),lines.loaded and lines.loaded or '',lines.configure and lines.configure or '', lines.ready and lines.ready or '',lines.state,lines.note and lines.note or ''])
+        self.write_csv('olap.schema.csv',_extract)
+        self.zipper(_modulename, "olap.schema.csv")                
+        
+        cube_ids = lines.cube_ids
+        _extractcubes=[]
+        _extractcubes.append(['id','name','table_id:id','schema_id:id'])
+        
+        _extractmeasures=[]
+        _extractmeasures.append(['id','name','cube_id:id','value_column','value_sql','agregator','datatype','formatstring'])        
+        
+        _extractdimension=[]
+        _extractdimension.append(['id','name','foreign_key','foreign_key_table','cube_id:id'])
+        
+        _extracthiers=[]
+        _extracthiers.append(['id','name','primary_key','primary_key_table','field_name','member_all','member_default','sequence','type','dimension_id:id','table_id:id'])
+
+        _extractlevels=[]
+        _extractlevels.append(['id','name','column_name','column_id_name','type','table_name','sequence','hierarchy_id:id'])
+
+        _cube_table_ids = []
+        for cube in cube_ids:
+            _extractcubes.append(["cube_"+str(cube.id),cube.name,"cubetable_"+str(cube.table_id.id),"schema_"+str(cube.schema_id.id)])    
+            _cube_table_ids.append(cube.table_id.id)   
+            
+            measure_ids = cube.measure_ids
+            for measure in measure_ids:
+                _extractmeasures.append(["msr_"+str(measure.id),measure.name,"cube_"+str(measure.cube_id.id),measure.value_column and measure.value_column or '',measure.value_sql and measure.value_sql or '',measure.agregator,measure.datatype and measure.datatype or '',measure.formatstring])        
+            
+            dimension_ids = cube.dimension_ids
+            for dimension in dimension_ids:
+                _extractdimension.append(["dim_"+str(dimension.id),dimension.name,dimension.foreign_key and dimension.foreign_key or '',dimension.foreign_key_table and dimension.foreign_key_table or '',"cube_"+str(dimension.cube_id.id)])
+                
+                hiers_ids = dimension.hierarchy_ids
+                for hier in hiers_ids:
+                    _extracthiers.append(["hier_"+str(hier.id),hier.name,hier.primary_key,hier.primary_key_table and hier.primary_key_table or '',hier.field_name,hier.member_all,hier.member_default,hier.sequence,hier.type,"dim_"+str(hier.dimension_id.id),"cubetable_"+str(hier.table_id.id)])
+                    _cube_table_ids.append(hier.table_id.id)
+                    
+                    level_ids = hier.level_ids
+                    for level in level_ids:
+                        _extractlevels.append(["lvl_"+str(level.id),level.name,level.column_name,level.column_id_name,level.type,level.table_name,level.sequence,"hier_"+str(level.hierarchy_id.id)])
+                        
+        res={}
+        _extract=[]
+        _extract.append(['id','name','table_alias','key_left','key_right','table_left_id:id','table_right_id:id'])
+        res = self.table_depth(cr,uid,_cube_table_ids,context)
+        key = res.keys()
+        key = map(lambda x: int(x),key)
+        key.sort()
+        
+        for k in key:
+            _extract.append(res[str(k)])
+        
+        self.write_csv('olap.cube.csv',_extractcubes)
+        self.zipper(_modulename, "olap.cube.csv")
+        
+        self.write_csv('olap.measure.csv',_extractmeasures)
+        self.zipper(_modulename, "olap.measure.csv")   
+        
+        self.write_csv('olap.dimension.csv',_extractdimension)
+        self.zipper(_modulename, "olap.dimension.csv")
+        
+        self.write_csv('olap.hierarchy.csv',_extracthiers)
+        self.zipper(_modulename, "olap.hierarchy.csv")      
+        
+        self.write_csv('olap.level.csv',_extractlevels)
+        self.zipper(_modulename, "olap.level.csv")                                    
+
+        self.write_csv('olap.cube.table.csv',_extract)
+        self.zipper(_modulename, "olap.cube.table.csv")      
+
+        return {}
+        
+    states = {
+              
+       'init': {
+            'actions': [],
+            'result': {'type':'form','arch':form1, 'fields':field1, 'state':[('end','Cancel'),('ok','OK')]}
+        },              
+              
+        'ok' : {
+            'actions' : [],
+            'result' : {'type' : 'action' ,'action':_extract_schema,'state':'end'}
+        }
+      }
+
+wizard_olap_extract('olap.extract.schema')
diff --git a/addons/olap_sale/__init__.py b/addons/olap_sale/__init__.py
new file mode 100755
index 00000000000..5d7667acf15
--- /dev/null
+++ b/addons/olap_sale/__init__.py
@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import olap_sale
\ No newline at end of file
diff --git a/addons/olap_sale/__terp__.py b/addons/olap_sale/__terp__.py
new file mode 100644
index 00000000000..d94e6ee956d
--- /dev/null
+++ b/addons/olap_sale/__terp__.py
@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+{
+    "name" : "Load Sale Module data in Olap Tables",
+    "version" : "0.1",
+    "author" : "Tiny",
+    "website" : "http://www.openerp.com",
+    "depends" : ["olap"],
+    "category" : "Generic Modules/Olap",
+    "description": """
+    Sale module will load the data in olap tables
+    """,
+    "init_xml" :  ['olap_data.xml'],
+    "update_xml" :[],
+    "demo_xml" : ['olap_sale.xml'],
+    "active": False,
+    "installable": True
+}
diff --git a/addons/olap_sale/i18n/fr_BE.po b/addons/olap_sale/i18n/fr_BE.po
new file mode 100644
index 00000000000..a9f03334ab3
--- /dev/null
+++ b/addons/olap_sale/i18n/fr_BE.po
@@ -0,0 +1,29 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:29:36+0000\n"
+"PO-Revision-Date: 2009-11-26 05:29:36+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: olap_sale
+#: model:ir.module.module,description:olap_sale.module_meta_information
+msgid "\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+
+#. module: olap_sale
+#: model:ir.module.module,shortdesc:olap_sale.module_meta_information
+msgid "olap_sale"
+msgstr ""
+
diff --git a/addons/olap_sale/i18n/olap_sale.pot b/addons/olap_sale/i18n/olap_sale.pot
new file mode 100644
index 00000000000..a9f03334ab3
--- /dev/null
+++ b/addons/olap_sale/i18n/olap_sale.pot
@@ -0,0 +1,29 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* olap_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 05:29:36+0000\n"
+"PO-Revision-Date: 2009-11-26 05:29:36+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: olap_sale
+#: model:ir.module.module,description:olap_sale.module_meta_information
+msgid "\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+
+#. module: olap_sale
+#: model:ir.module.module,shortdesc:olap_sale.module_meta_information
+msgid "olap_sale"
+msgstr ""
+
diff --git a/addons/olap_sale/olap_data.xml b/addons/olap_sale/olap_data.xml
new file mode 100755
index 00000000000..d36ec6161fe
--- /dev/null
+++ b/addons/olap_sale/olap_data.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+</data>
+</openerp>
diff --git a/addons/olap_sale/olap_sale.xml b/addons/olap_sale/olap_sale.xml
new file mode 100644
index 00000000000..42b6b327dc9
--- /dev/null
+++ b/addons/olap_sale/olap_sale.xml
@@ -0,0 +1,753 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="True">
+
+<!--
+CUSTOM CUBE FOR SALES
+-->
+
+    <record model="olap.fact.database" id="fact_databases_BI">
+        <field name="name">OpenERP Sales Databases</field>
+        <field name="db_name">sales</field>
+        <field name="db_login">postgres</field>
+        <field name="db_password">postgres</field>
+    </record>
+<!--
+Schema
+-->
+    <record model="olap.schema" id="schema_main_sales">
+        <field name="name">OpenERPSales</field>
+        <field name="state">none</field>
+        <field name="database_id" ref="fact_databases_BI"/>
+    </record>
+
+<!--
+Adding the database tables and database columns to be used and making up the of the
+cube table and cube table line
+-->
+
+    <record model="olap.database.tables" id="table_sale_order_line">
+        <field name="name">sale_order_line</field>
+        <field name="table_db_name">sale_order_line</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_sale_order">
+        <field name="name">sale_order</field>
+        <field name="table_db_name">sale_order</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_product_product">
+        <field name="name">product_product</field>
+        <field name="table_db_name">product_product</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_product_template">
+        <field name="name">product_template</field>
+        <field name="table_db_name">product_template</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_product_category">
+        <field name="name">product_category</field>
+        <field name="table_db_name">product_category</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.tables" id="table_res_partner_address">
+        <field name="name">res_partner_address</field>
+        <field name="table_db_name">res_partner_address</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>	
+
+    <record model="olap.database.tables" id="table_res_country">
+        <field name="name">res_country</field>
+        <field name="table_db_name">res_country</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_res_user">
+        <field name="name">res_users</field>
+        <field name="table_db_name">res_users</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.tables" id="table_res_partner">
+        <field name="name">res_partner</field>
+        <field name="table_db_name">res_partner</field>
+        <field name="fact_database_id" ref="fact_databases_BI"/>
+        <field name="active">True</field>
+
+    </record>	
+    <record model="olap.database.columns" id="columns_product_id_sale_order_line">
+        <field name="name">product_id</field>
+        <field name="column_db_name">product_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="related_to" ref="table_product_product"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_product_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_product_product"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+</record>
+<!--	<record model="olap.database.columns" id="columns_sale_order_line_product_id">
+		<field name="name">product_id</field>
+		<field name="column_db_name">id</field>
+		<field name="type">int4</field>
+		<field name="table_id" ref="table_sale_order_line"/>
+		<field name="active">True</field>
+		<field name="related_to" ref="table_product_product"/>
+	</record>
+-->	
+    <record model="olap.database.columns" id="columns_product_template_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_product_template"/>
+        <field name="active">True</field>
+        <field name="primary_key">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_line_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="active">True</field>
+        <field name="primary_key">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order"/>
+        <field name="active">True</field>
+        <field name="primary_key">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_amount_total">
+        <field name="name">amount_total</field>
+        <field name="column_db_name">amount_total</field>
+        <field name="type">float8</field>
+        <field name="table_id" ref="table_sale_order"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_user_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_user"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_category_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_product_category"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_template_category_id">
+        <field name="name">categ_id</field>
+        <field name="column_db_name">categ_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_product_template"/>
+        <field name="related_to" ref="table_product_category"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_template_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_product_template"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_partner_address_city">
+        <field name="name">city</field>
+        <field name="column_db_name">city</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_partner_address"/>
+        <field name="active">True</field>
+    </record>
+    <record model="olap.database.columns" id="columns_res_country_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_country"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_product_product_tmpl_id">
+        <field name="name">product_tmpl_id</field>
+        <field name="column_db_name">product_tmpl_id</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_product_product"/>
+        <field name="related_to" ref="table_product_template"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_category_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_product_category"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_template_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_product_template"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_product_product_default_code">
+        <field name="name">default_code</field>
+        <field name="column_db_name">default_code</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_product_product"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_date_order">
+        <field name="name">date_order</field>
+        <field name="column_db_name">date_order</field>
+        <field name="type">date</field>
+        <field name="table_id" ref="table_sale_order"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_line_product_uom_qty">
+        <field name="name">product_uom_qty</field>
+        <field name="column_db_name">product_uom_qty</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_line_price_unit">
+        <field name="name">price_unit</field>
+        <field name="column_db_name">price_unit</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_line_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+
+<!--	<record model="olap.database.columns" id="columns_sale_order_line_product_id">
+<field name="name">product_id</field>
+<field name="column_db_name">product_id</field>
+<field name="type">int4</field>
+<field name="table_id" ref="table_sale_order_line"/>
+<field name="related_to" ref="table_product_product"/>
+<field name="active">True</field>
+
+</record>
+-->
+    <record model="olap.database.columns" id="columns_sale_order_line_order_id">
+        <field name="name">order_id</field>
+        <field name="column_db_name">order_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="related_to" ref="table_sale_order"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_partner_id">
+        <field name="name">partner_id</field>
+        <field name="column_db_name">partner_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order"/>
+        <field name="related_to" ref="table_res_partner"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_partner_address_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_res_partner_address"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_partner_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_res_partner"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_partner_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_partner"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_user_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_res_user"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_country_id">
+        <field name="name">id</field>
+        <field name="column_db_name">id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_res_country"/>
+        <field name="primary_key">True</field>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_partner_order_id">
+        <field name="name">partner_order_id</field>
+        <field name="column_db_name">partner_order_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order"/>
+        <field name="related_to" ref="table_res_partner_address"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_user_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_user"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_res_country_name">
+        <field name="name">name</field>
+        <field name="column_db_name">name</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_country"/>
+        <field name="active">True</field>
+    </record>	
+
+    <record model="olap.database.columns" id="columns_res_partner_address_country_id">
+        <field name="name">country_id</field>
+        <field name="column_db_name">country_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_res_partner_address"/>
+        <field name="related_to" ref="table_res_country"/>
+        <field name="active">True</field>
+    </record>	
+
+    <record model="olap.database.columns" id="columns_res_partner_address_city">
+        <field name="name">city</field>
+        <field name="column_db_name">city</field>
+        <field name="type">varchar</field>
+        <field name="table_id" ref="table_res_partner_address"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_line_order_id">
+        <field name="name">order_id</field>
+        <field name="column_db_name">order_id</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="related_to" ref="table_sale_order"/>
+        <field name="active">True</field>
+    </record>
+
+<!--	<record model="olap.database.columns" id="columns_sale_order_line_product_id">
+<field name="name">product_id</field>
+<field name="column_db_name">product_id</field>
+<field name="type">int4</field>
+<field name="table_id" ref="table_sale_order_line"/>
+<field name="related_to" ref="table_product_product"/>
+<field name="active">True</field>
+
+</record>
+-->
+    <record model="olap.database.columns" id="columns_sale_order_line_product_uom_qty">
+        <field name="name">product_uom_qty</field>
+        <field name="column_db_name">product_uom_qty</field>
+        <field name="type">numeric</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_line_price_unit">
+        <field name="name">price_unit</field>
+        <field name="column_db_name">price_unit</field>
+        <field name="type">numeric</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="active">True</field>
+    </record>
+
+    <record model="olap.database.columns" id="columns_sale_order_line_create_uid">
+        <field name="name">create_uid</field>
+        <field name="column_db_name">create_uid</field>
+        <field name="type">int4</field>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="related_to" ref="table_res_user"/>
+        <field name="active">True</field>
+    </record>
+
+
+<!--
+Making of the olap.cube.table and olap.cube.table.lines 
+
+-->
+    <record model="olap.cube.table" id="cube_table_sale_order_line">
+        <field name="name">Sales</field>
+        <field name='schema_id' ref='schema_main_sales'/>
+        <field name='column_link_id' ref='columns_sale_order_line_id'/>
+    </record>
+
+    <record model="olap.cube.table" id="cube_table_product_category">
+        <field name="name">Product Category</field>
+        <field name='schema_id' ref='schema_main_sales'/>
+        <field name='column_link_id' ref="columns_product_id_sale_order_line"/>
+    </record>
+
+    <record model="olap.cube.table.line" id="line_prodcut_category_line_21">
+        <field name="field_id" ref="columns_product_product_product_tmpl_id"/>
+        <field name="table_id" ref="table_product_product"/>
+        <field name="cube_table_id" ref="cube_table_product_category"/>
+    </record>
+
+    <record model="olap.cube.table.line" id="line_prodcut_category_line_31">
+        <field name="field_id" ref="columns_product_template_category_id"/>
+        <field name="table_id" ref="table_product_template"/>
+        <field name="cube_table_id" ref="cube_table_product_category"/>
+    </record>
+
+    <record model="olap.cube.table.line" id="line_sale_order_line">
+        <field name="field_id" ref="columns_sale_order_line_order_id"/>
+        <field name="table_id" ref="table_sale_order_line"/>
+        <field name="cube_table_id" ref="cube_table_sale_order_line"/>
+    </record>
+
+    <record model="olap.cube.table" id="product_table">
+        <field name="name">Sale Product</field>
+        <field name='schema_id' ref='schema_main_sales'/>
+        <field name='column_link_id' ref='columns_product_id_sale_order_line'/>
+    </record>
+
+    <record model="olap.cube.table" id="country_table">
+        <field name="name">Sale Country</field>
+        <field name='schema_id' ref='schema_main_sales'/>
+        <field name='column_link_id' ref='columns_sale_order_line_order_id'/>
+    </record>
+
+    <record model="olap.cube.table" id="address_table">
+        <field name='schema_id' ref='schema_main_sales'/>
+        <field name="name">sale_order_line</field>
+        <field name='column_link_id' ref='columns_sale_order_line_order_id'/>
+    </record>
+
+    <record model="olap.cube.table" id="date_table">
+        <field name="name">sale_order_line</field>
+        <field name='schema_id' ref='schema_main_sales'/>
+        <field name='column_link_id' ref='columns_sale_order_line_order_id'/>
+    </record>
+
+    <record model="olap.cube.table" id="user_table">
+        <field name="name">sale_order_line</field>
+        <field name='schema_id' ref='schema_main_sales'/>
+        <field name='column_link_id' ref='columns_sale_order_line_create_uid'/>
+    </record>
+
+    <record model="olap.cube.table.line" id="country_table_line_id_2">
+        <field name="field_id" ref="columns_sale_order_partner_order_id"/>
+        <field name="table_id" ref="table_sale_order"/>
+        <field name="cube_table_id" ref="country_table"/>
+    </record>
+
+    <record model="olap.cube.table.line" id="country_table_line_id_3">
+        <field name="field_id" ref="columns_res_partner_address_country_id"/>
+        <field name="table_id" ref="table_res_partner_address"/>
+        <field name="cube_table_id" ref="country_table"/>
+    </record>
+
+    <record model="olap.cube.table.line" id="country_table_line_id_31">
+        <field name="field_id" ref="columns_sale_order_partner_order_id"/>
+        <field name="table_id" ref="table_sale_order"/>
+        <field name="cube_table_id" ref="address_table"/>
+    </record>
+
+    <record model="olap.cube.table.line" id="country_table_line_id_41">
+        <field name="field_id" ref="columns_sale_order_partner_id"/>
+        <field name="table_id" ref="table_res_partner_address"/>
+        <field name="cube_table_id" ref="address_table"/>
+    </record>
+
+<!--
+Fact Table
+sale_order_line
+-->
+
+    <record model="olap.cube" id="cube_sales_order_line">
+        <field name="name">Sales</field>
+        <field name="table_id" ref="cube_table_sale_order_line"/>
+        <field name="schema_id" ref="schema_main_sales"/>
+    </record>
+
+<!--
+DIMENSION PRODUCT CATEGORY
+
+product_template (product_id)
+-->
+
+    <record model="olap.dimension" id="dimension_product_template">
+        <field name="name"> All Products</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_product_template">
+        <field name="name">All Products</field>
+        <field name="dimension_id" ref="dimension_product_template"/>
+        <field name="primary_key_table">product_product</field>
+        <field name="table_id" ref="product_table"/>
+    </record>
+
+    <record model="olap.level" id="level_product_template">
+        <field name="name">Product Code</field>
+        <field name="column_name" ref="columns_product_product_default_code"></field>
+        <field name="column_id_name">default_code</field>
+        <field name="table_name">product_product</field>
+        <field name="hierarchy_id" ref="hierarchy_product_template"/>
+    </record>
+<!--
+Adding of the product by the category
+-->
+    <record model="olap.dimension" id="dimension_product_category">
+        <field name="name">Products by Category</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_product_category">
+        <field name="name">Products Category</field>
+        <field name="dimension_id" ref="dimension_product_category"/>
+        <field name="primary_key_table">product_product</field>
+        <field name="table_id" ref="cube_table_product_category"/>
+    </record>
+
+    <record model="olap.level" id="level_product_category_1">
+        <field name="name">Product Category</field>
+        <field name="column_name" ref="columns_product_category_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">product_category</field>
+        <field name="hierarchy_id" ref="hierarchy_product_category"/>
+    </record>
+
+    <record model="olap.level" id="level_product_category_2">
+        <field name="name">Product</field>
+        <field name="column_name" ref="columns_product_template_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">product_template</field>
+        <field name="hierarchy_id" ref="hierarchy_product_category"/>
+    </record>
+<!--
+DIMENSION ORDER DATE
+sale_order (order_id)
+-->
+    <record model="olap.dimension" id="dimension_sales_order">
+        <field name="name">Order Date</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_sales_order">
+        <field name="name">Order Date</field>
+        <field name="dimension_id" ref="dimension_sales_order"/>
+        <field name="primary_key_table">sale_order</field>
+        <field name="table_id" ref="date_table"/>
+    </record>
+
+    <record model="olap.level" id="level_sales_order">
+        <field name="name">date_order</field>
+        <field name="column_name" ref="columns_sale_order_date_order"></field>
+        <field name="column_id_name">date_order</field>
+        <field name="type">date_year</field>
+        <field name="sequence">1</field>
+        <field name="table_name">sale_order</field>
+        <field name="hierarchy_id" ref="hierarchy_sales_order"/>
+    </record>
+
+    <record model="olap.level" id="level_sales_order_q">
+        <field name="name">date_order</field>
+        <field name="column_name" ref="columns_sale_order_date_order"></field>
+        <field name="column_id_name">date_order</field>
+        <field name="type">date_quarter</field>
+        <field name="sequence">2</field>
+        <field name="table_name">sale_order</field>
+        <field name="hierarchy_id" ref="hierarchy_sales_order"/>
+    </record>
+
+    <record model="olap.level" id="level_sales_order_m">
+        <field name="name">date_order</field>
+        <field name="column_name" ref="columns_sale_order_date_order"></field>
+        <field name="column_id_name">date_order</field>
+        <field name="type">date_month</field>
+        <field name="sequence">3</field>
+        <field name="table_name">sale_order</field>
+        <field name="hierarchy_id" ref="hierarchy_sales_order"/>
+    </record>
+<!--
+DIMENSION ORDER DATE
+
+partner_country (order_id)
+-->
+<!--
+DIMENSION PARTNER TO COUNTRY
+res_users (user_id)
+-->
+
+    <record model="olap.dimension" id="dimension_partner_country">
+        <field name="name">Country</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_partner_country">
+        <field name="name">Partner Country</field>
+        <field name="dimension_id" ref="dimension_partner_country"/>
+        <field name="primary_key_table">sale_order</field>
+        <field name="table_id" ref="country_table"/>
+    </record>
+
+    <record model="olap.level" id="level_partner_country">
+        <field name="name">country_id</field>
+        <field name="column_name" ref="columns_res_country_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">res_country</field>
+        <field name="hierarchy_id" ref="hierarchy_partner_country"/>
+    </record>
+
+<!--
+DIMENSION PARTNER_ADDRESS TO COUNTRY
+-->
+
+    <record model="olap.dimension" id="dimension_partner_address_country">
+        <field name="name">Sales by Partner City</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_partner_address_country">
+        <field name="name">City</field>
+        <field name="dimension_id" ref="dimension_partner_address_country"/>
+        <field name="primary_key_table">sale_order</field>
+        <field name="table_id" ref="address_table"/>
+    </record>
+
+    <record model="olap.level" id="level_address_country">
+        <field name="name">city</field>
+        <field name="sequence">1</field>
+        <field name="column_name" ref="columns_res_partner_address_city"></field>
+        <field name="column_id_name">city</field>
+        <field name="table_name">res_partner_address</field>
+        <field name="hierarchy_id" ref="hierarchy_partner_address_country"/>
+    </record>
+
+    <record model="olap.level" id="level_address_country_1">
+        <field name="name">name</field>
+        <field name="sequence">2</field>
+        <field name="column_name" ref="columns_res_partner_name"></field>
+        <field name="column_id_name">name</field>
+        <field name="table_name">res_partner</field>
+        <field name="hierarchy_id" ref="hierarchy_partner_address_country"/>
+    </record>
+
+
+
+<!--
+DIMENSION SALEMAN
+
+res_users (user_id)
+-->
+
+    <record model="olap.dimension" id="dimension_sales_user">
+        <field name="name">Users</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+    </record>
+
+    <record model="olap.hierarchy" id="hierarchy_sales_user">
+        <field name="name">Users</field>
+        <field name="dimension_id" ref="dimension_sales_user"/>
+        <field name="primary_key_table">res_users</field>
+        <field name="table_id" ref="user_table"/>
+    </record>
+
+    <record model="olap.level" id="hierarchy_sales_user_level">
+        <field name="name">name</field>
+        <field name="column_name" ref="columns_res_user_name"></field>
+        <field name="hierarchy_id" ref="hierarchy_sales_user"/>
+        <field name="table_name">res_users</field>
+        <field name="column_id_name">name</field>
+    </record>
+
+
+
+
+<!--
+Measures
+-->
+
+    <record model="olap.measure" id="measure_item_sold">
+        <field name="name">Average Sales</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+        <field name="value_column" ref="columns_sale_order_amount_total"></field>
+        <field name="value_column_id_name">amount_total</field>
+        <field name="table_name">sale_order</field>
+        <field name="agregator">avg</field>
+        <field name="formatstring">cr_postfix</field>
+    </record>
+    <record model="olap.measure" id="measure_total_sales">
+        <field name="name">Total Sales</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+        <field name="value_column" ref="columns_sale_order_amount_total"></field>
+        <field name="value_column_id_name">amount_total</field>
+        <field name="table_name">sale_order</field>
+        <field name="agregator">sum</field>
+        <field name="formatstring">cr_postfix_comma</field>
+    </record>
+
+    <record model="olap.measure" id="measure_sql_expression">
+        <field name="name">Units Sold</field>
+        <field name="cube_id" ref="cube_sales_order_line"/>
+        <field name="measure_type">sql_expr</field>
+        <field name="value_sql">count(sale_order.id)</field>
+    </record>
+
+
+</data>
+</openerp>
diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index a6e112d4fbc..1a83d3f3b44 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,5 +24,8 @@ import pos
 import stock
 import wizard
 import report
+import pos_account_bank_statement
+import account_bank_statement
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 357d3d909cb..0610144ca87 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -35,8 +36,23 @@ Main features :
 
     """,
     'author': 'Tiny',
-    'depends': ['sale', 'purchase', 'account', 'account_tax_include'],
-    'init_xml': [],
+    'depends': ['sale', 'delivery','report_mrp'],
+#    'depends': ['sale', 'purchase', 'account', 'account_tax_include','board','mrp','board_manufacturing','delivery','profile_manufacturing','account','multi_company'],
+    'init_xml': [
+        'security/point_of_sale_security.xml',
+        'security/ir.model.access.csv',
+        'pos_report.xml',
+        'pos_wizard.xml',
+        'pos_view.xml',
+        'pos_sequence.xml',
+        'posrule_data.xml',
+        'pos_data.xml',
+        'pos_workflow.xml',
+        'statement_view.xml',
+        'statement_report.xml', 
+        'statement_data.xml',
+        'statement_wizard.xml'
+    ],
     'update_xml': [
         'security/point_of_sale_security.xml',
         'security/ir.model.access.csv',
@@ -44,11 +60,12 @@ Main features :
         'pos_wizard.xml',
         'pos_view.xml',
         'pos_sequence.xml',
+        'posrule_data.xml',
         'pos_data.xml',
         'pos_workflow.xml'
     ],
-    'demo_xml': [],
+    'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
     'installable': True,
-    'certificate': '0048272150909',
+    'certificate': '',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
new file mode 100644
index 00000000000..b599f0531f9
--- /dev/null
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -0,0 +1,215 @@
+# encoding: utf-8
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 PC Solutions (<http://pcsol.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/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+from mx import DateTime
+from decimal import Decimal
+from tools.translate import _
+
+
+class account_journal(osv.osv):
+    _inherit = 'account.journal'
+    _columns = {
+        'auto_cash': fields.boolean('Automatic Opening', help="This field authorize the automatic creation of the cashbox"),
+        'special_journal':fields.boolean('Special Journal', help="Will put all the orders in waiting status till being accepted"),
+        'check_dtls': fields.boolean('Check Details', help="This field authorize Validation of Cashbox without checking ending details"),
+        'statement_sequence_id': fields.many2one('ir.sequence', 'Statement Sequence', \
+            help="The sequence used for statement numbers in this journal."),
+        }
+    _defaults = {
+        'check_dtls': lambda *a:True,
+        'auto_cash': lambda *a:True,
+        }
+account_journal()
+
+
+class singer_statement(osv.osv):
+    _name = 'singer.statement'
+    _description = 'Statements'
+
+    def _sub_total(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for obj in self.browse(cr, uid, ids):
+            res[obj.id] = obj.pieces * obj.number
+        return res
+
+    def on_change_sub2(self, cr, uid, ids, pieces, number, *a):
+        sub=pieces*number
+        return {'value':{'subtotal': sub or 0.0}}
+
+
+    def on_change_sub(self, cr, uid, ids, pieces, number,*a):
+        sub=pieces*number
+        return {'value':{'subtotal': sub or 0.0}}
+
+    _columns = {
+          'pieces': fields.float('Values', digits=(16,2)),
+          'number': fields.integer('Number'),
+          'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float',digits=(16,2)),
+          'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
+          'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
+     }
+
+singer_statement()
+
+class account_bank_statement(osv.osv):
+    _inherit = 'account.bank.statement'
+    def _get_starting_balance(self, cr, uid, ids, name, arg, context=None):
+        res ={}
+        for statement in self.browse(cr, uid, ids):
+            amount_total=0.0
+            for line in statement.starting_details_ids:
+                amount_total+= line.pieces * line.number
+            res[statement.id]=amount_total
+        return res
+
+    def _get_sum_entry_encoding(self, cr, uid, ids, name, arg, context=None):
+        res2={}
+        for statement in self.browse(cr, uid, ids):
+            encoding_total=0.0
+            for line in statement.line_ids:
+               encoding_total+= line.amount
+            res2[statement.id]=encoding_total
+        return res2
+
+    def _default_journal_id(self, cr, uid, context={}):
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        print [('type','=','cash'),('auto_cash','=',False), ('company_id', '=', company_id)]
+        journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('auto_cash','=',False), ('company_id', '=', company_id)])
+        if journal:
+            return journal[0]
+        else:
+            return False
+
+    _columns = {
+          'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+          'balance_start': fields.function(_get_starting_balance, method=True, string='Starting Balance', type='float',digits=(16,2)),
+         # 'balance_start': fields.float('Starting Balance',digits=(16,2)),
+         # 'balance_end': fields.float('Balance',digits=(16,2)),
+          'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirm'),('open','Open')],
+                                    'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
+          'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, string="Total of Entry encoding"),
+          'date':fields.datetime("Opening Date"),
+          'closing_date':fields.datetime("Closing Date"),
+          'starting_details_ids': fields.one2many('singer.statement', 'starting_id', string='Starting Details'),
+          'ending_details_ids': fields.one2many('singer.statement', 'ending_id', string='Ending Details'),
+          'name': fields.char('Name', size=64, required=True, readonly=True),
+
+    }
+    _defaults = {
+          'state': lambda *a: 'draft',
+          'name': lambda *a: '/',
+          'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
+          'journal_id': _default_journal_id,
+
+         }
+
+    def create(self, cr, uid, vals, context=None):
+        open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
+        if open_jrnl:
+            raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
+        if 'starting_details_ids' in vals:
+            vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
+            for i in starting_details_ids:
+                if i and i[0] and i[1]:
+                    i[0], i[1] = 0, 0
+        res = super(account_bank_statement, self).create(cr, uid, vals, context=context)
+        return res
+
+    def onchange_journal_id(self, cursor, user, statement_id, journal_id, context=None):
+        id_s=[]
+        if not journal_id:
+            return {'value': {'balance_start': 0.0}}
+        balance_start=0.0
+        cash_obj = self.pool.get('singer.statement')
+        statement_obj = self.pool.get('account.bank.statement')
+        cursor.execute("Select a.id from account_bank_statement a where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
+        res2=cursor.fetchone()
+        res2=res2 and res2[0] or None
+        if res2:
+            statmt_id=statement_obj.browse(cursor,user,res2)
+            check_det=statmt_id.journal_id.check_dtls
+            if not check_det:
+                balance_start=statmt_id.balance_end_real or 0.0
+                return {'value': {'balance_start': balance_start}}
+        cursor.execute("Select a.id from account_bank_statement a, singer_statement s where journal_id=%d and user_id=%d order by a.id desc limit 1"%(journal_id,user))
+        res1=cursor.fetchone()
+        res1=res1 and res1[0] or None
+        if res1:
+            cursor.execute("Select sum(ss.pieces*ss.number),ss.ending_id from singer_statement ss, account_bank_statement s where ss.ending_id=s.id and s.journal_id=%d and s.user_id=%d and s.id=%d group by ss.ending_id,s.id order by s.id desc"%(journal_id,user, res1))
+            res = cursor.fetchone()
+            balance_start = res and res[0] or 0.0
+            cash_end=res and res[1] or None
+            id_s=statement_obj.browse(cursor,user,cash_end).ending_details_ids
+        new=[]
+        if id_s:
+            for s in id_s:
+                new.append(s.id)
+        return {'value': {'balance_start': balance_start, 'starting_details_ids':new}}
+
+    def button_open(self, cr, uid, ids, context=None):
+        obj_inv = self.browse(cr, uid, ids)[0]
+        s_id=obj_inv.journal_id
+        if s_id.statement_sequence_id:
+            s_id=s_id.id
+            number = self.pool.get('ir.sequence').get_id(cr, uid, s_id)
+        else:
+            number = self.pool.get('ir.sequence').get(cr, uid,
+                            'account.bank.statement')
+
+        self.write(cr, uid, ids, {'date':time.strftime("%Y-%m-%d %H:%M:%S"), 'state':'open', 'name':number})
+        return True
+
+    def button_confirm(self, cr, uid, ids, context=None):
+        val = 0.0
+        val2 = 0.0
+        val_statement_line = 0.0
+        diff = self.pool.get('res.users').browse(cr,uid,uid).company_id.max_diff or 0.0
+        for statement in self.browse(cr, uid, ids):
+            bal = statement.balance_end
+            bal_st=statement.balance_start
+            for st in statement.line_ids:
+                val_statement_line += st.amount
+            for stat in statement.starting_details_ids:
+                val2 += stat.subtotal
+            for stat in statement.ending_details_ids:
+                val += stat.subtotal
+            if statement.journal_id.check_dtls:
+                if Decimal(str(val)).quantize(Decimal('.001')) != (Decimal(str(val_statement_line)) + Decimal(str(val2))).quantize(Decimal('.001')):
+                    raise osv.except_osv(_('Invalid action !'), _(' You can not confirm your cashbox, Please enter ending details, missing value matches to "%s"')%(abs(Decimal(str(val))-(Decimal(str(val_statement_line))+Decimal(str(val2))))))
+
+            self.write(cr, uid, statement.id, {'balance_end_real':Decimal(str(val_statement_line))+Decimal(str(val2)),'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
+           # self.write(cr, uid, statement.id, {'balance_end_real':bal_st+val_statement_line,'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
+        return  super(account_bank_statement, self).button_confirm(cr, uid, ids, context=None)
+
+account_bank_statement()
+
+#class singer_account_bank_statement_line(osv.osv):
+#    _inherit = 'account.bank.statement.line'
+#    _columns = {
+#           'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'),
+#     }
+#
+#singer_account_bank_statement_line()
+
+
diff --git a/addons/point_of_sale/multi_company_demo.xml b/addons/point_of_sale/multi_company_demo.xml
new file mode 100644
index 00000000000..dfc59cc09c8
--- /dev/null
+++ b/addons/point_of_sale/multi_company_demo.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+        <record id="second_partner" model="res.partner">
+            <field name="name">Tiny Editor</field>
+        </record>
+
+        <record id="second_company" model="res.company">
+            <field name="name">Tiny Editor</field>
+            <field name="partner_id" ref="base.main_partner"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field name="rml_header1">Free Business Solutions</field>
+            <field name="rml_footer1">Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
+            <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701</field>
+            <field name="currency_id" ref="base.EUR"/>
+
+        </record>
+
+        <record id="ter_partner" model="res.partner">
+            <field name="name">Tiny Integrator</field>
+        </record>
+
+        <record id="ter_company" model="res.company">
+            <field name="name">Tiny Integrator</field>
+            <field name="partner_id" ref="base.main_partner"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field name="rml_header1">Free Business Solutions</field>
+            <field name="rml_footer1">Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
+            <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701</field>
+            <field name="currency_id" ref="base.EUR"/>
+
+        </record>
+
+  
+
+    </data>
+</openerp>
+
diff --git a/addons/point_of_sale/multi_company_stock_data.xml b/addons/point_of_sale/multi_company_stock_data.xml
new file mode 100644
index 00000000000..539a27ff1a2
--- /dev/null
+++ b/addons/point_of_sale/multi_company_stock_data.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0"?>
+<openerp>
+
+<data>
+        <!-- <record id="res_partner_tinyshop0" model="res.partner">
+            <field eval="0" name="customer"/>
+            <field eval="0" name="supplier"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;Tiny Shop 1&quot;&quot;&quot;" name="name"/>
+        </record>
+        <record id="res_partner_address_fabien0" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;92000&quot;&quot;&quot;" name="zip"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field name="partner_id" ref="res_partner_tinyshop0"/>
+            <field name="country_id" ref="base.fr"/>
+            <field eval="&quot;&quot;&quot;Avenue de Paris&quot;&quot;&quot;" name="street"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
+        </record>
+        <record id="res_company_shop0" model="res.company">
+            <field eval="5.0" name="security_lead"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop0"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+
+        </record>
+        <record id="res_partner_tinyshop1" model="res.partner">
+            <field eval="1" name="customer"/>
+            <field eval="0" name="supplier"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;Tiny Shop 2&quot;&quot;&quot;" name="name"/>
+       </record>
+        <record id="res_partner_address_eric0" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;1500&quot;&quot;&quot;" name="zip"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field name="country_id" ref="base.fr"/>
+            <field eval="&quot;&quot;&quot;Avenue de la Resistance&quot;&quot;&quot;" name="street"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_company_tinyshop0" model="res.company">
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
+        </record>
+
+
+        <record id="res_users_shopuser0" model="res.users">
+            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
+            <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
+            <field eval="[(6,0,[ref('purchase.res_roles_purchase0'),ref('sale.res_roles_salesman0')])]" name="roles_id"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="password"/>
+            <field eval="&quot;&quot;&quot;en_US&quot;&quot;&quot;" name="context_lang"/>
+            <field eval="&quot;&quot;&quot;Shop 1 User&quot;&quot;&quot;" name="name"/>
+            <field name="company_id" ref="res_company_shop0"/>
+            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="login"/>
+            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+        </record>
+        <record id="res_users_shopuser1" model="res.users">
+            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
+            <field model="res.partner.address" name="address_id" search="[('name','=','Eric')]"/>
+            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="password"/>
+            <field eval="&quot;&quot;&quot;Shop 2 User&quot;&quot;&quot;" name="name"/>
+            <field name="company_id" ref="res_company_tinyshop0"/>
+            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
+            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+        </record>
+
+        <record id="res_groups_posuserposline0" model="res.groups">
+			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
+			<field eval="&quot;&quot;&quot;POS_user_pos_line&quot;&quot;&quot;" name="name"/>
+		</record>
+
+		<record id="res_groups_posuser0" model="res.groups">
+			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
+			<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
+		</record>-->
+
+        <record forcecreate="True" id="property_product_pricelist_multi" model="ir.property">
+            <field name="name">property_product_pricelist</field>
+            <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_product_pricelist')]"/>
+            <field eval="'product.pricelist,'+str(ref('product.list0'))" name="value"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+
+
+        <record forcecreate="True" id="property_stock_account_output_prd_multi" model="ir.property">
+            <field name="name">property_stock_account_output</field>
+            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_account_output')]"/>
+            <field eval="False" name="value"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+        <record forcecreate="True" id="property_stock_account_input_prd_multi" model="ir.property">
+            <field name="name">property_stock_account_input</field>
+            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_account_input')]"/>
+            <field eval="False" name="value"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+        <record forcecreate="True" id="property_stock_account_output_categ_multi" model="ir.property">
+            <field name="name">property_stock_account_output_categ</field>
+            <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_account_output_categ')]"/>
+            <field eval="False" name="value"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+        <record forcecreate="True" id="property_stock_account_input_categ_multi" model="ir.property">
+            <field name="name">property_stock_account_input_categ</field>
+            <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_account_input_categ')]"/>
+            <field eval="False" name="value"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+        <record id="ir_property_propertystockjournal0" model="ir.property">
+			<field eval="&quot;&quot;&quot;property_stock_journal&quot;&quot;&quot;" name="name"/>
+			<field name="company_id" ref="res_company_shop0"/>
+			<field eval="&quot;&quot;&quot;account.journal,16&quot;&quot;&quot;" name="value"/>
+			<field name="fields_id" ref="stock.field_product_category_property_stock_journal"/>
+		</record>
+    </data>
+    <data>
+    	<record id="stock.property_stock_journal" model="ir.property">
+             <field name="company_id" ref="base.main_company"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 4ad81213301..7115495a647 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -1,20 +1,21 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
+#    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
@@ -24,9 +25,9 @@ import netsvc
 from osv import fields, osv
 from mx import DateTime
 from tools.translate import _
-import tools
-from wizard import except_wizard
 from decimal import Decimal
+import tools
+import re
 
 
 class pos_config_journal(osv.osv):
@@ -40,23 +41,53 @@ class pos_config_journal(osv.osv):
 
 pos_config_journal()
 
+class res_mode_contact(osv.osv):
+    _name = "res.mode.contact"
+    _description = "Contact mode"
+    _columns={
+        'name': fields.char('Mode', size=64, select=1),
+        'active': fields.boolean('Active', select=2),
+    }
+res_mode_contact()
+
+class contact_mode_partner(osv.osv):
+    _inherit = 'res.partner'
+    _columns = {
+        'contact_mode_id': fields.many2one('res.mode.contact','Contact Mode'),
+     }
+contact_mode_partner()
+
+
+class pos_company_discount(osv.osv):
+    _inherit = 'res.company'
+    _columns = {
+        'company_discount': fields.float('Max Discount(%)', digits=(16,2)),
+        'max_diff': fields.float('Max Difference for Cashboxes', digits=(16,2)),
+        'account_receivable': fields.many2one('account.account',
+            'Default Receivable', required=True, states={'draft': [('readonly', False)]}),
+     }
+
+pos_company_discount()
+
 
 class pos_order(osv.osv):
     _name = "pos.order"
     _description = "Point of Sale"
     _order = "date_order, create_date desc"
+    _order = "date_order desc"
 
     def unlink(self, cr, uid, ids, context={}):
         for rec in self.browse(cr, uid, ids, context=context):
-            if rec.state != 'draft':
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a point of sale which is already confirmed !'))
+            for rec_statement in rec.statement_ids:
+                if (rec_statement.statement_id and rec_statement.statement_id.state=='confirm') or rec.state=='done':
+                    raise osv.except_osv(_('Invalid action !'), _('Cannot delete a point of sale which is closed or contains confirmed cashboxes!'))
         return super(pos_order, self).unlink(cr, uid, ids, context=context)
 
     def onchange_partner_pricelist(self, cr, uid, ids, part, context={}):
         if not part:
             return {}
         pricelist = self.pool.get('res.partner').browse(cr, uid, part).property_product_pricelist.id
-        return {'value': {'pricelist_id': pricelist}}
+        return {'value':{'pricelist_id': pricelist}}
 
     def _amount_total(self, cr, uid, ids, field_name, arg, context):
         id_set = ",".join(map(str, ids))
@@ -68,39 +99,121 @@ class pos_order(osv.osv):
                 ) AS amount
         FROM pos_order p
             LEFT OUTER JOIN pos_order_line l ON (p.id=l.order_id)
-        WHERE p.id IN (""" + id_set +""") GROUP BY p.id """)
+        WHERE p.id IN (""" + id_set  +""") GROUP BY p.id """)
         res = dict(cr.fetchall())
-
         for rec in self.browse(cr, uid, ids, context):
             if rec.partner_id \
                and rec.partner_id.property_account_position \
                and rec.partner_id.property_account_position.tax_ids:
                 res[rec.id] = res[rec.id] - rec.amount_tax
+            else :
+                res[rec.id] = res[rec.id] + rec.amount_tax
         return res
 
+    def _get_date_payment2(self, cr, uid, ids, context, *a):
+        res = {}
+        pay_obj = self.pool.get('account.bank.statement')
+        stat_obj_line = self.pool.get('account.bank.statement.line')
+        tot =0.0
+        val=None
+        for order in self.browse(cr, uid, ids):
+            cr.execute("select date_payment2 from pos_order where id=%d"%(order.id))
+            date_p=cr.fetchone()
+            date_p=date_p and date_p[0] or None
+            if date_p:
+                res[order.id]=date_p
+                return res
+            cr.execute(" SELECT max(l.date) from account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o where i.move_id=m.id and l.move_id=m.id and l.reconcile_id=r.id and o.id=%d and o.invoice_id=i.id"%(order.id))
+            val=cr.fetchone()
+            val= val and val[0] or None
+            if not val:
+                cr.execute("select max(date) from account_bank_statement_line l, account_bank_statement_reconcile s where l.pos_statement_id=%d and l.reconcile_id=s.id"%(order.id))
+                val=cr.fetchone()
+                val=val and val[0] or None
+            if val:
+                res[order.id]=val
+        return res
+    def _get_date_payment(self, cr, uid, ids, context, *a):
+        res = {}
+        pay_obj = self.pool.get('pos.payment')
+        tot =0.0
+        val=None
+        for order in self.browse(cr, uid, ids):
+            cr.execute("select date_payment from pos_order where id=%d"%(order.id))
+            date_p=cr.fetchone()
+            date_p=date_p and date_p[0] or None
+            if date_p:
+                res[order.id]=date_p
+                return res
+            discount_allowed=order.company_id.company_discount
+            for line in order.lines:
+                if line.discount > discount_allowed:
+                    return {order.id: None }
+            if order.amount_paid == order.amount_total and not date_p:
+                cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
+                val=cr.fetchone()
+                val=val and val[0] or None
+            if order.invoice_id and order.invoice_id.move_id and not date_p and not val:
+                for o in order.invoice_id.move_id.line_id:
+                    if o.balance==0:
+                        if val<o.date_created:
+                            val=o.date_created
+            if val:
+             #   cr.execute("Update pos_order set date_payment='%s' where id = %d"%(val, order.id))
+             #   cr.commit()
+                res[order.id]=val
+        return res
+ #       tax_obj = self.pool.get('account.tax')
+ #       pay_obj = self.pool.get('pos.payment')
+ #       for order in self.browse(cr, uid, ids):
+ #           val = 0.0
+ #           tot =0.0
+ #           for pay in order.payments:
+ #               tot+= pay.amount
+ #           if order.amount_total==tot:
+ #               res[order.id]=time.strftime('%Y-%m-%d')
+ #           for line in order.lines:
+
+ #               val = reduce(lambda x, y: x+round(y['amount'], 2),
+ #                       tax_obj.compute_inv(cr, uid, line.product_id.taxes_id,
+ #                           line.price_unit * \
+ #                           (1-(line.discount or 0.0)/100.0), line.qty),
+ #                           val)
+
+ #           res[order.id] = val
+
     def _amount_tax(self, cr, uid, ids, field_name, arg, context):
         res = {}
         tax_obj = self.pool.get('account.tax')
         for order in self.browse(cr, uid, ids):
             val = 0.0
             for line in order.lines:
-                val = reduce(lambda x, y: x+round(y['amount'], 2),
+                if order.price_type!='tax_excluded':
+                    val = reduce(lambda x, y: x+round(y['amount'], 2),
                         tax_obj.compute_inv(cr, uid, line.product_id.taxes_id,
                             line.price_unit * \
                             (1-(line.discount or 0.0)/100.0), line.qty),
                             val)
+                else:
+                    val = reduce(lambda x, y: x+round(y['amount'], 2),
+                        tax_obj.compute(cr, uid, line.product_id.taxes_id,
+                            line.price_unit * \
+                            (1-(line.discount or 0.0)/100.0), line.qty),
+                            val)
 
             res[order.id] = val
         return res
 
     def _total_payment(self, cr, uid, ids, field_name, arg, context):
         res = {}
+        i=0
         for order in self.browse(cr, uid, ids):
             val = 0.0
-            for payment in order.payments:
+            for payment in order.statement_ids:
                 val += payment.amount
             res[order.id] = val
-        return res
+            return res
+        return {order.id:val}
 
     def _total_return(self, cr, uid, ids, field_name, arg, context):
         res = {}
@@ -125,6 +238,15 @@ class pos_order(osv.osv):
         else:
             return False
 
+    def _shop_get(self, cr, uid, context):
+        company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
+        res = self.pool.get('sale.shop').search(cr, uid, [])
+       # res = self.pool.get('sale.shop').search(cr, uid, [('company_id', '=', company.id)])
+        if res:
+            return res[0]
+        else:
+            return False
+
     def _receivable_get(self, cr, uid, context=None):
         prop_obj = self.pool.get('ir.property')
         res = prop_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
@@ -145,60 +267,99 @@ class pos_order(osv.osv):
         })
         return super(pos_order, self).copy(cr, uid, id, default, context)
 
+    def _get_v( self, cr, uid, ids,*a):
+        flag=False
+        res_company = self.pool.get('res.company')
+        res_obj = self.pool.get('res.users')
+        company_disc=self.browse(cr,uid,ids)
+        if not company_disc:
+            comp=res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
+        else:
+            comp= company_disc[0] and company_disc[0].company_id and  company_disc[0].company_id.company_discount  or 0.0
+        cr.execute("select discount from pos_order_line where order_id=%s and discount <= %s"%(ids[0],comp))
+        res=cr.fetchone()
+        cr.execute("select discount from pos_order_line where order_id=%s and discount > %s"%(ids[0],comp))
+        res2=cr.fetchone()
+        cr.execute("select journal_id from account_bank_statement_line where pos_statement_id=%s "%(ids[0]))
+        res3=cr.fetchall()
+        list_jrnl=[]
+        for r in res3:
+            cr.execute("select id from account_journal where name= '%s' and special_journal='t'"%(r[0]))
+            res3=cr.fetchone()
+            is_special=res3 and res3[0] or None
+            if is_special:
+                list_jrnl.append(is_special)
+        r = {}
+        for order in self.browse(cr, uid, ids):
+            if order.state in ('paid','done','invoiced') and res and not res2 and not len(list_jrnl):
+                r[order.id] = 'accepted'
+        return r
+
     _columns = {
         'name': fields.char('Order Description', size=64, required=True,
             states={'draft': [('readonly', False)]}, readonly=True),
+        'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True),
+        'num_sale': fields.char('Internal Note', size=64),
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True,
             states={'draft': [('readonly', False)]}, readonly=True),
         'date_order': fields.datetime('Date Ordered', readonly=True),
+        'date_payment': fields.function(_get_date_payment, method=True, string='Validation Date', type='date',  store=True),
+        'date_payment2': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date',  store=True),
         'date_validity': fields.date('Validity Date', required=True),
-        'user_id': fields.many2one('res.users', 'Logged in User', readonly=True,
-            help="This is the logged in user (not necessarily the salesman)."),
-        'salesman_id': fields.many2one('res.users', 'Salesman',
-            help="This is the salesman actually making the order."),
+        'user_id': fields.many2one('res.users', 'Connected Salesman', readonly=True),
+        'user_id1': fields.many2one('res.users', 'Salesman', required=True),
+        'user_id2': fields.many2one('res.users', 'Salesman Manager'),
         'amount_tax': fields.function(_amount_tax, method=True, string='Taxes'),
         'amount_total': fields.function(_amount_total, method=True, string='Total'),
-        'amount_paid': fields.function(_total_payment, 'Paid',
-            states={'draft': [('readonly', False)]}, readonly=True,
-            method=True),
+        'amount_paid': fields.function(_total_payment, 'Paid', states={'draft': [('readonly', False)]}, readonly=True, method=True),
         'amount_return': fields.function(_total_return, 'Returned', method=True),
-        'lines': fields.one2many('pos.order.line', 'order_id',
-            'Order Lines', states={'draft': [('readonly', False)]},
-            readonly=True),
-        'payments': fields.one2many('pos.payment', 'order_id',
-            'Order Payments', states={'draft': [('readonly', False)]},
-            readonly=True),
-        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist',
-            required=True, states={'draft': [('readonly', False)]},
-            readonly=True),
-        'partner_id': fields.many2one(
-            'res.partner', 'Partner', change_default=True,
-            states={'draft': [('readonly', False)], 'paid': [('readonly', False)]},
-            readonly=True),
-        'state': fields.selection([('cancel', 'Cancel'), ('draft', 'Draft'),
-            ('paid', 'Paid'), ('done', 'Done'), ('invoiced', 'Invoiced')], 'State',
-            readonly=True,
-            help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed pos order. \
-            \n* The \'Paid\' state is set automatically when users makes payment for the pos order. \
-            \n* The \'Invoiced\' state is set when invoice is created for pos order. \
-            \n* The \'Done\' state is set automatically when user close the pos order.\
-            \n* The \'Cancel\' state is used when user cancel pos order.'),
-        'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
+        'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
+        'price_type': fields.selection([
+            ('tax_excluded','Tax excluded')
+        ], 'Price method', required=True),
+        'statement_ids': fields.one2many('account.bank.statement.line','pos_statement_id','Payments'),
+        'payments': fields.one2many('pos.payment', 'order_id', 'Order Payments', states={'draft': [('readonly', False)]}, readonly=True),
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
+        'partner_id': fields.many2one( 'res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),
+        'state': fields.selection([('draft', 'Draft'), ('payment', 'Payment'),
+                                    ('advance','Advance'),
+                                   ('paid', 'Paid'), ('done', 'Done'), ('invoiced', 'Invoiced'), ('cancel', 'Cancel')],
+                                  'State', readonly=True, ),
+        'invoice_id': fields.many2one('account.invoice', 'Invoice'),
         'account_move': fields.many2one('account.move', 'Account Entry', readonly=True),
         'pickings': fields.one2many('stock.picking', 'pos_order', 'Picking', readonly=True),
-        'last_out_picking': fields.many2one('stock.picking',
-                                            'Last Output Picking',
-                                            readonly=True),
-        'note': fields.text('Notes'),
+        'last_out_picking': fields.many2one('stock.picking', 'Last Output Picking', readonly=True),
+        'first_name': fields.char('First Name', size=64),
+        'state_2': fields.function(_get_v,type='selection',selection=[('to_verify', 'To Verify'), ('accepted', 'Accepted'),
+            ('refused', 'Refused')], string='State', readonly=True, method=True, store=True),
+        
+    #    'last_name': fields.char('Last Name', size=64),
+    #    'street': fields.char('Street', size=64),
+    #    'zip2': fields.char('Zip', size=64),
+    #    'city': fields.char('City', size=64),
+    #    'mobile': fields.char('Mobile', size=64),
+    #    'email': fields.char('Email', size=64),
+        'note': fields.text('Internal Notes'),
         'nb_print': fields.integer('Number of Print', readonly=True),
-        'sale_journal': fields.many2one('account.journal', 'Journal',
-            required=True, states={'draft': [('readonly', False)]},
-            readonly=True, ),
-        'account_receivable': fields.many2one('account.account',
-            'Default Receivable', required=True, states={'draft': [('readonly', False)]},
-            readonly=True, ),
-        'invoice_wanted': fields.boolean('Create Invoice')
-        }
+        'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True, ),
+      #  'account_receivable': fields.many2one('account.account',
+      #      'Default Receivable', required=True, states={'draft': [('readonly', False)]},
+      #      readonly=True, ),
+        'invoice_wanted': fields.boolean('Create Invoice'),
+        'note_2': fields.char('Customer Note',size=64),
+        'type_rec': fields.char('Type of Receipt',size=64),
+        'remboursed': fields.boolean('Remboursed'),
+        'contract_number': fields.char('Contract Number', size=512, select=1),
+        'journal_entry': fields.boolean('Journal Entry'),
+    }
+
+
+    def _select_pricelist(self, cr, uid, context):
+        pricelist = self.pool.get('product.pricelist').search(cr, uid, [('name', '=', 'Public Pricelist')])
+        if pricelist:
+            return pricelist[0]
+        else:
+            return False
 
     def _journal_default(self, cr, uid, context={}):
         journal_list = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')])
@@ -209,18 +370,22 @@ class pos_order(osv.osv):
 
     _defaults = {
         'user_id': lambda self, cr, uid, context: uid,
-        'salesman_id': lambda self, cr, uid, context: uid,
+        'user_id2': lambda self, cr, uid, context: uid,
         'state': lambda *a: 'draft',
-        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence')\
-            .get(cr, uid, 'pos.order'),
+        'price_type': lambda *a: 'tax_excluded',
+        'state_2': lambda *a: 'to_verify',
+        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.order'),
         'date_order': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'date_validity': lambda *a: (DateTime.now() + DateTime.RelativeDateTime(months=+6)).strftime('%Y-%m-%d'),
         'nb_print': lambda *a: 0,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
         'sale_journal': _sale_journal_get,
-        'account_receivable': _receivable_get,
-        'invoice_wanted': lambda *a: False
+        'invoice_wanted': lambda *a: False,
+        'shop_id': _shop_get,
+        'pricelist_id': _select_pricelist,
     }
 
+
     def test_order_lines(self, cr, uid, order, context={}):
         if not order.lines:
             raise osv.except_osv(_('Error'), _('No order lines defined for this sale.'))
@@ -233,14 +398,11 @@ class pos_order(osv.osv):
         return True
 
     def test_paid(self, cr, uid, ids, context=None):
-        def deci(val):
-            return Decimal("%f" % (val, ))
-
         for order in self.browse(cr, uid, ids, context):
             if order.lines and not order.amount_total:
                 return True
-            if (not order.lines) or (not order.payments) or \
-                (deci(order.amount_paid) != deci(order.amount_total)):
+            if (not order.lines) or (not order.statement_ids) or \
+                Decimal(str(order.amount_total))!=Decimal(str(order.amount_paid)):
                 return False
         return True
 
@@ -307,14 +469,11 @@ class pos_order(osv.osv):
     def create_picking(self, cr, uid, ids, context={}):
         """Create a picking for each order and validate it."""
         picking_obj = self.pool.get('stock.picking')
-        partner_obj = self.pool.get('res.partner')
-        address_id = False
+
         orders = self.browse(cr, uid, ids, context)
         for order in orders:
             if not order.last_out_picking:
                 new = True
-                if order.partner_id.id:
-                    address_id = partner_obj.address_get(cr, uid, [order.partner_id.id], ['delivery'])['delivery']
                 picking_id = picking_obj.create(cr, uid, {
                     'origin': order.name,
                     'type': 'out',
@@ -324,15 +483,11 @@ class pos_order(osv.osv):
                     'invoice_state': 'none',
                     'auto_picking': True,
                     'pos_order': order.id,
-                    'address_id' : address_id
-                    },context)
+                    })
                 self.write(cr, uid, [order.id], {'last_out_picking': picking_id})
             else:
                 picking_id = order.last_out_picking.id
-                picking_obj.write(cr, uid, [picking_id], {
-                    'auto_picking': True,
-                    'invoice_state': '2binvoiced',
-                })
+                picking_obj.write(cr, uid, [picking_id], {'auto_picking': True})
                 picking = picking_obj.browse(cr, uid, [picking_id], context)[0]
                 new = False
 
@@ -343,35 +498,36 @@ class pos_order(osv.osv):
 
             if new:
                 for line in order.lines:
-                    prop_ids = self.pool.get("ir.property").search(cr, uid,
-                            [('name', '=', 'property_stock_customer')])
-                    val = self.pool.get("ir.property").browse(cr, uid,
-                            prop_ids[0]).value
-                    location_id = order.shop_id.warehouse_id.lot_stock_id.id
+                    if line.product_id and line.product_id.type=='service':
+                        continue
+                    prop_ids = self.pool.get("ir.property").search(cr, uid, [('name', '=', 'property_stock_customer')])
+                    val = self.pool.get("ir.property").browse(cr, uid, prop_ids[0]).value
+                    cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order.shop_id.warehouse_id.id))
+                    res=cr.fetchone()
+                    location_id=res and res[0] or None
+#                    location_id = order and order.shop_id and order.shop_id.warehouse_id and order.shop_id.warehouse_id.lot_stock_id.id or None
                     stock_dest_id = int(val.split(',')[1])
                     if line.qty < 0:
-                        (location_id, stock_dest_id)= (stock_dest_id, location_id)
+                        location_id, stock_dest_id = stock_dest_id, location_id
 
-                    self.pool.get('stock.move').create(cr, uid, {
-                        'name': 'Stock move (POS %d)' % (order.id, ),
-                        'product_uom': line.product_id.uom_id.id,
-                        'product_uos': line.product_id.uom_id.id,
-                        'picking_id': picking_id,
-                        'product_id': line.product_id.id,
-                        'product_uos_qty': abs(line.qty),
-                        'product_qty': abs(line.qty),
-                        'tracking_id': False,
-                        'pos_line_id': line.id,
-                        'state': 'waiting',
-                        'location_id': location_id,
-                        'location_dest_id': stock_dest_id,
-                    })
+                        self.pool.get('stock.move').create(cr, uid, {
+                            'name': 'Stock move (POS %d)' % (order.id, ),
+                            'product_uom': line.product_id.uom_id.id,
+                            'product_uos': line.product_id.uom_id.id,
+                            'picking_id': picking_id,
+                            'product_id': line.product_id.id,
+                            'product_uos_qty': abs(line.qty),
+                            'product_qty': abs(line.qty),
+                            'tracking_id': False,
+                            'pos_line_id': line.id,
+                            'state': 'waiting',
+                            'location_id': location_id,
+                            'location_dest_id': stock_dest_id,
+                        })
 
             wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'stock.picking',
-                    picking_id, 'button_confirm', cr)
-            self.pool.get('stock.picking').force_assign(cr,
-                    uid, [picking_id], context)
+            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+            self.pool.get('stock.picking').force_assign(cr, uid, [picking_id], context)
 
         return True
 
@@ -386,71 +542,92 @@ class pos_order(osv.osv):
             wf_service.trg_create(uid, 'pos.order', i, cr)
         return True
 
+    def button_invalidate(self, cr, uid, ids, *args):
+        res_obj = self.pool.get('res.company')
+        try:
+            part_company=res_obj.browse(cr,uid,uid) and res_obj.browse(cr,uid,uid).parent_id and res_obj.browse(cr,uid,uid).parent_id.id or None
+        except Exception, e:
+            raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
+        if part_company:
+            raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
+        return True
+
+    def button_validate(self, cr, uid, ids, *args):
+        res_obj = self.pool.get('res.company')
+        try:
+            part_company=res_obj.browse(cr,uid,uid) and res_obj.browse(cr,uid,uid).parent_id and res_obj.browse(cr,uid,uid).parent_id.id or None
+        except Exception, e:
+            raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
+        if part_company:
+            raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
+        for order in self.browse(cr, uid, ids):
+            if not order.date_payment:
+                cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
+                val=cr.fetchone()
+                val=val and val[0] or None
+                if val:
+                    cr.execute("Update pos_order set date_payment='%s' where id = %d"%(val, order.id))
+                    cr.commit()
+        return True
+
+
     def cancel_order(self, cr, uid, ids, context=None):
-        """Cancel each picking with an inverted one."""
-
-        picking_obj = self.pool.get('stock.picking')
-        stock_move_obj = self.pool.get('stock.move')
-        payment_obj = self.pool.get('pos.payment')
-        picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', ids), ('state', '=', 'done')])
-        clone_list = []
-
-        # Copy all the picking and blank the last_out_picking
-        for order in self.browse(cr, uid, ids, context=context):
-            if not order.last_out_picking:
-                continue
-
-            clone_id = picking_obj.copy(
-                cr, uid, order.last_out_picking.id, {'type': 'in'})
-            # Confirm the picking
-            wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'stock.picking',
-                clone_id, 'button_confirm', cr)
-            clone_list.append(clone_id)
-            # Remove the ref to last picking and delete the payments
-            self.write(cr, uid, ids, {'last_out_picking': False})
-            payment_obj.unlink(cr, uid, [i.id for i in order.payments],
-                context=context)
-
-            # Switch all the moves
-            move_ids = stock_move_obj.search(
-                cr, uid, [('picking_id', '=', clone_id)])
-            for move in stock_move_obj.browse(cr, uid, move_ids, context=context):
-                stock_move_obj.write(
-                    cr, uid, move.id, {'location_id': move.location_dest_id.id,
-                                    'location_dest_id': move.location_id.id})
-
-        self.pool.get('stock.picking').force_assign(cr,
-            uid, clone_list, context)
-
+        self.write(cr, uid, ids, {'state': 'cancel'})
+        self.cancel_picking(cr, uid, ids, context={})
         return True
 
     def add_payment(self, cr, uid, order_id, data, context=None):
         """Create a new payment for the order"""
+        res_obj = self.pool.get('res.company')
+        statementl_obj = self.pool.get('account.bank.statement.line')
+        prod_obj = self.pool.get('product.product')
+        flag=''
+        curr_c=self.pool.get('res.users').browse(cr, uid, uid).company_id
+        curr_company=curr_c.id
         order = self.browse(cr, uid, order_id, context)
+        if not order.num_sale and data['num_sale']:
+            self.write(cr,uid,order_id,{'num_sale': data['num_sale']})
+        ids_new=[]
         if order.invoice_wanted and not order.partner_id:
             raise osv.except_osv(_('Error'), _('Cannot create invoice without a partner.'))
-
         args = {
-            'order_id': order_id,
-            'journal_id': data['journal'],
             'amount': data['amount'],
-            'payment_id': data['payment_id'],
             }
-
         if 'payment_date' in data.keys():
-            args['payment_date'] = data['payment_date']
+            args['date'] = data['payment_date']
         if 'payment_name' in data.keys():
-            args['payment_name'] = data['payment_name']
-        if 'payment_nb' in data.keys():
-            args['payment_nb'] = data['payment_nb']
+            args['name'] = data['payment_name'] + ' ' +order.name
+        account_def = self.pool.get('ir.property').get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
+        args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
+        if data.get('is_acc',False):
+            args['is_acc']=data['is_acc']
+            args['account_id']= prod_obj.browse(cr,uid, data['product_id']).property_account_income and prod_obj.browse(cr,uid, data['product_id']).property_account_income.id
+            if not args['account_id']:
+                raise osv.except_osv(_('Error'), _('Please provide an account for the product: %s')%(prod_obj.browse(cr,uid, data['product_id']).name))
+        args['partner_id'] = order.partner_id and order.partner_id.id or None
+        args['ref'] = order.contract_number or None
 
-        payment_id = self.pool.get('pos.payment').create(cr, uid, args )
+        statement_obj= self.pool.get('account.bank.statement')
+        statement_id = statement_obj.search(cr,uid, [
+                                                     ('journal_id', '=', data['journal']),
+                                                     ('company_id', '=', curr_company),
+                                                     ('user_id', '=', uid),
+                                                     ('state', '=', 'open')])
+        if len(statement_id)==0:
+            raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
+        if statement_id:
+            statement_id=statement_id[0]
+        args['statement_id']= statement_id
+        args['pos_statement_id']= order_id
+        args['journal_id']= data['journal']
+        statement_line_id = self.pool.get('account.bank.statement.line').create(cr, uid, args)
+        ids_new.append(statement_id)
 
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, 'pos.order', order_id, 'paid', cr)
         wf_service.trg_write(uid, 'pos.order', order_id, cr)
-        return payment_id
+
+        return statement_id
 
     def add_product(self, cr, uid, order_id, product_id, qty, context=None):
         """Create a new order line the order"""
@@ -486,26 +663,26 @@ class pos_order(osv.osv):
                 'note': 'REFUND\n'+ (order.note or ''),
                 'invoice_id': False,
                 'nb_print': 0,
-                'payments': False,
+                'statement_ids': False,
                 })
             clone_list.append(clone_id)
-            self.write(cr, uid, clone_id, {
-                'partner_id': order.partner_id.id,
-            })
+
 
         for clone in self.browse(cr, uid, clone_list):
             for order_line in clone.lines:
                 line_obj.write(cr, uid, [order_line.id], {
-                    'qty': -order_line.qty,
+                    'qty': -order_line.qty
                     })
         return clone_list
 
     def action_invoice(self, cr, uid, ids, context={}):
+        res_obj = self.pool.get('res.company')
         inv_ref = self.pool.get('account.invoice')
         inv_line_ref = self.pool.get('account.invoice.line')
         inv_ids = []
 
         for order in self.browse(cr, uid, ids, context):
+            curr_c = order.user_id1.company_id
             if order.invoice_id:
                 inv_ids.append(order.invoice_id.id)
                 continue
@@ -513,25 +690,26 @@ class pos_order(osv.osv):
             if not order.partner_id:
                 raise osv.except_osv(_('Error'), _('Please provide a partner for the sale.'))
 
+            cr.execute('select a.id from account_account a, res_company p where p.account_receivable=a.id and p.id=%s', (curr_c.id, ))
+            res=cr.fetchone()
+            acc=res and res[0] or None
             inv = {
                 'name': 'Invoice from POS: '+order.name,
                 'origin': order.name,
+                'account_id':acc,
+                'journal_id':order.sale_journal.id or None,
                 'type': 'out_invoice',
                 'reference': order.name,
                 'partner_id': order.partner_id.id,
                 'comment': order.note or '',
-                'price_type': 'tax_included'
             }
             inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', order.partner_id.id)['value'])
-
-            if not self.pool.get('res.partner').browse(cr, uid, inv['partner_id']).address:
-                raise osv.except_osv(_('Error'), _('Unable to create invoice (partner has no address).'))
-
+            if not inv.get('account_id', None):
+                inv['account_id'] = acc
             inv_id = inv_ref.create(cr, uid, inv, context)
 
             self.write(cr, uid, [order.id], {'invoice_id': inv_id, 'state': 'invoiced'})
             inv_ids.append(inv_id)
-
             for line in order.lines:
                 inv_line = {
                     'invoice_id': inv_id,
@@ -539,11 +717,12 @@ class pos_order(osv.osv):
                     'quantity': line.qty,
                 }
                 inv_line.update(inv_line_ref.product_id_change(cr, uid, [],
-                    line.product_id.id,
-                    line.product_id.uom_id.id,
-                    line.qty, partner_id = order.partner_id.id, fposition_id=order.partner_id.property_account_position.id)['value'])
+                                                               line.product_id.id,
+                                                               line.product_id.uom_id.id,
+                                                               line.qty, partner_id = order.partner_id.id, fposition_id=order.partner_id.property_account_position.id)['value'])
                 inv_line['price_unit'] = line.price_unit
                 inv_line['discount'] = line.discount
+                inv_line['account_id'] = acc
 
                 inv_line['invoice_line_tax_id'] = ('invoice_line_tax_id' in inv_line)\
                     and [(6, 0, inv_line['invoice_line_tax_id'])] or []
@@ -555,8 +734,6 @@ class pos_order(osv.osv):
         return inv_ids
 
     def create_account_move(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
         account_period_obj = self.pool.get('account.period')
@@ -564,14 +741,13 @@ class pos_order(osv.osv):
         period = account_period_obj.find(cr, uid, context=context)[0]
 
         for order in self.browse(cr, uid, ids, context=context):
-
+            curr_c = self.pool.get('res.users').browse(cr, uid, uid).company_id
+            comp_id = self.pool.get('res.users').browse(cr, order.user_id.id, order.user_id.id).company_id
+            comp_id=comp_id and comp_id.id or False
             to_reconcile = []
             group_tax = {}
-
-            if order.amount_total > 0:
-                order_account = order.sale_journal.default_credit_account_id.id
-            else:
-                order_account = order.sale_journal.default_debit_account_id.id
+            account_def = self.pool.get('ir.property').get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
+            order_account = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
 
             # Create an entry for the sale
             move_id = account_move_obj.create(cr, uid, {
@@ -584,8 +760,12 @@ class pos_order(osv.osv):
 
                 tax_amount = 0
                 taxes = [t for t in line.product_id.taxes_id]
-                computed_taxes = account_tax_obj.compute_inv(
-                    cr, uid, taxes, line.price_unit, line.qty)
+                if order.price_type=='tax_excluded':
+                    computed_taxes = account_tax_obj.compute(
+                        cr, uid, taxes, line.price_unit, line.qty)
+                else:
+                    computed_taxes = account_tax_obj.compute_inv(
+                        cr, uid, taxes, line.price_unit, line.qty)
 
                 for tax in computed_taxes:
                     tax_amount += round(tax['amount'], 2)
@@ -597,8 +777,10 @@ class pos_order(osv.osv):
                         group_tax[group_key] += round(tax['amount'], 2)
                     else:
                         group_tax[group_key] = round(tax['amount'], 2)
-
-                amount = line.price_subtotal - tax_amount
+                if order.price_type!='tax_excluded':
+                    amount = line.price_subtotal - tax_amount
+                else:
+                    amount = line.price_subtotal
 
                 # Search for the income account
                 if  line.product_id.property_account_income.id:
@@ -631,18 +813,20 @@ class pos_order(osv.osv):
 
                 # Create a move for the line
                 account_move_line_obj.create(cr, uid, {
-                    'name': order.name,
+                    'name': "aa"+order.name,
                     'date': order.date_order,
-                    'ref': order.name,
+                    'ref': order.contract_number or order.name,
+                    'quantity': line.qty,
+                    'product_id':line.product_id.id,
                     'move_id': move_id,
                     'account_id': income_account,
+                    'company_id': comp_id,
                     'credit': ((amount>0) and amount) or 0.0,
                     'debit': ((amount<0) and -amount) or 0.0,
                     'journal_id': order.sale_journal.id,
                     'period_id': period,
                     'tax_code_id': tax_code_id,
                     'tax_amount': tax_amount,
-                    'partner_id' : order.partner_id and order.partner_id.id or False,
                 }, context=context)
 
                 # For each remaining tax with a code, whe create a move line
@@ -657,18 +841,20 @@ class pos_order(osv.osv):
                         continue
 
                     account_move_line_obj.create(cr, uid, {
-                        'name': order.name,
+                        'name': "bb"+order.name,
                         'date': order.date_order,
-                        'ref': order.name,
+                        'ref': order.contract_number or order.name,
+                        'product_id':line.product_id.id,
+                        'quantity': line.qty,
                         'move_id': move_id,
                         'account_id': income_account,
+                        'company_id': comp_id,
                         'credit': 0.0,
                         'debit': 0.0,
                         'journal_id': order.sale_journal.id,
                         'period_id': period,
                         'tax_code_id': tax_code_id,
                         'tax_amount': tax_amount,
-                        'partner_id' : order.partner_id and order.partner_id.id or False,
                     }, context=context)
 
 
@@ -676,10 +862,13 @@ class pos_order(osv.osv):
             (tax_code_pos, base_code_pos, account_pos)= (0, 1, 2)
             for key, amount in group_tax.items():
                 account_move_line_obj.create(cr, uid, {
-                    'name': order.name,
+                    'name':"cc"+order.name,
                     'date': order.date_order,
-                    'ref': order.name,
+                    'ref': order.contract_number or order.name,
                     'move_id': move_id,
+                    'company_id': comp_id,
+                    'quantity': line.qty,
+                    'product_id':line.product_id.id,
                     'account_id': key[account_pos],
                     'credit': ((amount>0) and amount) or 0.0,
                     'debit': ((amount<0) and -amount) or 0.0,
@@ -687,15 +876,15 @@ class pos_order(osv.osv):
                     'period_id': period,
                     'tax_code_id': key[tax_code_pos],
                     'tax_amount': amount,
-                    'partner_id' : order.partner_id and order.partner_id.id or False,
                 }, context=context)
 
             # counterpart
             to_reconcile.append(account_move_line_obj.create(cr, uid, {
-                'name': order.name,
+                'name': "dd"+order.name,
                 'date': order.date_order,
-                'ref': order.name,
+                'ref': order.contract_number or order.name,
                 'move_id': move_id,
+                'company_id': comp_id,
                 'account_id': order_account,
                 'credit': ((order.amount_total<0) and -order.amount_total)\
                     or 0.0,
@@ -703,7 +892,6 @@ class pos_order(osv.osv):
                     or 0.0,
                 'journal_id': order.sale_journal.id,
                 'period_id': period,
-                'partner_id' : order.partner_id and order.partner_id.id or False,
             }, context=context))
 
 
@@ -713,94 +901,157 @@ class pos_order(osv.osv):
                 raise  osv.except_osv(_('Error !'),
                     _('There is no receivable account defined for this journal:'\
                     ' "%s" (id:%d)') % (order.sale_journal.name, order.sale_journal.id, ))
+            am=0.0
+            for payment in order.statement_ids:
+                am+=payment.amount
 
-            for payment in order.payments:
-                if not payment.journal_id.default_debit_account_id:
-                    raise osv.except_osv(_('No Default Debit Account !'),
-                        _('You have to define a Default Debit Account for your Financial Journals!\n'))
-
-                if not payment.journal_id.default_credit_account_id:
-                    raise osv.except_osv(_('No Default Credit Account !'),
-                        _('You have to define a Default Credit Account for your Financial Journals!\n'))
-
-                if payment.amount > 0:
-                    payment_account = payment.journal_id.default_debit_account_id.id
+                if am > 0:
+                    payment_account = \
+                        payment.statement_id.journal_id.default_debit_account_id.id
                 else:
-                    payment_account = payment.journal_id.default_credit_account_id.id
-
-                if payment.amount > 0:
-                    order_account = \
-                        order.sale_journal.default_credit_account_id.id
-                else:
-                    order_account = \
-                        order.sale_journal.default_debit_account_id.id
+                    payment_account = \
+                        payment.statement_id.journal_id.default_credit_account_id.id
 
                 # Create one entry for the payment
+                if payment.is_acc:
+                    continue
                 payment_move_id = account_move_obj.create(cr, uid, {
-                    'journal_id': payment.journal_id.id,
+                    'journal_id': payment.statement_id.journal_id.id,
                     'period_id': period,
                 }, context=context)
-                account_move_line_obj.create(cr, uid, {
-                    'name': order.name,
-                    'date': order.date_order,
-                    'ref': order.name,
-                    'move_id': payment_move_id,
-                    'account_id': payment_account,
-                    'credit': ((payment.amount<0) and -payment.amount) or 0.0,
-                    'debit': ((payment.amount>0) and payment.amount) or 0.0,
-                    'journal_id': payment.journal_id.id,
-                    'period_id': period,
-                    'partner_id' : order.partner_id and order.partner_id.id or False,
-                }, context=context)
-                to_reconcile.append(account_move_line_obj.create(cr, uid, {
-                    'name': order.name,
-                    'date': order.date_order,
-                    'ref': order.name,
-                    'move_id': payment_move_id,
-                    'account_id': order_account,
-                    'credit': ((payment.amount>0) and payment.amount) or 0.0,
-                    'debit': ((payment.amount<0) and -payment.amount) or 0.0,
-                    'journal_id': payment.journal_id.id,
-                    'period_id': period,
-                    'partner_id' : order.partner_id and order.partner_id.id or False,
-                }, context=context))
 
-            account_move_obj.button_validate(cr, uid, [move_id, payment_move_id], context=context)
-            account_move_line_obj.reconcile(cr, uid, to_reconcile, type='manual', context=context)
+            for stat_l in order.statement_ids:
+                if stat_l.is_acc and len(stat_l.move_ids):
+                    for st in stat_l.move_ids:
+                        for s in st.line_id:
+                            if s.credit:
+                                account_move_line_obj.copy(cr, uid, s.id, { 'debit': s.credit,
+                                                                            'statement_id': False,
+                                                                            'credit': s.debit})
+                                account_move_line_obj.copy(cr, uid, s.id, {
+                                                                        'statement_id': False,
+                                                                        'account_id':order_account
+                                                                     })
+           #     account_move_obj.button_validate(cr, uid, [move_id, payment_move_id], context=context)
+            self.write(cr,uid,order.id,{'state':'done'})
+         #       account_move_line_obj.reconcile(cr, uid, to_reconcile, type='manual', context=context)
         return True
 
+    def cancel_picking(self, cr, uid, ids, context=None):
+        for order in self.browse(cr, uid, ids, context=context):
+            for picking in order.pickings:
+                self.pool.get('stock.picking').unlink(cr, uid, [picking.id], context)
+        return True
+
+
+    def action_payment(self, cr, uid, ids, context=None):
+        vals = {'state': 'payment'}
+        for pos in self.browse(cr, uid, ids):
+            create_contract_nb = False
+            for line in pos.lines:
+                if line.product_id.product_type == 'MD':
+                    create_contract_nb = True
+                    break
+            if create_contract_nb:
+                seq = self.pool.get('ir.sequence').get(cr, uid, 'pos.user_%s' % pos.user_id1.login)
+                vals['contract_number'] ='%s-%s' % (pos.user_id1.login, seq)
+        self.write(cr, uid, ids, vals)
+
     def action_paid(self, cr, uid, ids, context=None):
-        if context is None:
+        if not context:
             context = {}
-        self.create_picking(cr, uid, ids, context=context)
-        self.write(cr, uid, ids, {'state': 'paid'})
+        if context.get('flag',False):
+            self.create_picking(cr, uid, ids, context={})
+            self.write(cr, uid, ids, {'state': 'paid'})
+        else:
+            context['flag']=True
         return True
 
     def action_cancel(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        self.cancel_order(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state': 'cancel'})
         return True
 
     def action_done(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        self.create_account_move(cr, uid, ids, context=context)
-        self.write(cr, uid, ids, {'state': 'done'})
+        for order in self.browse(cr, uid, ids, context=context):
+            if not order.journal_entry:
+                self.create_account_move(cr, uid, ids, context={})
+        #self.write(cr, uid, ids, {'state': 'done'})
         return True
 
+    def compute_state(self, cr, uid, id):
+        cr.execute("select act.id, act.name from wkf_activity act "
+                   "inner join wkf_workitem item on act.id=item.act_id "
+                   "inner join wkf_instance inst on item.inst_id=inst.id "
+                   "inner join wkf on inst.wkf_id=wkf.id "
+                   "where wkf.osv='pos.order' and inst.res_id=%s "
+                   "order by act.name", (id,))
+        return [name for id, name in cr.fetchall()]
+
 pos_order()
 
+class account_bank_statement(osv.osv):
+    _inherit = 'account.bank.statement'
+    _columns={
+        'user_id': fields.many2one('res.users',ondelete='cascade',string='User', readonly=True),
+    }
+    _defaults = {
+        'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id
+    }
+account_bank_statement()
+
+class account_bank_statement_line(osv.osv):
+    _inherit = 'account.bank.statement.line'
+    def _get_statement_journal(self, cr, uid, ids, context, *a):
+        res = {}
+        for line in self.browse(cr, uid, ids):
+            res[line.id] = line.statement_id and line.statement_id.journal_id and line.statement_id.journal_id.name or None
+        return res
+    _columns={
+        'journal_id': fields.function(_get_statement_journal, method=True,store=True, string='Journal', type='char', size=64),
+        'am_out':fields.boolean("To count"),
+        'is_acc':fields.boolean("Is accompte"),
+        'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'),
+    }
+account_bank_statement_line()
 
 class pos_order_line(osv.osv):
     _name = "pos.order.line"
     _description = "Lines of Point of Sale"
 
-    def _amount_line(self, cr, uid, ids, field_name, arg, context):
+    def _get_amount(self, cr, uid, ids, field_name, arg, context):
         res = {}
         for line in self.browse(cr, uid, ids):
-            res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
+            price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
+            res[line.id]=price
+        return res
+
+    def _amount_line_ttc(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        account_tax_obj = self.pool.get('account.tax')
+        for line in self.browse(cr, uid, ids):
+            tax_amount = 0.0
+            taxes = [t for t in line.product_id.taxes_id]
+            computed_taxes = account_tax_obj.compute(cr, uid, taxes, line.price_unit, line.qty)
+            for tax in computed_taxes:
+                tax_amount += tax['amount']
+            price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
+            if line.discount!=0.0:
+                res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
+            else:
+                res[line.id]=line.price_unit*line.qty
+            res[line.id] = res[line.id] + tax_amount
+            
+        return res
+    def _amount_line(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+
+        for line in self.browse(cr, uid, ids):
+            price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
+            if line.discount!=0.0:
+                res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
+#                res[line.id] = price * line.qty * (1 - (line.discount or 0.0) / 100.0)
+            else:
+                res[line.id]=line.price_unit*line.qty
         return res
 
     def price_by_product(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
@@ -810,9 +1061,9 @@ class pos_order_line(osv.osv):
             raise osv.except_osv(_('No Pricelist !'),
                 _('You have to select a pricelist in the sale form !\n' \
                 'Please set one before choosing a product.'))
-
+        p_obj = self.pool.get('product.product').browse(cr,uid,product_id).list_price
         price = self.pool.get('product.pricelist').price_get(cr, uid,
-            [pricelist], product_id, qty or 1.0, partner_id)[pricelist]
+            [pricelist], product_id, qty or 1.0, partner_id)[pricelist] 
         if price is False:
             raise osv.except_osv(_('No valid pricelist line found !'),
                 _("Couldn't find a pricelist line matching this product" \
@@ -822,17 +1073,66 @@ class pos_order_line(osv.osv):
 
     def onchange_product_id(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
         price = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
+        self.write(cr,uid,ids,{'price_unit':price})
+        return {'value': {'price_unit': price}, 'qty': 1}
 
-        return {'value': {'price_unit': price}}
+    def onchange_subtotal(self, cr, uid, ids, discount, price, pricelist,qty,partner_id, product_id,*a):
+        prod_obj = self.pool.get('product.product')
+        price_f = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
+        prod_id=''
+        if product_id:
+            prod_id=prod_obj.browse(cr,uid,product_id).disc_controle
+        disc=0.0
+        if (disc != 0.0 or prod_id) and price_f>0:
+            disc=100-(price/price_f*100)
+            return {'value':{'discount':disc, 'price_unit':price_f}}#,'notice':''}}#, 'price_subtotal':(price_f*qty*(1-disc))}}
+        return {}
 
+    def onchange_ded(self, cr, uid,ids, val_ded,price_u,*a):
+        pos_order = self.pool.get('pos.order.line')
+        res_obj = self.pool.get('res.users')
+        res_company = self.pool.get('res.company')
+        comp = res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
+        val=0.0
+        if val_ded and price_u:
+            val=100.0*val_ded/price_u
+        if val > comp:
+            return {'value': {'discount':val, 'notice':'' }}
+        return {'value': {'discount':val}}
+
+    def onchange_discount(self, cr, uid,ids, discount,price,*a):
+        pos_order = self.pool.get('pos.order.line')
+        res_obj = self.pool.get('res.users')
+        res_company = self.pool.get('res.company')
+        company_disc = pos_order.browse(cr,uid,ids)
+        if discount:
+            if not company_disc:
+                comp=res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
+            else:
+                comp= company_disc[0] and company_disc[0].order_id.company_id and  company_disc[0].order_id.company_id.company_discount  or 0.0
+
+            if discount > comp :
+                return {'value': {'notice':'','price_ded':price*discount*0.01 or 0.0  }}
+            else:
+                return {'value': {'notice':'Minimum Discount','price_ded':price*discount*0.01 or 0.0  }}
+        else :
+            return {'value': {'notice':'No Discount', 'price_ded':price*discount*0.01 or 0.0 }}
     _columns = {
         'name': fields.char('Line Description', size=512),
+        'company_id':fields.many2one('res.company', 'Company', required=True),
+        'notice': fields.char('Discount Notice', size=128, required=True),
+        'serial_number': fields.char('Serial Number', size=128),
+#        'contract_number': fields.char('Contract Number', size=512),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True),
-        'price_unit': fields.float('Unit Price', required=True),
+#        'price_unit': fields.float('Unit Price'),
+        'price_unit': fields.function(_get_amount, method=True, string='Unit Price', store=True),
+        'price_ded': fields.float('Discount(Amount)'),
         'qty': fields.float('Quantity'),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal'),
+        'qty_rfd': fields.float('Refunded Quantity'),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal w/o Tax'),
+        'price_subtotal_incl': fields.function(_amount_line_ttc, method=True, string='Subtotal'),
         'discount': fields.float('Discount (%)', digits=(16, 2)),
-        'order_id': fields.many2one('pos.order', 'Order Reference', ondelete='cascade'),
+        'order_id': fields.many2one('pos.order', 'Order Ref', ondelete='cascade'),
         'create_date': fields.datetime('Creation Date', readonly=True),
         }
 
@@ -840,6 +1140,9 @@ class pos_order_line(osv.osv):
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.order.line'),
         'qty': lambda *a: 1,
         'discount': lambda *a: 0.0,
+        'price_ded': lambda *a: 0.0,
+        'notice': lambda *a: 'No Discount',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
         }
 
     def create(self, cr, user, vals, context={}):
@@ -862,7 +1165,7 @@ class pos_order_line(osv.osv):
 
         product_id = self.pool.get('product.product').search(cr, uid, [('ean13','=', ean)])
         if not product_id:
-            return False
+           return False
 
         # search price product
         product = self.pool.get('product.product').read(cr, uid, product_id)
@@ -884,7 +1187,7 @@ class pos_order_line(osv.osv):
                    }
             line_id = self.create(cr, uid, vals)
             if not line_id:
-                raise except_wizard(_('Error'), _('Create line failed !'))
+                raise wizard.except_wizard(_('Error'), _('Create line failed !'))
         else:
             vals = {
                 'qty': qty,
@@ -892,19 +1195,12 @@ class pos_order_line(osv.osv):
             }
             line_id = self.write(cr, uid, order_line_id, vals)
             if not line_id:
-                raise except_wizard(_('Error'), _('Modify line failed !'))
+                raise wizard.except_wizard(_('Error'), _('Modify line failed !'))
             line_id = order_line_id
 
         price_line = float(qty)*float(price)
         return {'name': product_name, 'product_id': product_id[0], 'price': price, 'price_line': price_line ,'qty': qty }
 
-    def unlink(self, cr, uid, ids, context={}):
-        """Allows to delete pos order lines in draft,cancel state"""
-        for rec in self.browse(cr, uid, ids, context=context):
-            if rec.order_id.state not in ['draft','cancel']:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete an order line which is %s !')%(rec.order_id.state,))
-        return super(pos_order_line, self).unlink(cr, uid, ids, context=context)
-
 pos_order_line()
 
 
@@ -928,7 +1224,7 @@ class pos_payment(osv.osv):
 
     _columns = {
         'name': fields.char('Description', size=64),
-        'order_id': fields.many2one('pos.order', 'Order Reference', required=True, ondelete='cascade'),
+        'order_id': fields.many2one('pos.order', 'Order Ref', required=True, ondelete='cascade'),
         'journal_id': fields.many2one('account.journal', "Journal", required=True),
         'payment_id': fields.many2one('account.payment.term','Payment Term', select=True),
         'payment_nb': fields.char('Piece Number', size=32),
@@ -963,33 +1259,266 @@ class report_transaction_pos(osv.osv):
     _auto = False
     _columns = {
         'date_create': fields.char('Date', size=16, readonly=True),
-        'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
+        'journal_id': fields.many2one('account.journal', 'Sales Journal', readonly=True),
+        'jl_id': fields.many2one('account.journal', 'Cash Journals', readonly=True),
         'user_id': fields.many2one('res.users', 'User', readonly=True),
         'no_trans': fields.float('Number of Transaction', readonly=True),
         'amount': fields.float('Amount', readonly=True),
-        'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
+        'invoice_id': fields.float('Nbr Invoice', readonly=True),
+        'invoice_am': fields.float('Invoice Amount', readonly=True),
+        'product_nb': fields.float('Product Nb.', readonly=True),
+        'disc': fields.float('Disc.', readonly=True),
     }
 
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_transaction_pos')
         cr.execute("""
             create or replace view report_transaction_pos as (
-                select
-                    min(pp.id) as id,
-                    count(pp.id) as no_trans,
-                    sum(amount) as amount,
-                    pp.journal_id,
-                    to_char(pp.create_date, 'YYYY-MM-DD') as date_create,
-                    ps.user_id,
-                    ps.invoice_id
+               select
+                    min(absl.id) as id,
+                    count(absl.id) as no_trans,
+                    sum(absl.amount) as amount,
+                    sum(line.price_ded) as disc,
+                    to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
+                    po.user_id as user_id,
+                    po.sale_journal as journal_id,
+                    abs.journal_id as jl_id,
+                    count(po.invoice_id) as invoice_id,
+                    count(p.id) as product_nb
                 from
-                    pos_payment pp, pos_order ps
-                WHERE ps.id = pp.order_id
+                    account_bank_statement_line as absl,
+                    account_bank_statement as abs,
+                    product_product as p,
+                    pos_order_line as line,
+                    pos_order as po
+                where
+                    absl.pos_statement_id = po.id and
+                    line.order_id=po.id and
+                    line.product_id=p.id and
+                    absl.statement_id=abs.id
+
                 group by
-                    pp.journal_id, date_create, ps.user_id, ps.invoice_id
-            )
-            """)
+                    po.user_id,po.sale_journal, abs.journal_id,
+                    to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text
+                )
+        """)
+                    #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')
+                    #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
 report_transaction_pos()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+class report_sales_by_user_pos(osv.osv):
+    _name = "report.sales.by.user.pos"
+    _description = "Sales by user"
+    _auto = False
+    _columns = {
+        'date_order': fields.date('Order Date',required=True, select=True),
+        'amount': fields.float('Total', readonly=True, select=True),
+        'qty': fields.float('Quantity', readonly=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+    }
 
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_user_pos')
+        cr.execute("""
+            create or replace view report_sales_by_user_pos as (
+                select
+                    min(po.id) as id,
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    po.user_id as user_id,
+                    sum(pol.qty)as qty,
+                    sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
+                from
+                    pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt
+                where
+                    pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id
+               group by
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text,
+                    po.user_id
+
+                )
+        """)
+report_sales_by_user_pos()
+
+class report_sales_by_user_pos_month(osv.osv):
+    _name = "report.sales.by.user.pos.month"
+    _description = "Sales by user monthly"
+    _auto = False
+    _columns = {
+        'date_order': fields.date('Order Date',required=True, select=True),
+        'amount': fields.float('Total', readonly=True, select=True),
+        'qty': fields.float('Quantity', readonly=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_user_pos_month')
+        cr.execute("""
+            create or replace view report_sales_by_user_pos_month as (
+                select
+                    min(po.id) as id,
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    po.user_id as user_id,
+                    sum(pol.qty)as qty,
+                    sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
+                from
+                    pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt
+                where
+                    pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id
+               group by
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text,
+                    po.user_id
+
+                )
+        """)
+report_sales_by_user_pos_month()
+
+class report_sales_by_margin_pos(osv.osv):
+    _name = "report.sales.by.margin.pos"
+    _description = "Sales by margin"
+    _auto = False
+    _columns = {
+#        'pos_name': fields.char('POS Order', size=64, readonly=True),
+        'product_name':fields.char('Product Name', size=64, readonly=True),
+        'date_order': fields.date('Order Date',required=True, select=True),
+        'amount': fields.float('Total', readonly=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+        'qty': fields.float('Qty', readonly=True, select=True),
+        'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
+        'total':fields.float('Margin', readonly=True, select=True),
+
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos')
+        cr.execute("""
+            create or replace view report_sales_by_margin_pos as (
+                select
+                    min(pol.id) as id,
+                    po.user_id as user_id,
+                    pt.name as product_name,
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    sum(pol.qty) as qty,
+                    pt.list_price-pt.standard_price as net_margin_per_qty,
+                    (pt.list_price-pt.standard_price) *sum(pol.qty) as total
+                from
+                    product_template as pt,
+                    product_product as pp,
+                    pos_order_line as pol,
+                    pos_order as po
+                where
+                    pol.product_id = pp.product_tmpl_id and
+                    pp.product_tmpl_id = pt.id and
+                    po.id = pol.order_id
+
+                group by
+                    pt.name,
+                    pt.list_price,
+                    pt.standard_price,
+                    po.user_id,
+                    to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text
+
+                )
+        """)
+report_sales_by_margin_pos()
+
+class report_sales_by_margin_pos_month(osv.osv):
+    _name = "report.sales.by.margin.pos.month"
+    _description = "Sales by margin monthly"
+    _auto = False
+    _columns = {
+#        'pos_name': fields.char('POS Order', size=64, readonly=True),
+        'product_name':fields.char('Product Name', size=64, readonly=True),
+        'date_order': fields.date('Order Date',required=True, select=True),
+        'amount': fields.float('Total', readonly=True, select=True),
+        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+        'qty': fields.float('Qty', readonly=True, select=True),
+        'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
+        'total':fields.float('Margin', readonly=True, select=True),
+
+    }
+
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos_month')
+        cr.execute("""
+            create or replace view report_sales_by_margin_pos_month as (
+                select
+                    min(pol.id) as id,
+                    po.user_id as user_id,
+                    pt.name as product_name,
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
+                    sum(pol.qty) as qty,
+                    pt.list_price-pt.standard_price as net_margin_per_qty,
+                    (pt.list_price-pt.standard_price) *sum(pol.qty) as total
+                from
+                    product_template as pt,
+                    product_product as pp,
+                    pos_order_line as pol,
+                    pos_order as po
+                where
+                    pol.product_id = pp.product_tmpl_id and
+                    pp.product_tmpl_id = pt.id and
+                    po.id = pol.order_id
+
+                group by
+                    pt.name,
+                    pt.list_price,
+                    pt.standard_price,
+                    po.user_id,
+                    to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text
+
+                )
+        """)
+report_sales_by_margin_pos_month()
+
+
+class account_move_line(osv.osv):
+    _inherit = 'account.move.line'
+    def create(self, cr, user, vals, context={}):
+        pos_obj = self.pool.get('pos.order')
+        val_name = vals.get('name', '')
+        val_ref = vals.get('ref', '')
+        if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
+            aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
+            name_pos = aaa.groups()[0]
+            pos_id = name_pos.replace('POS ','')
+            if pos_id and pos_id.isdigit():
+                pos_curr = pos_obj.browse(cr,user,int(pos_id))
+                pos_curr = pos_curr  and pos_curr.contract_number or ''
+                vals['ref'] = pos_curr or vals.get('ref')
+        return super(account_move_line, self).create(cr, user, vals, context)
+
+account_move_line()
+
+
+class account_move(osv.osv):
+    _inherit = 'account.move'
+    def create(self, cr, user, vals, context={}):
+        pos_obj = self.pool.get('pos.order')
+        val_name = vals.get('name', '')
+        val_ref = vals.get('ref', '')
+        if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
+            aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
+            name_pos = aaa.groups()[0]
+            pos_id = name_pos.replace('POS ','')
+            if pos_id and pos_id.isdigit():
+                pos_curr = pos_obj.browse(cr,user,int(pos_id))
+                pos_curr = pos_curr  and pos_curr.contract_number or ''
+                vals['ref'] = pos_curr or vals.get('ref')
+        return super(account_move, self).create(cr, user, vals, context)
+
+account_move()
+
+
+class product_product(osv.osv):
+    _inherit = 'product.product'
+    _columns = {
+        'income_pdt': fields.boolean('Product for Incoming'),
+        'expense_pdt': fields.boolean('Product for expenses'),
+        'am_out': fields.boolean('Controle for Outgoing Operations'),
+        'disc_controle': fields.boolean('Discount Controle '),
+}
+    _defaults = {
+        'disc_controle': lambda *a: True,
+}
+product_product()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/pos_account_bank_statement.py b/addons/point_of_sale/pos_account_bank_statement.py
new file mode 100644
index 00000000000..887a7b8060c
--- /dev/null
+++ b/addons/point_of_sale/pos_account_bank_statement.py
@@ -0,0 +1,54 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+import netsvc
+
+
+class account_bank_statement(osv.osv):
+    _inherit = 'account.bank.statement'
+    _columns = {
+        'company_id':fields.many2one('res.company', 'Company', required=True),
+    }
+    _defaults = {
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+    }
+account_bank_statement()
+
+class account_bank_statement_line(osv.osv):
+    def _default_company(self, cr, uid, context={}):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if user.company_id:
+            return user.company_id.id
+        return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+    _inherit = 'account.bank.statement.line'
+    _columns = {
+        'company_id':fields.many2one('res.company', 'Company', required=True),
+    }
+    _defaults = {
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+    }
+account_bank_statement_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/pos_data.xml b/addons/point_of_sale/pos_data.xml
index 5e562bc2ad7..8ff4697804e 100644
--- a/addons/point_of_sale/pos_data.xml
+++ b/addons/point_of_sale/pos_data.xml
@@ -1,32 +1,60 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
+    <data>
+        <record id="cat1" model="product.category">
+            <field name="name">Paiement</field>
+        </record>
+        <record id="advance_product_pos" model="product.product">
+            <field name="name">Acompte</field>
+            <field name="categ_id" ref="cat1"/>
+            <field name="type">service</field>
+            <field name="list_price">0.0</field>
+            <field name="standard_price">0.0</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <!--  <field name="company_id" ref="base.main_company"/>  -->
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+        </record>
 
-<!-- FIXME : -->
+        <record id="advance_product_pos2" model="product.product">
+            <field name="name">Reparation</field>
+            <field name="categ_id" ref="cat1"/>
+            <field name="type">service</field>
+            <field name="list_price">100.0</field>
+            <field name="standard_price">100.0</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <!--  <field name="company_id" ref="multi_company_stock.res_company_tinyshop0"/> -->
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+        </record>
 
-<!-- model access -->
-<!-- 	<record id="access_pos" model="ir.model.access"> -->
-<!-- 		<field name="name">pos</field> -->
-<!-- 		<field name="model_id" eval="(6,0,pos.order)" /> -->
-<!-- 		<field name="group_id">admin</field> -->
-<!-- 		<field name="perm_read">True</field> -->
-<!-- 		<field name="perm_write">True</field> -->
-<!-- 		<field name="perm_create">True</field> -->
-<!-- 		<field name="perm_unlink">True</field> -->
-<!-- 	</record> -->
+        <record id="product_category_voucher" model="product.category">
+            <field name="name">Bon</field>
+        </record>
 
-    <function
-        eval="('default',False,'pricelist_id', [('pos.order', False)], ref('product.list0'), True, False, False, False, True)"
-        id="pos_pricelist_set"
-        model="ir.values"
-        name="set"/>
+        <record id="product_product_giftvoucher" model="product.product">
+            <field name="default_code">GIFT</field>
+            <field name="supply_method">produce</field>
+            <field name="list_price">1.0</field>
+            <field name="standard_price">1.0</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="sale_delay">0.0</field>
+            <field name="name">Cheque cadeau</field>
+            <field name="categ_id" ref="product_category_voucher"/>
+        </record>
 
-    <function
-        eval="('default',False,'shop_id', [('pos.order', False)], ref('sale.shop'), True, False, False, False, True)"
-        id="pos_shop_set"
-        model="ir.values"
-        name="set"/>
-
-
-</data>
+        <record id="product_product_shipping_cost" model="product.product">
+            <field name="default_code">PORT01</field>
+            <field name="supply_method">produce</field>
+            <field name="list_price">1.0</field>
+            <field name="standard_price">1.0</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="sale_delay">0.0</field>
+            <field name="name">Shipping cost</field>
+            <field name="categ_id" ref="product_category_voucher"/>
+            <field name="type">service</field>
+            <field name="produce_delay">0</field>
+            <field name="purchase_ok" eval="False" />
+        </record>
+    </data>
 </openerp>
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
new file mode 100644
index 00000000000..789d96b897d
--- /dev/null
+++ b/addons/point_of_sale/pos_demo.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0"?>
+<openerp>
+
+	<data >
+        <record id="res_partner_tinyshop1" model="res.partner">
+			    <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+        </record>
+
+        <record id="res_company_tinyshop1" model="res.company">
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+        </record>
+        <record id="res_company_tinyshop0" model="res.company">
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
+        </record>
+        <record id="res_company_shop0" model="res.company">
+            <field eval="5.0" name="security_lead"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+
+        </record>
+    </data>
+	<data noupdate="1">
+		<record id="res_users_sofia0" model="res.users">
+			<field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+			<field eval="[(6,0,[ref('base.group_user'),ref('stock.group_stock_user')])]" name="groups_id"/>
+			<field eval="[(6,0,[])]" name="roles_id"/>
+			<field eval="1" name="active"/>
+			<field eval="&quot;&quot;&quot;shop3&quot;&quot;&quot;" name="password"/>
+			<field eval="&quot;&quot;&quot;en_US&quot;&quot;&quot;" name="context_lang"/>
+			<field eval="&quot;&quot;&quot;Shop 3&quot;&quot;&quot;" name="name"/>
+			<field name="company_id" ref="res_company_shop0"/>
+			<field eval="&quot;&quot;&quot;shop3&quot;&quot;&quot;" name="login"/>
+			<field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+		</record>
+	</data>
+  <data>
+		<record id="pos_order_pos0" model="pos.order">
+			<field name="sale_journal" ref="account.sales_journal"/>
+			<field eval="&quot;&quot;&quot;2009-11-29&quot;&quot;&quot;" name="date_validity"/>
+			<field name="shop_id" ref="sale.shop"/>
+			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
+			<field name="partner_id" ref="base.res_partner_5"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field name="user_id1" ref="base.user_root"/>
+			<field eval="&quot;&quot;&quot;POS/001&quot;&quot;&quot;" name="name"/>
+			<field name="company_id" ref="res_company_tinyshop0"/>
+			<field eval="0" name="invoice_wanted"/>
+			<field eval="&quot;&quot;&quot;tax_excluded&quot;&quot;&quot;" name="price_type"/>
+			<field eval="&quot;&quot;&quot;draft&quot;&quot;&quot;" name="state"/>
+			<field name="pricelist_id" ref="product.list0"/>
+		</record>
+		<record id="pos_order_line_orderline0" model="pos.order.line">
+			<field eval="0.5" name="discount"/>
+			<field name="product_id" ref="product.product_product_pc2"/>
+			<field eval="&quot;&quot;&quot;Order Line/01&quot;&quot;&quot;" name="name"/>
+			<field name="order_id" ref="pos_order_pos0"/>
+			<field eval="750.0" name="price_unit"/>
+			<field name="company_id" ref="res_company_tinyshop0"/>
+			<field eval="5.0" name="qty"/>
+		</record>
+		<record id="pos_order_line_orderline1" model="pos.order.line">
+			<field eval="1.0" name="discount"/>
+			<field name="product_id" ref="product.product_product_cpu1"/>
+			<field eval="&quot;&quot;&quot;Order Line/02&quot;&quot;&quot;" name="name"/>
+			<field name="order_id" ref="pos_order_pos0"/>
+			<field name="company_id" ref="res_company_tinyshop0"/>
+			<field eval="75.0" name="price_unit"/>
+			<field eval="1" name="qty"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="pos_order_pos1" model="pos.order">
+			<field name="sale_journal" ref="account.sales_journal"/>
+			<field eval="&quot;&quot;&quot;2009-11-29&quot;&quot;&quot;" name="date_validity"/>
+      <field name="shop_id" ref="sale.shop"/>
+			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
+			<field name="partner_id" ref="base.res_partner_3"/>
+			<field name="user_id" ref="res_users_sofia0"/>
+			<field name="user_id1" ref="base.user_root"/>
+			<field eval="&quot;&quot;&quot;POS/002&quot;&quot;&quot;" name="name"/>
+			<field name="company_id" ref="res_company_shop0"/>
+			<field eval="&quot;&quot;&quot;tax_excluded&quot;&quot;&quot;" name="price_type"/>
+			<field eval="0" name="invoice_wanted"/>
+			<field eval="&quot;&quot;&quot;draft&quot;&quot;&quot;" name="state"/>
+			<field name="pricelist_id" ref="product.list0"/>
+		</record>
+
+		 <!--
+	Resource: pos.order.line
+	-->
+		<record id="pos_order_line_orderline2" model="pos.order.line">
+			<field eval="1.0" name="discount"/>
+			<field name="product_id" ref="product.product_product_hdd1"/>
+			<field eval="&quot;&quot;&quot;Order Line/04&quot;&quot;&quot;" name="name"/>
+			<field name="order_id" ref="pos_order_pos1"/>
+			<field eval="50.0" name="price_unit"/>
+		    <field name="company_id" ref="res_company_shop0"/>
+			<field eval="10.0" name="qty"/>
+		</record>
+
+
+
+		 <function
+        eval="('default',False,'pricelist_id', [('pos.order', False)], ref('product.list0'), True, False, False, False, True)"
+        id="pos_pricelist_set"
+        model="ir.values"
+        name="set"/>
+
+    <function
+        eval="('default',False,'shop_id', [('pos.order', False)], ref('sale.shop'), True, False, False, False, True)"
+        id="pos_shop_set"
+        model="ir.values"
+        name="set"/>
+		<record id="pos_order_posadvance" model="pos.order">
+			<field eval="&quot;&quot;&quot;tax_excluded&quot;&quot;&quot;" name="price_type"/>
+			<field name="sale_journal" ref="account.sales_journal"/>
+			<field eval="&quot;&quot;&quot;2009-11-29&quot;&quot;&quot;" name="date_validity"/>
+			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
+			<field name="partner_id" ref="base.res_partner_3"/>
+			<field name="user_id" ref="res_users_sofia0"/>
+			<field name="user_id1" ref="base.user_root"/>
+			<field eval="&quot;&quot;&quot;POS/0012&quot;&quot;&quot;" name="name"/>
+			<field name="company_id" ref="res_company_shop0"/>
+			<field eval="0" name="invoice_wanted"/>
+			<field eval="&quot;&quot;&quot;draft&quot;&quot;&quot;" name="state"/>
+			<field name="pricelist_id" ref="product.list0"/>
+      <field name="shop_id" ref="sale.shop"/>
+    </record>
+
+<!--		<record id="pos_order_line_orderlineadv" model="pos.order.line">
+			<field eval="0.0" name="discount"/>
+			<field name="product_id" ref="advance_product_pos"/>
+			<field eval="&quot;&quot;&quot;Order Line/Advance&quot;&quot;&quot;" name="name"/>
+			<field name="order_id" ref="pos_order_posadvance"/>
+			<field eval="50.0" name="price_unit"/>
+		    <field name="company_id" ref="res_company_shop0"/>
+			<field eval="-1.0" name="qty"/>
+		</record-->
+          <record id="data_fiscalyear" model="account.fiscalyear">
+            <field eval="'Fiscal Year Shop '+time.strftime('%Y')" name="name"/>
+            <field eval="'FY'+time.strftime('%Y')" name="code"/>
+            <field eval="time.strftime('%Y')+'-01-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+             <record id="period_j6" model="account.period">
+            <field eval="'Jun.'+time.strftime('%Y')" name="name"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="True" name="special"/>
+            <field eval="time.strftime('%Y')+'-06-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-06-30'" name="date_stop"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+        <record id="period_j7" model="account.period">
+            <field eval="'Jul.'+time.strftime('%Y')" name="name"/>
+            <field eval="True" name="special"/>
+            <field name="fiscalyear_id" ref="data_fiscalyear"/>
+            <field eval="time.strftime('%Y')+'-07-01'" name="date_start"/>
+            <field eval="time.strftime('%Y')+'-07-31'" name="date_stop"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+        <record id="a_recv" model="account.account">
+            <field name="name">Main Receivable</field>
+            <field name="code">x 40000</field>
+            <field name="type">receivable</field>
+            <field name="user_type" ref="account.account_type_asset"/>
+            <field eval="ref('account.minimal_0')" name="parent_id"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field eval="True" name="reconcile"/>
+            <field name="company_id" ref="res_company_shop0"/>
+            <field name="user_type" ref="account.account_type_income"/>
+            <field name="note">
+This chart of account is used for automated testing purpose. It is installed
+only if you selected demo data during your database creation. Modules can
+do black box testing on entries on this chart of account, without modifying
+your own chart of account.
+</field>
+        </record>
+<!--        <record id="stock_location.product_pulled_flow_d1" model="product.pulled.flow">
+          <field name="partner_addr_id" ref="multi_company_stock.res_partner_address_fabien0"/>
+        </record>
+
+        <record id="stock_location.product_pulled_flow_d2" model="product.pulled.flow">
+          <field name="partner_addr_id" ref="multi_company_stock.res_partner_address_eric0"/>
+        </record-->
+  </data>
+</openerp>
diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/pos_report.xml
index c9956c2c029..2e9ff5e6107 100644
--- a/addons/point_of_sale/pos_report.xml
+++ b/addons/point_of_sale/pos_report.xml
@@ -1,53 +1,145 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <openerp>
-  <data>
-    <report
-      id="pos_receipt"
-      string="Receipt"
-      model="pos.order"
-      name="pos.receipt"
-      rml="point_of_sale/report/pos_receipt.rml"
-      auto="False"
-      header="False"
-      />
+	<data>
+		<!--report
+			id="pos_receipt"
+			string="Receipt"
+			model="pos.order"
+			name="pos.receipt"
+			rml="point_of_sale/report/pos_receipt.rml"
+			auto="False"
+			header="False"
+			multi="True"
+			/-->
 
-    <report
-      id="pos_invoice_report"
-      string="Invoice"
-      model="pos.order"
-      name="pos.invoice"
-      auto="False"
-      rml="account/report/invoice.rml"
-       />
 
-    <report
-      id="pos_lines_detail"
-      string="Details of Sales"
-      model="pos.order"
-      name="pos.details"
-      auto="False"
-      multi="True"
-      rml="point_of_sale/report/pos_details.rml"
-       />
+<!--
+		<report
+			id="pos_receipt_with_remboursment"
+			string="Refund Receipt"
+			model="pos.order"
+			name="pos.receipt.with.remboursment"
+			rml="point_of_sale/report/pos_receipt_with_remboursment.rml"
+			auto="False"
+			header="False"
+			multi="True"
+			/>
+		<report
+			id="pos_receipt_without_remboursment"
+			string="Voucher Receipt"
+			model="pos.order"
+			name="pos.receipt.without.remboursment"
+			rml="point_of_sale/report/pos_receipt_without_remboursment.rml"
+			auto="False"
+			header="False"
+			multi="True"
+			/-->
 
-    <report
-      id="pos_details_summary"
-      string="Sales (summary)"
-      model="pos.order"
-      name="pos.details_summary"
-      auto="False"
-      multi="True"
-      rml="point_of_sale/report/pos_details_summary.rml"
-       />
+		<report
+			id="pos_invoice_report"
+			string="Invoice"
+			model="pos.order"
+			name="pos.invoice"
+			auto="False"
+			multi="True"
+			rml="account/report/invoice.rml"
+			 />
 
-    <report
-      id="pos_lines_report"
-      string="Pos Lines"
-      model="pos.order"
-      name="pos.lines"
-      auto="False"
-      rml="point_of_sale/report/pos_lines.rml"
-       />
+		<report
+			id="pos_lines_detail"
+			string="Details of Sales"
+			model="pos.order"
+			name="pos.details"
+			auto="False"
+			multi="True"
+			menu="False"
+			rml="point_of_sale/report/pos_details.rml"
+			 />
 
-  </data>
+		<report
+			id="pos_details_summary"
+			string="Sales (summary)"
+			model="pos.order"
+			name="pos.details_summary"
+			auto="False"
+			multi="True"
+			rml="point_of_sale/report/pos_details_summary.rml"
+			 />
+
+		<report
+			id="pos_lines_report"
+			string="Pos Lines"
+			model="pos.order"
+			name="pos.lines"
+			auto="False"
+			multi="True"
+			rml="point_of_sale/report/pos_lines.rml"
+			 />
+
+		<report
+			id="pos_payment_report"
+			string="Payment Report For Sale"
+			model="pos.order"
+			name="pos.payment.report"
+			auto="False"
+			multi="True"
+			menu="True"
+			rml="point_of_sale/report/pos_payment_report.rml"
+			 />
+
+		<report
+			id="pos_sales_user"
+			string="Sales Report"
+			model="pos.order"
+			name="pos.sales.user"
+			auto="False"
+			multi="True"
+			menu="False"
+			rml="point_of_sale/report/pos_sales_user.rml"
+			 />
+
+		<report
+			id="pos_sales_user_today"
+			string="Today's Sales"
+			model="pos.order"
+			name="pos.sales.user.today"
+			auto="False"
+			multi="True"
+			menu="False"
+			rml="point_of_sale/report/pos_sales_user_today.rml"
+			 />
+
+		<report
+			id="pos_payment_report_date"
+			string="Payment Report"
+			model="pos.order"
+			name="pos.payment.report.date"
+			auto="False"
+			multi="True"
+			menu="False"
+			rml="point_of_sale/report/pos_payment_report_date.rml"
+			 />
+		<report
+			id="pos_payment_report_user"
+			string="Today's Payment By User"
+			model="pos.order"
+			name="pos.payment.report.user"
+			auto="False"
+			multi="True"
+			menu="False"
+			rml="point_of_sale/report/pos_payment_report_user.rml"
+			 />
+		<report
+			id="pos_sales_user_today_current_user"
+			string="Today's Sales by Current User"
+			model="pos.order"
+			name="pos.sales.user.today.current.user"
+			auto="False"
+			multi="True"
+			menu="False"
+			rml="point_of_sale/report/pos_sales_user_today_current_user.rml"
+			 />
+
+
+	</data>
 </openerp>
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 3f328f00f4d..f0afcd1aac1 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
         <record model="ir.ui.view" id="view_pos_pos_form">
             <field name="name">pos.order</field>
             <field name="model">pos.order</field>
@@ -9,103 +10,125 @@
                 <form string="Sales Order POS">
                     <notebook >
                         <page string="Order lines">
-                            <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
-                            <field name="pricelist_id" domain="[('type','=','sale')]"/>
-                            <field name="salesman_id" />
+                            <group colspan="4" col="6">
+                                <field name="user_id1" />
+                                <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
+                                <field name="contract_number" select="1" />
+                            </group>
                             <field name="lines" colspan="4" nolabel="1">
                                 <tree string="Order lines" editable="bottom">
+                                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275" />
+                                    <field name="qty" />
+                                    <field name="qty_rfd" />
+                                    <field name="discount" on_change="onchange_discount(discount,price_unit)" />
+                                    <field name="price_ded" on_change="onchange_ded(price_ded, price_unit)" />
+                                    <field name="price_unit" readonly="1"/>
+                                    <field name="notice"/>
+                                    <field name="serial_number"/>
+                                    <field name="price_subtotal" />
+                                    <field name="price_subtotal_incl"/>
+                                </tree>
+                                <form string="Order lines" >
                                     <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275"/>
                                     <field name="qty" />
-                                    <field name="discount" />
-                                    <field name="price_unit" />
-                                    <field name="price_subtotal"/>
-                                </tree>
-
-                                <form string="Order lines">
-                                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
-                                    <field name="qty" />
-                                    <field name="discount" />
-                                    <field name="price_unit" />
-                                    <field name="price_subtotal"/>
+                                    <field name="qty_rfd" />
+                                    <field name="discount" on_change="onchange_discount(discount,price_unit)" />
+                                    <field name="price_ded" on_change="onchange_ded(price_ded, price_unit)" />
+                                    <field name="price_unit"/>
+                                    <field name="notice"/>
+                                    <field name="serial_number"/>
                                 </form>
+
                             </field>
                             <group colspan="4" col="7">
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
-
-                                <button name="%(pos_add_product)d"
-                                    string="_Add product"
-                                    type="action" states="draft"/>
-
-                                <button name="dummy_button"
-                                    string="Compute"
-                                    type="object" />
-
+                                <button name="%(pos_discount)d" string="D_iscount" type="action" states="draft"/>
+                                <button name="dummy_button" string="Compute" type="object" />
                             </group>
 
+                            <group colspan="4" col="9" groups="base.group_extended">
+                            <separator colspan="4" string="Validation of the Sale"/>
+                                <newline/>
+                                <field name="state_2" select="2" />
+                                <button name="button_validate"
+                                		string="Accept"
+                                		type="object"
+                                     icon="gtk-ok"
+                                    states="paid, draft"
+                                		attrs="{'invisible':[('state_2','=','accepted')]}"/>
+                              </group>
+
                             <separator colspan="4" string="Actions"/>
-                            <group colspan="4" col="9">
+                            <group colspan="4" col="6">
 
-                                <field name="state" select="2"/>
+                                <field name="state" select="1"/>
 
-                                <button name="%(pos_discount)d"
-                                    string="D_iscount"
-                                    type="action" states="draft"/>
+                                <!--
+                                <button name="%(pos_add_product)d" string="_Add product" type="action" states="draft"/>
+                                -->
 
-                                <button name="%(pos_payment)d"
-                                    string="Ma_ke Payment"
-                                    type="action" states="draft"/>
+                                <button name="%(pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance"/>
+                                <button name="%(o_rec)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
 
-                                <button name="cancel"
-                                    string="Cancel"
-                                    states="paid"/>
 
-                                <button name="set_to_draft"
-                                    string="Set to draft"
-                                    states="cancel"
-                                    type="object" />
+                                <!--
+                                <button name="action_cancel" string="Cancel" type="object" states="paid" />
+                                -->
+                                <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
+
+                                <button name="%(pos_return_picking)d" string="Return Packing" type="action" icon="gtk-ok" states="paid"
+                                    attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"/>
 
-                                <button name="%(pos_confirm)d"
-                                    string="Close"
-                                    type="action"
-                                    states="paid"/>
                             </group>
                         </page>
 
-
                         <page string="Payment">
-                            <field name="payments" colspan="4" nolabel="1">
-                                <tree string="Payments" editable="bottom">
-                                    <field name="payment_id" />
-                                    <field name="payment_nb" />
-                                    <field name="payment_name" width="200" />
-                                    <field name="payment_date" />
-                                    <field name="amount" />
+                            <group colspan="2" col="2" name="Type">
+                                <separator string="Order Information" colspan="4"/>
+                                <field name="company_id"/>
+                                <field name="shop_id" widget="selection"  />
+                                <field name="name" select="1"/>
+                                <field name="user_id" />
+                                <field name="user_id2" />
+                                <field name="price_type" />
+                            </group>
+                            <group colspan="2" col="2" name="Type">
+                                <separator string="Dates" colspan="4"/>
+                                <field name="date_order" select="1" />
+                                <field name="date_payment" select="1"  />
+                                <field name="date_payment2" select="1"  groups="base.group_extended"/>
+                            </group>
+                            <group colspan="4">
+                                <separator string="Invoicing" colspan="4"/>
+                                <field name="sale_journal" domain="[('type','=','sale'),('company_id','=',company_id)]"/>
+                                <field name="pricelist_id" domain="[('type','=','sale')]" widget="selection"/>
+                                <field name="invoice_id"/>
+                                <group colspan="2" col="3">
+                                    <button name="invoice" string="Create _Invoice" states="paid"/>
+                                </group>
+                            </group>
+
+                            <field name="statement_ids" colspan="4" nolabel="1">
+                                <tree editable="bottom" string="Statement lines">
+                                    <field name="amount"/>
+                                    <field name="journal_id"/>
+                                    <field name="statement_id" />
                                 </tree>
+                                <form string="Statement lines">
+                                    <field name="account_id"/>
+                                    <field name="amount"/>
+                                    <field name="statement_id" domain="[('company_id','=',parent.company_id),('state','=','open')]"/>
+                                </form>
                             </field>
-                            <separator string="Invoicing" colspan="4"/>
-                            <field name="nb_print"/>
-                            <newline/>
-                            <field name="invoice_id"/>
-                            <label/>
-                            <button name="invoice" string="Create _Invoice" states="paid"/>
-                            <newline/>
-                            <field name="sale_journal"/>
-                            <field name="account_receivable"/>
                         </page>
 
-                        <page string="Other">
-                            <field name="shop_id" />
-                            <field name="name" select="1"/>
-                            <field name="date_order" select="1" />
-                            <field name="date_validity" />
-                            <field name="user_id" />
-
-                            <separator string="Notes" colspan="4"/>
-                            <field name="note" nolabel="1" colspan="4"/>
-                            <separator string="Picking" colspan="4"/>
-                            <field name="pickings" nolabel="1" colspan="4"/>
-
+                        <page string="Notes" >
+                            <separator string="Notes" colspan="4" />
+                            <group colspan="4">
+                                <field name="type_rec"  colspan="4"/>
+                                <field name="note"  colspan="4"/>
+                            </group>
                         </page>
                     </notebook>
 
@@ -120,7 +143,7 @@
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_pos_pos_form"/>
-            <field name="domain">[ ('date_order','>=',time.strftime('%Y-%m-%d 00:00:00')) ]</field>
+            <field name="domain">[['date_order','>=',time.strftime('%Y-%m-%d')]]</field>
         </record>
 
 
@@ -131,63 +154,83 @@
             <field name="arch" type="xml">
                 <tree string="POS Orders">
                     <field name="name"/>
-                    <field name="date_order"/>
+                    <field name="date_order" select="1"/>
+                    <field name="date_payment"/>
+                    <field name="date_payment2"/>
                     <field name="user_id"/>
                     <field name="invoice_id"/>
-                    <field name="last_out_picking"/>
-                    <field name="state"/>
+                    <field name="state" select="1"/>
                     <field name="amount_total" sum="Amount total"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
         <menuitem name="Point of Sale" id="menu_point_root" />
+        <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
+        <menuitem name="New Sale" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
+		<menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale" sequence="2" name="Products"/>
 
-        <wizard 
-            string="Wizard default journals"
-            model="pos.config.journal"
-            name="pos.config.journal"
-            menu="False"
-            id="wizard_default_journal"/>
+        <!--  POS Order view (date_payment)  -->
+         <record model="ir.actions.act_window" id="action_pos_pos_form_user">
+            <field name="name">Point of Sale</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_pos_order_tree"/>
+            <field name="domain">['|',('state_2','=','to_verify'),('state','=','advance')]</field>
+        </record>
+invoiced
 
-        <menuitem name="Configuration" parent="menu_point_root"
-            id="menu_point_config" sequence="0"/>
-        <menuitem
-            name="Default journals" parent="menu_point_config"
-            string="Default journals"
-            action="wizard_default_journal"
-            type="wizard"
-            id="menu_wizard_default_journal" />
-
-        <!-- 	<record model="ir.actions.act_window" id="action_pos_order_tree"> -->
-            <!-- 		<field name="name">pos.order</field> -->
-            <!-- 		<field name="type">ir.actions.act_window</field> -->
-            <!-- 		<field name="res_model">pos.order</field> -->
-            <!-- 		<field name="view_type">form</field> -->
-            <!-- 		<field name="view_mode">tree,form</field> -->
-            <!-- 		<field name="view_id" ref="pos.view_pos_order_tree"/> -->
-            <!-- 		<field name="domain">[('invoice_id','=',False)]</field> -->
-            <!-- 	</record> -->
-        <!-- 	<menuitem name="Point of Sale/Point of Sale/Orders not invoiced" id="menu_action_pos_order_tree" action="action_pos_order_tree"/> -->
-
-        <record model="ir.actions.act_window" id="action_pos_order_tree2">
-            <field name="name">Orders for today</field>
+		<record model="ir.actions.act_window" id="action_pos_order_tobinvoiced">
+            <field name="name">Sales to Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
-            <field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-%d')),('date_order','&lt;=',time.strftime('%Y-%m-%d'))]</field>
+            <field name="domain">[('state','!=', 'invoiced')]</field>
         </record>
-        <menuitem name="Point of Sale" parent="menu_point_root" id="menu_point_ofsale" action="action_pos_order_tree2"/>
+        <menuitem name="Invoicing" id="menu_point_of_sale_invoicing" parent="menu_point_root" sequence="4" />
+		<menuitem name="Sales to Invoice" action="action_pos_order_tobinvoiced" id="menu_point_of_sale_tobinvoiced" parent="menu_point_of_sale_invoicing"/>
+        <record model="ir.actions.act_window" id="action_pos_order_accepted">
+            <field name="name">Accepted Sales</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_pos_order_tree"/>
+            <field name="domain">[('state','=', 'paid')]</field>
+        </record>
+        <record model="ir.actions.act_window" id="action_pos_order_tree2">
+            <field name="name">Point of Sale</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_pos_order_tree"/>
+            <field name="domain">[('date_order','&lt;=', time.strftime('%Y-%m-%d 23:59:59'))]</field>
+        </record>
+
+<!--        <menuitem name="Orders of the day" parent="menu_point_ofsale" id="menu_action_pos_order_tree2" action="action_pos_order_tree2"/-->
 
         <record model="ir.actions.act_window" id="action_pos_order_tree3">
-            <field name="name">All orders</field>
+            <field name="name">Point of Sale</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
         </record>
+<!--        <menuitem name="All orders" parent="menu_point_ofsale" id="menu_action_pos_order_tree3" action="action_pos_order_tree3"/-->
+
+        <record model="ir.actions.act_window" id="action_pos_order_tree_open">
+            <field name="name">Opened Sales</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="view_pos_pos_form"/>
+        </record>
 
         <record model="ir.ui.view" id="view_pos_order_line">
             <field name="name">Sale lines</field>
@@ -200,6 +243,7 @@
                     <field name="discount" readonly="1"/>
                     <field name="price_unit" readonly="1"/>
                     <field name="price_subtotal" readonly="1" sum="Sum of subtotals"/>
+                    <field name="price_subtotal_incl" readonly="1" sum="Sum of subtotals"/>
                     <field name="create_date" readonly="1"/>
                 </tree>
             </field>
@@ -211,12 +255,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS Order line">
-                    <field name="product_id" readonly="1" select="1"/>
-                    <field name="qty" readonly="1" select="1"/>
-                    <field name="discount" readonly="1" select="2"/>
-                    <field name="price_unit" readonly="1" select="2"/>
-                    <field name="price_subtotal" readonly="1" />
-                    <field name="create_date" readonly="1" select="1"/>
+                    <field name="product_id"  select="1"/>
+                    <field name="qty"  select="1"/>
+                    <field name="discount"  select="2"/>
+                    <field name="price_unit"  select="2"/>
+                    <field name="create_date"  select="1"/>
                 </form>
             </field>
         </record>
@@ -229,20 +272,28 @@
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_pos_order_line"/>
         </record>
-        <menuitem name="POS Lines" parent="menu_point_root" id="menu_action_pos_order_line" action="action_pos_order_line"/>
+
+		<record model="ir.actions.act_window" id="action_pos_order_line_form">
+            <field name="name">Sale line</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="view_pos_order_line_form"/>
+        </record>
 
         <record model="ir.actions.act_window" id="action_pos_order_line_day">
-            <field name="name">POS Lines for today</field>
+            <field name="name">Sale line</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_pos_order_line"/>
-			<field name="filter" eval="True"/>
             <field name="domain">[('create_date', '&gt;=', time.strftime('%Y-%m-%d 00:00:00')),('create_date', '&lt;=', time.strftime('%Y-%m-%d 23:59:59'))]</field>
         </record>
 
 
+
         <!-- report -->
 
         <record model="ir.ui.view" id="view_pos_trans_user_form">
@@ -253,6 +304,7 @@
                 <form string="POS ">
                     <field name="user_id" select="1"/>
                     <field name="journal_id" select="1"/>
+                    <field name="jl_id" select="1"/>
                     <field name="date_create" select="1" widget="date"/>
                     <field name="no_trans" select="2"/>
                     <field name="amount" select="2"/>
@@ -271,63 +323,681 @@
                     <field name="date_create" widget="date" />
                     <field name="user_id"/>
                     <field name="journal_id"/>
+                    <field name="jl_id"/>
                     <field name="no_trans" sum="Total Transaction"/>
                     <field name="amount" sum="Amount total"/>
+                    <field name="product_nb" />
                     <field name="invoice_id"/>
+                    <field name="disc"/>
                 </tree>
             </field>
         </record>
+
+        <record model="ir.ui.view" id="view_report_transaction_pos_calendar">
+	        <field name="name">report.transaction.pos.calendar</field>
+	        <field name="model">report.transaction.pos</field>
+	        <field name="type">calendar</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <calendar color="user_id" date_start="date_create" string="POS Report">
+	                <field name="journal_id"/>
+	                <field name="amount"/>
+	            </calendar>
+	        </field>
+	     </record>
+
+	     <record model="ir.ui.view" id="view_report_transaction_pos_graph">
+	        <field name="name">report.transaction.pos.graph</field>
+	        <field name="model">report.transaction.pos</field>
+	        <field name="type">graph</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <graph  type="bar" string="POS Report">
+	                <field name="user_id" />
+	                <field name="amount"/>
+	                <field group="True" name="journal_id"/>
+	            </graph>
+	        </field>
+	     </record>
+
         <record model="ir.actions.act_window" id="action_trans_pos_tree_today">
-            <field name="name">Sales by user</field>
+            <field name="name">Sales by day</field>
             <field name="res_model">report.transaction.pos</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-            <field name="domain">[('date_create','like',time.strftime('%Y-%m-%d'))]</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="domain">[('date_create','=',time.strftime('%Y-%m-%d'))]</field>
         </record>
-        <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep"/>
-        <menuitem name="Sales of the day" parent="menu_point_rep" action="action_trans_pos_tree_today" id="menu_trans_pos_tree_today"/>
-        <!-- 	<record model="ir.actions.act_window" id="action_trans_pos_user_tree_today"> -->
-            <!-- 		<field name="name">Sales by user</field> -->
-            <!-- 		<field name="res_model">report.transaction.pos</field> -->
-            <!-- 		<field name="view_type">form</field> -->
-            <!-- 		<field name="view_mode">tree</field> -->
-            <!-- 		<field name="domain">[('date_create','=',time.strftime('%Y-%m-%d')),('user_id','=',uid)]</field> -->
-            <!-- 	</record> -->
-        <!-- 	<menuitem name="Point of Sale/Reporting/Sales of the day/My sales of the day" action="action_trans_pos_user_tree_today" id="menu_trans_pos_user_tree_today"/> -->
 
 
         <record model="ir.actions.act_window" id="action_trans_pos_tree_month">
-            <field name="name">Sales by user</field>
+            <field name="name">Sales by month</field>
             <field name="res_model">report.transaction.pos</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
             <field name="domain">[('date_create','like',time.strftime('%Y-%m'))]</field>
         </record>
-        <menuitem name="Sales of the month" parent="menu_point_rep" action="action_trans_pos_tree_month" id="menu_trans_pos_tree_month"/>
-        <!-- 	<record model="ir.actions.act_window" id="action_trans_pos_user_tree_month"> -->
-            <!-- 		<field name="name">Sales by user</field> -->
-            <!-- 		<field name="res_model">report.transaction.pos</field> -->
-            <!-- 		<field name="view_type">form</field> -->
-            <!-- 		<field name="view_mode">tree,form</field> -->
-            <!-- 		<field name="domain">[('date_create','like',time.strftime('%Y-%m')),('user_id','=',uid)]</field> -->
-            <!-- 	</record> -->
-        <!-- 	<menuitem name="Point of Sale/Reporting/Sales of the month/My sales of the month" action="action_trans_pos_user_tree_month" id="menu_trans_pos_user_tree_month"/> -->
 
 
         <record model="ir.actions.act_window" id="action_trans_pos_tree">
             <field name="name">Sales by user</field>
             <field name="res_model">report.transaction.pos</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="view_id" ref="view_trans_pos_user_tree"/>
         </record>
-        <menuitem name="All the sales" parent="menu_point_rep" action="action_trans_pos_tree" id="menu_trans_pos_tree"/>
-        <!-- 	<record model="ir.actions.act_window" id="action_trans_pos_user_tree"> -->
-            <!-- 		<field name="name">Sales by user</field> -->
-            <!-- 		<field name="res_model">report.transaction.pos</field> -->
-            <!-- 		<field name="view_type">form</field> -->
-            <!-- 		<field name="view_mode">tree</field> -->
-            <!-- 		<field name="domain">[('user_id','=',uid)]</field> -->
-            <!-- 	</record> -->
-        <!-- 	<menuitem name="Point of Sale/Reporting/All the sales/All my sales " action="action_trans_pos_user_tree" id="menu_trans_pos_user_tree"/> -->
+
+
+		<record model="ir.ui.view" id="view_report_sales_by_user_pos_form">
+            <field name="name">report.sales.by.user.pos.form</field>
+            <field name="model">report.sales.by.user.pos</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POS ">
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="amount" select="2"/>
+                    <field name="user_id" select="2"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_report_sales_by_user_pos_tree">
+            <field name="name">report.sales.by.user.pos.tree</field>
+            <field name="model">report.sales.by.user.pos</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="POS">
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="amount" select="2"/>
+                    <field name="user_id" select="2"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_sales_by_user_pos_calendar">
+	        <field name="name">report.sales.by.user.pos.calendar</field>
+	        <field name="model">report.sales.by.user.pos</field>
+	        <field name="type">calendar</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <calendar color="user_id" date_start="date_order" string="POS Report">
+	            	<field name="qty" select="2"/>
+	                <field name="amount" />
+	            </calendar>
+	        </field>
+	     </record>
+
+		<record model="ir.ui.view" id="view_report_sales_by_user_pos_graph">
+	        <field name="name">report.sales.by.user.pos.graph</field>
+	        <field name="model">report.sales.by.user.pos</field>
+	        <field name="type">graph</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <graph  type="bar" string="Sales by User">
+	                <field name="user_id" />
+	                <field name="amount"/>
+	            </graph>
+	        </field>
+	     </record>
+
+	     <record model="ir.actions.act_window" id="action_report_sales_by_user_pos_today">
+            <field name="name">Sales by User</field>
+            <field name="res_model">report.sales.by.user.pos</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="domain">[('date_order','=',time.strftime('%Y-%m-%d'))]</field>
+ 		</record>
+
+
+		<!-- Sales of user by month -->
+
+		<record model="ir.ui.view" id="view_report_sales_by_user_pos_month_form">
+            <field name="name">report.sales.by.user.pos.month.form</field>
+            <field name="model">report.sales.by.user.pos.month</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POS ">
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="amount" select="2"/>
+                    <field name="user_id" select="2"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_tree">
+            <field name="name">report.sales.by.user.pos.month.tree</field>
+            <field name="model">report.sales.by.user.pos.month</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="POS">
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="amount" select="2"/>
+                    <field name="user_id" select="2"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_calendar">
+	        <field name="name">report.sales.by.user.pos.month.calendar</field>
+	        <field name="model">report.sales.by.user.pos.month</field>
+	        <field name="type">calendar</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <calendar color="user_id" date_start="date_order" string="POS Report">
+	            	<field name="qty" select="2"/>
+	                <field name="amount" />
+	            </calendar>
+	        </field>
+	     </record>
+
+		<record model="ir.ui.view" id="view_report_sales_by_user_pos_month_graph">
+	        <field name="name">report.sales.by.user.pos.month.graph</field>
+	        <field name="model">report.sales.by.user.pos.month</field>
+	        <field name="type">graph</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <graph  type="bar" string="Sales by User">
+	                <field name="user_id" />
+	                <field name="amount"/>
+	            </graph>
+	        </field>
+	     </record>
+
+
+ 		<record model="ir.actions.act_window" id="action_report_sales_by_user_pos_month">
+            <field name="name">Sales by User Monthly</field>
+            <field name="res_model">report.sales.by.user.pos.month</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="domain">[('date_order','like',time.strftime('%Y-%m'))]</field>
+		</record>
+
+		<!-- Sales by margin -->
+
+		<record model="ir.ui.view" id="view_report_sales_by_margin_pos_form">
+            <field name="name">report.sales.by.margin.pos.form</field>
+            <field name="model">report.sales.by.margin.pos</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POS ">
+                	<field name="user_id" select="2"/>
+                	<field name="product_name" select="2"/>
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="net_margin_per_qty" select="2"/>
+                    <field name="total" select="2"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_report_sales_by_margin_pos_tree">
+            <field name="name">report.sales.by.margin.pos.tree</field>
+            <field name="model">report.sales.by.margin.pos</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="POS">
+                    <field name="user_id" select="2"/>
+                	<field name="product_name" select="2"/>
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="net_margin_per_qty" select="2"/>
+                    <field name="total" select="2"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_sales_by_margin_pos_calendar">
+	        <field name="name">report.sales.by.margin.pos.calendar</field>
+	        <field name="model">report.sales.by.margin.pos</field>
+	        <field name="type">calendar</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
+	            	<field name="product_name" select="2"/>
+	                <field name="total" />
+	            </calendar>
+	        </field>
+	     </record>
+
+		<record model="ir.ui.view" id="view_report_sales_by_margin_pos_graph">
+	        <field name="name">report.sales.by.margin.pos.graph</field>
+	        <field name="model">report.sales.by.margin.pos</field>
+	        <field name="type">graph</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <graph  type="bar" string="Sales by User Margin" orientation="horizontal">
+	                <field name="product_name" />
+	                <field name="total" operator="+"/>
+	            </graph>
+	        </field>
+	     </record>
+
+        <record model="ir.actions.act_window" id="action_report_sales_by_margin_pos_today">
+            <field name="name">Sales by User Daily margin</field>
+            <field name="res_model">report.sales.by.margin.pos</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="domain">[('date_order','=',time.strftime('%Y-%m-%d'))]</field>
+ 		</record>
+
+ 		<record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_form">
+            <field name="name">report.sales.by.margin.pos.month.form</field>
+            <field name="model">report.sales.by.margin.pos.month</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POS ">
+                	<field name="user_id" select="2"/>
+                	<field name="product_name" select="2"/>
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="net_margin_per_qty" select="2"/>
+                    <field name="total" select="2"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_tree">
+            <field name="name">report.sales.by.margin.pos.month.tree</field>
+            <field name="model">report.sales.by.margin.pos.month</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="POS">
+                    <field name="user_id" select="2"/>
+                	<field name="product_name" select="2"/>
+                    <field name="date_order" select="1" widget="date"/>
+                    <field name="qty" select="2"/>
+                    <field name="net_margin_per_qty" select="2"/>
+                    <field name="total" select="2"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_calendar">
+	        <field name="name">report.sales.by.margin.pos.month.calendar</field>
+	        <field name="model">report.sales.by.margin.pos.month</field>
+	        <field name="type">calendar</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
+	            	<field name="product_name" select="2"/>
+	                <field name="total" />
+	            </calendar>
+	        </field>
+	     </record>
+
+		<record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_graph">
+	        <field name="name">report.sales.by.margin.pos.month.graph</field>
+	        <field name="model">report.sales.by.margin.pos.month</field>
+	        <field name="type">graph</field>
+	        <field eval="2" name="priority"/>
+	        <field name="arch" type="xml">
+	            <graph  type="bar" string="Sales by User Margin" orientation="horizontal">
+	                <field name="product_name" />
+	                <field name="total" operator="+"/>
+	            </graph>
+	        </field>
+	     </record>
+
+ 		<record model="ir.actions.act_window" id="action_report_sales_by_margin_pos_month">
+            <field name="name">Sales by User Monthly margin</field>
+            <field name="res_model">report.sales.by.margin.pos.month</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="domain">[('date_order','like',time.strftime('%Y-%m'))]</field>
+		</record>
+		<!--  Sales by margin ends -->
+    	<record model="ir.ui.view" id="view_company_form_pos">
+            <field name="name">view.company.form.pos</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+				<notebook position="inside">
+                    <page string="Other">
+                      <field  name="company_discount" colspan="4"/>
+                      <field  name="max_diff" colspan="4"/>
+                      <field  name="account_receivable" colspan="4"/>
+                    </page>
+                </notebook>
+        	</field>
+       	</record>
+
+
+        <record model="ir.ui.view" id="form_mode_p_contact">
+            <field name="name">Contact Mode</field>
+            <field name="model">res.mode.contact</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Contact Mode">
+                    <field  name="name" select="1"/>
+                    <field  name="active" select="2"/>
+              </form>
+            </field>
+          </record>
+
+        <record model="ir.ui.view" id="tree_mode_p_contact">
+            <field name="name">Contact Mode</field>
+            <field name="model">res.mode.contact</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+             <tree string="Contact Mode">
+                    <field  name="name"/>
+                    <field  name="active"/>
+              </tree>
+            </field>
+          </record>
+
+        <record model="ir.actions.act_window" id="action_mode_p">
+            <field name="name">Contact Mode</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.mode.contact</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem name="Contact Mode" parent="base.menu_base_config" action="action_mode_p" id="menu_mode_po"/>
+
+        <record model="ir.ui.view" id="view_partner_contact">
+            <field name="name">view.partner.contact</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">
+              <field name="website" position="after">
+                    <field  name="contact_mode_id"/>
+              </field>
+            </field>
+          </record>
+
+        <record id="product_normal_form_view" model="ir.ui.view">
+            <field name="name">product.normal.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                  <field name="active" position="after">
+                      <field name="income_pdt"/>
+                      <field name="expense_pdt"/>
+                      <field name="am_out"/>
+                      <field name="disc_controle"/>
+                  </field>
+            </field>
+        </record>
+
+        <record id="product_input_output_form_view" model="ir.ui.view">
+            <field name="name">product.normal.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<form string="Product">
+				   <group colspan="4" col="6">
+                    <group colspan="4" col="2">
+                        <separator string="Product Description" colspan="4"/>
+                        <field name="name" select="1"  />
+                        <field groups="base.group_extended" name="variants" select="2" />
+                    </group>
+                    <group colspan="1" col="2">
+                        <separator string="Codes" colspan="2"/>
+                        <field name="default_code" select="1"/>
+                        <field groups="base.group_extended" name="ean13" select="2"/>
+                    </group>
+
+                   </group>
+                   <notebook colspan="4">
+                        <page string="Information">
+                          <group colspan="2" col="2" name="Type">
+                            <separator string="Product Type" colspan="2"/>
+	                          <field name="categ_id" select="1"/>
+	                          <field name="property_account_income" select="1" string="Account" required="1"/>
+	                          <field name="type" select="2"/>
+		                    </group>
+		                    <group colspan="2" col="2" name="Miscelleanous">
+		                      <separator string="Miscelleanous" colspan="2"/>
+	                      		<field name="income_pdt"/>
+	                      		<field name="expense_pdt"/>
+                            <field name="am_out"/>
+                          <field name="disc_controle"/>
+	                      		<field name="company_id" select="2" groups="base.group_extended"/>
+	                      	</group>
+	                      	<group colspan="2" col="2" name="Prices">
+	                      		<separator string="Prices" colspan="2"/>
+		                      	<field name="lst_price"/>
+			                    <field name="standard_price"/>
+			                 </group>
+                        </page>
+                   </notebook>
+                </form>
+            </field>
+        </record>
+
+		<menuitem name="Configuration" parent="menu_point_root"
+            id="menu_point_config_product" sequence="6"/>
+
+        <record model="ir.actions.act_window" id="action_product_input">
+            <field name="name">Products</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('income_pdt','=',True)]</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_product_input_tree_tag">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="product.product_product_tree_view"/>
+	        <field name="act_window_id" ref="action_product_input"/>
+	    </record>
+        <record model="ir.actions.act_window.view" id="action_product_input_form_tag">
+	        <field name="sequence" eval="2"/>
+	        <field name="view_mode">form</field>
+	        <field name="view_id" ref="product_input_output_form_view"/>
+	        <field name="act_window_id" ref="action_product_input"/>
+	    </record>
+		<menuitem name="Products for Input Operations"
+					parent="menu_point_config_product"
+					action="action_product_input"
+					id="products_for_input_operations"/>
+
+		<record model="ir.actions.act_window" id="action_product_output">
+            <field name="name">Products</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('expense_pdt','=',True)]</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_product_output_tree_tag">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="product.product_product_tree_view"/>
+	        <field name="act_window_id" ref="action_product_output"/>
+	    </record>
+        <record model="ir.actions.act_window.view" id="action_product_output_form_tag">
+	        <field name="sequence" eval="2"/>
+	        <field name="view_mode">form</field>
+	        <field name="view_id" ref="product_input_output_form_view"/>
+	        <field name="act_window_id" ref="action_product_output"/>
+	    </record>
+		<menuitem name="Products for Output Operations"
+					parent="menu_point_config_product"
+					action="action_product_output"
+					id="products_for_output_operations"/>
+
+        <wizard
+            string="Refloat Box entries"
+            model="account.bank.statement"
+            name="pos.entry"
+            menu="False"
+            id="pos_entries"/>
+        <menuitem name="Register Management" parent="menu_point_root"
+            id="menu_point_config" sequence="3"/>
+        <menuitem
+            name="Input Operations" parent="menu_point_config"
+            string="Refloat"
+            action="pos_entries"
+            type="wizard"
+            id="menu_wizard_enter_jrnl" sequence="2" />
+        <wizard
+            string="Enter negative operations"
+            model="account.bank.statement"
+            name="pos.out"
+            menu="False"
+            id="pos_entries2"/>
+        <menuitem
+            name="Output Operations" parent="menu_point_config"
+            string="Refloat"
+            action="pos_entries2"
+            type="wizard"
+            id="menu_wizard_enter_jrnl2" sequence="3" />
+
+<!--        <menuitem name="Sales Waiting Validation" parent="menu_point_config" id="menu_point_ofsale_date_payment"-->
+<!--            action="action_pos_pos_form_user" sequence="4"/>-->
+
+
+        <record model="ir.ui.view" id="view_pos_order_tree_all_sales">
+            <field name="name">POS Sales</field>
+            <field name="model">pos.order</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="POS Orders">
+                    <field name="name"/>
+                    <field name="date_order" select="1"/>
+                    <field name="partner_id" />
+                    <field name="date_payment"/>
+                    <field name="date_payment2"/>
+                    <field name="user_id"/>
+                    <field name="invoice_id"/>
+                    <field name="note" select="1" />
+                    <field name="state" select="1"/>
+                    <field name="amount_total" sum="Amount total"/>
+                    <field name="company_id"/>
+                </tree>
+            </field>
+        </record>
+         <record model="ir.actions.act_window" id="action_pos_all_sales">
+            <field name="name">All sales</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_pos_order_tree_all_sales" />
+        </record>
+<!--        <menuitem name="All Sales" parent="menu_point_of_sale" id="menu_pos_all_sales" action="action_pos_all_sales" sequence="5" />-->
+
+        <record model="ir.ui.view" id="view_pos_order_tree_all_sales_lines">
+            <field name="name">POS Sales Lines</field>
+            <field name="model">pos.order.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="POS Orders lines">
+                    <field name="order_id" select="1" />
+                    <field name="serial_number" select="1" />
+                    <field name="create_date" select="1" />
+                    <field name="product_id" select="1" />
+                    <field name="qty" />
+                    <field name="price_unit" />
+                </tree>
+            </field>
+        </record>
+         <record model="ir.actions.act_window" id="action_pos_all_sales_lines">
+            <field name="name">All sales lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.order.line</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_pos_order_tree_all_sales_lines" />
+        </record>
+<!--        <menuitem name="Toutes les lignes de ventes" parent="menu_point_root" id="menu_pos_all_sales_lines" action="action_pos_all_sales_lines" sequence="5" />-->
+
+        <!--  Miscelleanous Operations/Reporting -->
+		<menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="5"/>
+		<menuitem name="Registers" parent="menu_point_rep" id="menu_point_report_register" sequence="0" />
+		<menuitem name="Sales" parent="menu_point_rep" id="menu_point_report_sale" sequence="1" />
+
+		<menuitem name="Details Of Operations" parent="menu_point_report_sale" id="menu_details_of_oper" sequence="1" groups="base.group_extended"/>
+		<menuitem name="All Sales" parent="menu_details_of_oper"
+						id="menu_action_all_sales_tree3" action="action_pos_order_tree3" sequence="1"  groups="base.group_extended"/>
+		<menuitem name="Sales of the day" parent="menu_action_all_sales_tree3"
+						id="menu_action_sale_of_day_tree2" action="action_trans_pos_tree_today"/>
+		<menuitem name="Accepted Sales" parent="menu_action_all_sales_tree3"
+						id="menu_action_sale_of_day_accept" action="action_pos_order_accepted"/>
+<!--		<menuitem name="Open Sales" parent="menu_action_all_sales_tree3"
+						id="menu_action_open_sales_treeop" action="action_pos_order_tree_open"/-->
+
+		<menuitem name="Sales Reports" parent="menu_point_report_sale" id="menu_sales_report" sequence="2"/>
+
+        <menuitem name="Sales of the day" parent="menu_sales_report"
+        		action="action_trans_pos_tree_today" id="menu_trans_pos_tree_today"/>
+
+		<menuitem name="Sales of the month" parent="menu_sales_report"
+				action="action_trans_pos_tree_month" id="menu_trans_pos_tree_month"/>
+
+		<menuitem name="All the sales" parent="menu_sales_report"
+		 		action="action_trans_pos_tree" id="menu_trans_pos_tree"/>
+
+		 <menuitem name="Sales by User" parent="menu_sales_report"
+		 		action="action_report_sales_by_user_pos_today" id="menu_report_sales_by_user_pos_tree"/>
+
+		<menuitem name="Sales by User Monthly" parent="menu_sales_report"
+		 		action="action_report_sales_by_user_pos_month" id="menu_report_sales_by_user_pos_month_tree"/>
+
+		 <menuitem name="Sales by User Daily Margin" parent="menu_sales_report"
+		 		action="action_report_sales_by_margin_pos_today" id="menu_report_sales_by_user_margin_daily_pos_tree"/>
+
+		<menuitem name="Sales by User Monthly Margin" parent="menu_sales_report"
+		 		action="action_report_sales_by_margin_pos_month" id="menu_report_sales_by_user_pos_month_margin_tree"/>
+		<!-- Invoice -->
+
+		<record model="ir.actions.act_window" id="action_pos_invoice">
+            <field name="name">Invoices</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+			<field name="domain">[('origin','like','POS')]</field>
+        </record>
+		<menuitem name="All Invoices" parent="menu_details_of_oper"
+		 		action="action_pos_invoice" id="menu_pos_invoice_tree"/>
+
+		<menuitem name="Payments and Sales" parent="menu_point_report_sale"
+		 		 id="menu_cashboxes_closing_tree" sequence="1"/>
+		<menuitem name="Today" parent="menu_cashboxes_closing_tree"
+		 		 id="menu_cashboxes_by_day" sequence="1"/>
+
+		<menuitem name="All Sales Lines" parent="menu_details_of_oper"
+						id="menu_action_pos_order_line" action="action_pos_order_line" sequence="2"/>
+
+		<menuitem name="Sales Lines of the day" parent="menu_action_pos_order_line"
+					id="menu_action_pos_order_line_day" action="action_pos_order_line_day"/>
+
+<!--		<menuitem name="Open Sales Line" parent="menu_action_pos_order_line"
+					id="menu_action_open_sales_line" action="action_pos_order_line_form"/-->
+
+<!--		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report"
+				id="menu_pos_payment_report" parent="menu_cashboxes_by_day" type="wizard" sequence="4"/-->
+
+		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user"
+				id="menu_pos_sales_user" parent="menu_trans_pos_tree" type="wizard" sequence="3" groups="base.group_extended" />
+
+
+		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user_today"
+				id="menu_pos_sales_user_today" parent="menu_trans_pos_tree_today" type="wizard" sequence="2" groups="base.group_extended"/>
+
+		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report_date"
+				id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" type="wizard" sequence="5" groups="base.group_extended"/>
+
+		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report_user"
+				id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" type="wizard" sequence="6" groups="base.group_extended"/>
+		<menuitem icon="STOCK_PRINT" action="wizard_pos_sales_user_today_current_user"
+				id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day" type="wizard" sequence="7"/>
+    	<menuitem icon="STOCK_PRINT" action="wizard_pos_details"
+				id="menu_pos_details" parent="menu_cashboxes_by_day" type="wizard" />
+
+
     </data>
 </openerp>
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 34a4d345637..325350d031b 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -1,33 +1,94 @@
 <?xml version="1.0"?>
 <openerp>
-  <data>
+	<data>
+  <wizard
+        id="pos_return_picking"
+        model="pos.order"
+        menu="False"
+        name="pos.return.picking"
+        string="Return Goods"/>
 
-    <wizard string="Refund Orders" model="pos.order"
-        name="pos.refund_order" id="pos_refund" menu="True"/>
 
-    <wizard string="Payment" model="pos.order"
-        name="pos.payment" id="pos_payment" menu="False"/>
+		<wizard string="Receipt" model="pos.order"
+				name="ord.receipt" id="o_rec"
+         keyword="client_print_multi"
+         menu="False"
+         />
 
-      <!--<wizard string="Create Invoices" model="pos.order"
-        name="pos.create_invoice" id="pos_invoice" multi="True"/>-->
+<!--		<wizard string="Box Entries" model="account.bank.statement"
+				name="pos.entry" id="pos_entry" menu="False"/>-->
 
-    <wizard string="Add products" model="pos.order"
-        name="pos.add_product" id="pos_add_product"  menu="False"/>
+		<wizard string="Payment" model="pos.order"
+				name="pos.payment" id="pos_payment" menu="False"/>
 
-      <!--<wizard string="Cancel" model="pos.order"
-        name="pos.cancel" id="pos_cancel" multi="True"/>-->
+			<!--<wizard string="Create Invoices" model="pos.order"
+				name="pos.create_invoice" id="pos_invoice" multi="True"/>-->
 
-    <wizard string="Confirm" model="pos.order"
-        name="pos.confirm" id="pos_confirm" multi="True"/>
+		<wizard string="Add products" model="pos.order"
+				name="pos.add_product" id="pos_add_product"  menu="False"/>
 
-    <wizard string="Discount" model="pos.order"
-        name="pos.discount" id="pos_discount" menu="False"/>
+			<!--<wizard string="Cancel" model="pos.order"
+				name="pos.cancel" id="pos_cancel" multi="True"/>-->
 
-    <wizard string="Get From Order" model="pos.order"
-        name="pos.sale.get" id="pos_sale_get"/>
+		<wizard
+        string="Confirm"
+        model="pos.order"
+				name="pos.confirm"
+        id="pos_confirm"
+			  multi="True"
+			  menu="True"
+        />
 
-    <wizard string="Scan Product" model="pos.order"
-        name="pos.scan_product" id="pos_scan_product"/>
+		<wizard string="Discount" model="pos.order"
+				name="pos.discount" id="pos_discount" menu="False"/>
 
-  </data>
+<!--		<wizard id="wizard_pos_payment_report" menu="False"
+				model="pos.order" name="pos.payment.report" string="All paid lines for the current User"/-->
+
+		<wizard id="wizard_pos_sales_user" menu="False"
+				model="pos.order" name="pos.sales.user" string="Sales Report"/>
+
+		<wizard id="wizard_pos_sales_user_today" menu="False"
+				model="pos.order" name="pos.sales.user.today" string="Sales by Users"/>
+
+		<wizard id="wizard_pos_payment_report_date" menu="False"
+				model="pos.order" name="pos.payment.report.date" string="Sales lines Report"/>
+
+		<wizard id="wizard_pos_payment_report_user" menu="False"
+				model="pos.order" name="pos.payment.report.user" string="Sales lines by Users"/>
+
+		<wizard id="wizard_pos_sales_user_today_current_user" menu="False"
+				model="pos.order" name="pos.sales.user.today.current.user" string="Sales for Current User"/>
+
+		<wizard id="wizard_pos_details" menu="False"
+				model="pos.order" name="pos.details" string="Sales Details"/>
+
+<!--		<wizard string="Get From Order" model="pos.order"
+				name="pos.sale.get" id="pos_sale_get"/>
+
+		<wizard string="Scan Product" model="pos.order"
+				name="pos.scan_product" id="pos_scan_product"/-->
+  		<wizard
+        	id="close_statement"
+        	model="account.bank.statement"
+        	menu="False"
+        	name="statement.close"
+        	string="Close Statements"/>
+  		<wizard
+        	id="open_statement"
+        	model="account.bank.statement"
+        	menu="False"
+        	name="statement.open"
+        	string="Open Statements"/>
+
+
+       <wizard
+        	id="wizard_all_closed_cashbox_of_the_day"
+        	model="account.bank.statement"
+        	menu="False"
+        	name="all.closed.cashbox.of.the.day"
+        	string="All Cashboxes Of the day"/>
+
+
+	</data>
 </openerp>
diff --git a/addons/point_of_sale/pos_workflow.xml b/addons/point_of_sale/pos_workflow.xml
index 9b43b1fb659..d3f1313c13f 100644
--- a/addons/point_of_sale/pos_workflow.xml
+++ b/addons/point_of_sale/pos_workflow.xml
@@ -58,8 +58,6 @@
 	<record model="workflow.transition" id="trans_draft_paid">
 	  <field name="act_from" ref="act_draft"/>
 	  <field name="act_to" ref="act_paid"/>
-	  <field name="trigger_model">pos.payment</field>
-	  <field name="trigger_expr_id">payment_get()</field>
 	  <field name="condition">test_paid()</field>
 	  <field name="signal">paid</field>
 	</record>
@@ -68,7 +66,7 @@
 		<field name="act_from" ref="act_paid"/>
 		<field name="act_to" ref="act_done"/>
 		<field name="signal">done</field>
-		<field name="role_id" ref="role_pos"/>
+	<!--	<field name="role_id" ref="role_pos"/-->
 	</record>
 
 	<record model="workflow.transition" id="trans_paid_invoice">
diff --git a/addons/point_of_sale/pos_workflow.xml.orig b/addons/point_of_sale/pos_workflow.xml.orig
new file mode 100644
index 00000000000..a6375642fa8
--- /dev/null
+++ b/addons/point_of_sale/pos_workflow.xml.orig
@@ -0,0 +1,239 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+	<record model="workflow" id="wkf_pos">
+	  <field name="name">Pos workflow</field>
+	  <field name="osv">pos.order</field>
+	  <field name="on_create">True</field>
+	</record>
+
+    <!-- Roles definition -->
+
+	<record model="res.roles" id="role_pos">
+		<field name="name">POS - Confirmation</field>
+	</record>
+
+    <!--Activities-->
+
+	<record model="workflow.activity" id="act_draft">
+	  <field name="wkf_id" ref="wkf_pos"/>
+	  <field name="flow_start">True</field>
+	  <field name="name">draft</field>
+	</record>
+
+    <record model="workflow.activity" id="act_payment">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">payment</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'payment'})</field>
+    </record>
+
+    <record model="workflow.activity" id="act_rebate">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">rebate</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'rebate'})</field>
+    </record>
+
+    <record model="workflow.activity" id="act_unbalanced">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">unbalanced</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'unbalanced'})</field>
+    </record>
+
+    <record model="workflow.activity" id="act_cofinoga">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">cofinoga</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'cofinoga'})</field>
+    </record>
+
+    <record model="workflow.activity" id="act_collectivites">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">collectivites</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'collectivites'})</field>
+    </record>
+
+    <record model="workflow.activity" id="act_cadeaux">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">cadeaux</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'cadeaux'})</field>
+    </record>
+
+    <record model="workflow.activity" id="act_collectivites">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">collectivites</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'collectivites', 'invoice_wanted': True})</field>
+    </record>
+
+    <record model="workflow.activity" id="act_cadeaux">
+        <field name="wkf_id" ref="wkf_pos" />
+        <field name="name">cadeaux</field>
+        <field name="kind">function</field>
+        <field name="action">write({'state': 'cadeaux'})</field>
+    </record>
+
+	<record model="workflow.activity" id="act_paid">
+        <field name="wkf_id" ref="wkf_pos"/>
+        <field name="name">paid</field>
+        <field name="action">action_paid()</field>
+        <field name="kind">function</field>
+	</record>
+
+	<record model="workflow.activity" id="act_done">
+	  <field name="wkf_id" ref="wkf_pos"/>
+	  <field name="name">done</field>
+	  <field name="flow_stop">True</field>
+	  <field name="action">action_done()</field>
+	  <field name="kind">function</field>
+	</record>
+
+	<record model="workflow.activity" id="act_invoiced">
+	  <field name="wkf_id" ref="wkf_pos"/>
+	  <field name="name">invoiced</field>
+	  <field name="flow_stop">True</field>
+	  <field name="action">action_invoice()</field>
+	  <field name="kind">function</field>
+	</record>
+
+	<record model="workflow.activity" id="act_cancel">
+	  <field name="wkf_id" ref="wkf_pos"/>
+	  <field name="name">cancel</field>
+	  <field name="flow_stop">True</field>
+	  <field name="action">action_cancel()</field>
+	  <field name="kind">function</field>
+	</record>
+
+
+    <!--Transitions-->
+
+    <record model="workflow.transition" id="trans_draft_payment">
+        <field name="act_from" ref="act_draft" />
+        <field name="act_to" ref="act_payment" />
+        <field name="signal">start_payment</field>
+    </record>
+
+	<record model="workflow.transition" id="trans_payment_paid">
+        <field name="act_from" ref="act_payment"/>
+        <field name="act_to" ref="act_paid"/>
+        <field name="condition">test_paid() and not(test_rebate() or test_cofinoga() or test_cadeaux() or test_collectivites())</field>
+        <field name="signal">payment</field>
+	</record>
+
+    <record model="workflow.transition" id="trans_payment_rebate">
+        <field name="act_from" ref="act_payment" />
+        <field name="act_to" ref="act_rebate" />
+        <field name="condition">test_rebate()</field>
+        <field name="signal">payment</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_rebate_paid">
+        <field name="act_from" ref="act_rebate" />
+        <field name="act_to" ref="act_paid" />
+        <field name="signal">ok_rebate</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_payment_unbalanced">
+        <field name="act_from" ref="act_payment" />
+        <field name="act_to" ref="act_unbalanced" />
+        <field name="condition">not test_paid()</field>
+        <field name="signal">payment</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_unbalanced">
+        <field name="act_from" ref="act_unbalanced" />
+        <field name="act_to" ref="act_paid" />
+        <field name="condition">test_paid()</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_payment_cofinoga">
+        <field name="act_from" ref="act_payment" />
+        <field name="act_to" ref="act_cofinoga" />
+        <field name="condition">test_cofinoga()</field>
+        <field name="signal">payment</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_cofinoga_paid">
+        <field name="act_from" ref="act_cofinoga" />
+        <field name="act_to" ref="act_paid" />
+        <field name="signal">ok_cofinoga</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_payment_collectivites">
+        <field name="act_from" ref="act_payment" />
+        <field name="act_to" ref="act_collectivites" />
+        <field name="condition">test_collectivites()</field>
+        <field name="signal">payment</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_collectivites_paid">
+        <field name="act_from" ref="act_collectivites" />
+        <field name="act_to" ref="act_paid" />
+        <field name="signal">ok_collectivites</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_payment_cadeaux">
+        <field name="act_from" ref="act_payment" />
+        <field name="act_to" ref="act_cadeaux" />
+        <field name="condition">test_cadeaux()</field>
+        <field name="signal">payment</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_cadeaux_paid">
+        <field name="act_from" ref="act_cadeaux" />
+        <field name="act_to" ref="act_paid" />
+        <field name="signal">ok_cadeaux</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_payment_collectivites">
+        <field name="act_from" ref="act_payment" />
+        <field name="act_to" ref="act_collectivites" />
+        <field name="condition">test_collectivites()</field>
+        <field name="signal">payment</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_collectivites_paid">
+        <field name="act_from" ref="act_collectivites" />
+        <field name="act_to" ref="act_invoiced" />
+        <field name="signal">ok_collectivites</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_payment_cadeaux">
+        <field name="act_from" ref="act_payment" />
+        <field name="act_to" ref="act_cadeaux" />
+        <field name="condition">test_cadeaux()</field>
+        <field name="signal">payment</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_cadeaux_paid">
+        <field name="act_from" ref="act_cadeaux" />
+        <field name="act_to" ref="act_paid" />
+        <field name="signal">ok_cadeaux</field>
+    </record>
+
+	<record model="workflow.transition" id="trans_paid_done">
+		<field name="act_from" ref="act_paid"/>
+		<field name="act_to" ref="act_done"/>
+		<field name="signal">done</field>
+	<!--	<field name="role_id" ref="role_pos"/-->
+	</record>
+
+	<record model="workflow.transition" id="trans_paid_invoice">
+	  <field name="act_from" ref="act_paid"/>
+	  <field name="act_to" ref="act_invoiced"/>
+	  <field name="signal">invoice</field>
+	</record>
+
+	<record model="workflow.transition" id="trans_paid_cancel">
+	  <field name="act_from" ref="act_paid"/>
+	  <field name="act_to" ref="act_cancel"/>
+	  <field name="signal">cancel</field>
+	</record>
+
+
+  </data>
+</openerp>
diff --git a/addons/point_of_sale/posr_data.xml b/addons/point_of_sale/posr_data.xml
new file mode 100644
index 00000000000..de0ec465950
--- /dev/null
+++ b/addons/point_of_sale/posr_data.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+		<record id="ir_rule_group_pos0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="&quot;&quot;&quot;pos&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="ir_rule_0" model="ir.rule">
+			<field eval="&quot;&quot;&quot;=&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_pos_order_company_id"/>
+			<field name="rule_group" ref="ir_rule_group_pos0"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="res_groups_pos0" model="res.groups">
+			<field eval="[(6,0,[ref('base.menu_base_partner'),ref('base.next_id_50'),ref('account.menu_action_account_period_close_tree'),ref('point_of_sale.menu_point_config'),ref('base.menu_config'),ref('base.menu_base_config'),ref('base.next_id_11'),ref('base.menu_partner_category_main'),ref('product.menu_config_product'),ref('product.menu_product_category_action'),ref('product.menu_product_category_action_form'),ref('product.menu_product_pricelist_action2'),ref('account.menu_finance_configuration'),ref('account.menu_wizard_fy_close'),ref('stock.menu_stock_configuration'),ref('sale.menu_shop_configuration'),ref('sale.menu_action_order_tree5'),ref('sale.menu_action_order_tree10'),ref('board_manufacturing.menu_board_manufacturing'),ref('base.menu_custom'),ref('base.menu_partner_form'),ref('product.menu_product_pricelist_main'),ref('product.menu_product_pricelist_action'),ref('account.menu_finance_entries'),ref('account.menu_wizard_open_closed_fy'),ref('stock.menu_traceability'),ref('sale.menu_action_order_tree4'),ref('sale.menu_action_order_tree9'),ref('base.next_id_4'),ref('account.menu_finance_periodical_processing'),ref('base.menu_translation'),ref('base.menu_translation_app'),ref('base.menu_translation_export'),ref('product.menu_product_ul_form_action'),ref('mrp.menu_mrp_reordering'),ref('delivery.menu_delivery'),ref('product.menu_product_uom_categ_form_action'),ref('hr.menu_hr_configuration'),ref('account.menu_action_move_journal_line_form'),ref('product_margin.menu_action_product_margin'),ref('base.menu_users'),ref('account.menu_finance_charts'),ref('account.menu_bank_statement_tree'),ref('base.menu_security'),ref('account.menu_finance_reporting'),ref('account.menu_finance_legal_statement'),ref('account.menu_generic_report'),ref('base.menu_low_workflow'),ref('base.menu_partner_function_form'),ref('base.menu_partner_address_form'),ref('base.menu_partner_title'),ref('base.menu_partner_title_partner'),ref('base.menu_partner_title_contact'),ref('base.menu_partner_customer_form'),ref('base.menu_partner_supplier_form'),ref('base.menu_partner_other_form'),ref('base.menu_partner_category_form'),ref('base.menu_localisation'),ref('base.menu_country_partner'),ref('base.menu_country_state_partner'),ref('base.next_id_14'),ref('base.menu_res_partner_canal-act'),ref('base.menu_res_partner_event_type-act'),ref('base.menu_res_partner_som-act'),ref('base.next_id_15'),ref('base.menu_ir_property_form'),ref('base.menu_ir_property_form_all'),ref('base.maintenance'),ref('base.menu_maintenance_contract_add'),ref('process.menu_process'),ref('process.menu_process_form'),ref('process.menu_process_node_form'),ref('process.menu_process_transition_form'),ref('base.reporting_menu'),ref('board.menu_view_board_form'),ref('product.menu_main_product'),ref('product.next_id_16'),ref('product.menu_product_uom_form_action'),ref('product.menu_price'),ref('product.menu_product_price_type_action'),ref('product.menu_product_pricelist_type_action'),ref('hr.menu_department_tree'),ref('hr.menu_department_def'),ref('account.menu_finance_invoice'),ref('account.menu_automatic_reconcile'),ref('account.menu_finance'),ref('account.menu_finance_accounting'),ref('account.menu_analytic_accounting'),ref('account.menu_wizard_fy_close_state'),ref('account.next_id_20'),ref('account.menu_reconcile_select'),ref('account.menu_unreconcile_select'),ref('account.menu_generate_subscription'),ref('account.next_id_22'),ref('account.menu_aged_trial_balance'),ref('account.menu_partner_balance'),ref('account.menu_third_party_ledger'),ref('account.menu_validate_account_moves'),ref('account.menu_account_use_model'),ref('account.menu_account_balance_report'),ref('account.menu_general_ledger'),ref('account.menu_print_journal'),ref('account.menu_central_journal'),ref('account.menu_general_journal'),ref('account.next_id_23'),ref('account.menu_action_account_fiscalyear_form'),ref('account.menu_action_account_period_form'),ref('account.account_account_menu'),ref('account.menu_action_account_form'),ref('account.menu_action_account_tree'),ref('account.menu_action_account_journal_form'),ref('account.menu_bank_statement_draft_tree'),ref('account.menu_bank_statement_tree2'),ref('account.menu_action_account_type_form'),ref('account.next_id_27'),ref('account.menu_action_tax_form'),ref('account.next_id_29'),ref('account.menu_action_move_line_form'),ref('account.menu_encode_entries_by_move'),ref('account.menu_action_move_line_search'),ref('account.menu_action_account_tree2'),ref('account.next_id_30'),ref('account.menu_action_account_bank_reconcile_tree'),ref('account.menu_action_account_bank_reconcile_check_tree'),ref('account.menu_action_account_journal_period_tree'),ref('account.menu_action_model_form'),ref('account.menu_action_payment_term_form'),ref('account.menu_action_subscription_form'),ref('account.menu_action_subscription_form_running'),ref('account.menu_action_subscription_form_new'),ref('account.account_template_folder'),ref('account.menu_action_account_template_form'),ref('account.menu_action_account_chart_template_form'),ref('account.menu_wizard'),ref('account.menu_action_invoice_tree1'),ref('account.menu_action_invoice_tree1_new'),ref('account.menu_action_invoice_tree2'),ref('account.menu_action_invoice_tree2_new'),ref('account.menu_action_invoice_tree3'),ref('account.menu_action_invoice_tree3_new'),ref('account.menu_action_invoice_tree4'),ref('account.menu_action_invoice_tree4_new'),ref('account.menu_invoice_draft'),ref('account.menu_action_invoice_tree6'),ref('account.menu_action_invoice_tree7'),ref('account.menu_action_invoice_tree8'),ref('account.menu_action_invoice_tree9'),ref('account.menu_action_invoice_tree10'),ref('account.menu_action_invoice_tree11'),ref('account.menu_action_invoice_tree12'),ref('account.menu_action_invoice_tree13'),ref('account.menu_tax_report'),ref('account.menu_wizard_vat_declaration'),ref('account.account_analytic_def_account'),ref('account.account_analytic_def_chart'),ref('account.account_analytic_chart'),ref('account.account_analytic_form'),ref('account.next_id_40'),ref('account.account_analytic_chart_balance'),ref('account.next_id_41'),ref('account.account_entries_analytic_entries'),ref('account.account_def_analytic_journal'),ref('account.account_analytic_journal_print'),ref('account.account_analytic_journal_entries'),ref('account.next_id_42'),ref('account.report_account_analytic_journal_print'),ref('account.next_id_43'),ref('account.report_account_analytic_journal_print_month'),ref('product_margin.menu_product_reporting'),ref('point_of_sale.menu_point_root'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_wizard_default_journal'),ref('point_of_sale.menu_action_pos_order_tree2'),ref('point_of_sale.menu_action_pos_order_tree3'),ref('point_of_sale.menu_action_pos_order_line'),ref('point_of_sale.menu_action_pos_order_line_day'),ref('point_of_sale.menu_point_rep'),ref('point_of_sale.menu_trans_pos_tree_today'),ref('point_of_sale.menu_trans_pos_tree_month'),ref('point_of_sale.menu_trans_pos_tree'),ref('base_report_creator.menu_base_report_creator_action_config'),ref('base_report_creator.menu_base_report_creator_action'),ref('base_module_record.menu_wizard_base_mod_rec'),ref('base_module_record.menu_wizard_base_mod_rec_rec'),ref('base_module_record.menu_wizard_base_module_record'),ref('base_module_record.menu_wizard_base_module_record_stop'),ref('base_module_record.menu_wizard_base_module_save'),ref('base_module_record.menu_wizard_base_module_record_objects'),ref('base.menu_action_res_bank_form'),ref('account.menu_action_tax_code_list'),ref('account.menu_action_tax_code_tree'),ref('account.menu_action_account_tax_template_form'),ref('account.menu_action_account_tax_code_template_form'),ref('account.menu_finance_recurrent_entries'),ref('base.menu_action_res_company_tree'),ref('stock.menu_action_picking_tree4'),ref('product.menu_products'),ref('stock.menu_action_picking_tree6'),ref('stock.menu_action_picking_tree'),ref('base.menu_administration'),ref('base.custom_shortcuts'),ref('base.menu_custom_action'),ref('base.menu_action_currency_form'),ref('account.menu_account_end_year_treatments'),ref('account.menu_action_account_fiscal_position_form_template'),ref('account.menu_action_account_fiscal_position_form'),ref('stock.menu_action_picking_tree_delivery'),ref('mrp.menu_production_orders_start_gantt'),ref('hr.menu_hr_reporting'),ref('base.menu_partner_customer_form_new'),ref('board.menu_view_board_note_form'),ref('mrp.mrp_Sched_all')])]" name="menu_access"/>
+			<field eval="[(6,0,[ref('ir_rule_group_pos0')])]" name="rule_groups"/>
+			<field eval="[(6,0,[ref('base.user_root')])]" name="users"/>
+			<field eval="&quot;&quot;&quot;POS&quot;&quot;&quot;" name="name"/>
+		</record>
+		<record id="ir_model_access_pospayment0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_payment"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos payment&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_pos0"/>
+		</record>
+		<record id="ir_model_access_posline0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_pos0"/>
+		</record>
+		<record id="ir_model_access_pos0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_pos0"/>
+		</record>
+		<record id="ir_model_access_posjournal0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_config_journal"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos journal&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="0" name="perm_create"/>
+			<field name="group_id" ref="res_groups_pos0"/>
+		</record>
+	</data>
+	<data noupdate="1">
+		<record id="res_users_viral0" model="res.users">
+			<field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+			<field eval="[(6,0,[ref('base.group_user'),ref('res_groups_pos0')])]" name="groups_id"/>
+			<field eval="[(6,0,[])]" name="roles_id"/>
+			<field eval="1" name="active"/>
+			<field eval="&quot;&quot;&quot;vir&quot;&quot;&quot;" name="password"/>
+			<field eval="&quot;&quot;&quot;en_US&quot;&quot;&quot;" name="context_lang"/>
+			<field eval="&quot;&quot;&quot;viral&quot;&quot;&quot;" name="name"/>
+			<field name="company_id" ref="second_company"/>
+			<field eval="&quot;&quot;&quot;vir&quot;&quot;&quot;" name="login"/>
+			<field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+		</record>
+	</data>
+</openerp>
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
new file mode 100644
index 00000000000..8aba2dde486
--- /dev/null
+++ b/addons/point_of_sale/posrule_data.xml
@@ -0,0 +1,589 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+        <!-- <record id="res_partner_tinyshop0" model="res.partner">
+            <field eval="0" name="customer"/>
+            <field eval="0" name="supplier"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;Tiny Shop 1&quot;&quot;&quot;" name="name"/>
+        </record>
+        <record id="res_partner_address_fabien0" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;92000&quot;&quot;&quot;" name="zip"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field name="partner_id" ref="stock.res_partner_tinyshop0"/>
+            <field name="country_id" ref="base.fr"/>
+            <field eval="&quot;&quot;&quot;Avenue de Paris&quot;&quot;&quot;" name="street"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
+        </record>
+        <record id="res_company_shop0" model="res.company">
+            <field eval="5.0" name="security_lead"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop0"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+
+        </record>
+        <record id="res_partner_tinyshop1" model="res.partner">
+            <field eval="1" name="customer"/>
+            <field eval="0" name="supplier"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;Tiny Shop 2&quot;&quot;&quot;" name="name"/>
+       </record>
+        <record id="res_partner_address_eric0" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;1500&quot;&quot;&quot;" name="zip"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field name="country_id" ref="base.fr"/>
+            <field eval="&quot;&quot;&quot;Avenue de la Resistance&quot;&quot;&quot;" name="street"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1" name="active"/>
+        </record>-->
+<!--        <record id="res_company_tinyshop0" model="res.company">-->
+<!--            <field name="currency_id" ref="base.EUR"/>-->
+<!--            <field eval="1.0" name="po_lead"/>-->
+<!--            <field name="partner_id" ref="res_partner_tinyshop1"/>-->
+<!--            <field eval="1.0" name="manufacturing_lead"/>-->
+<!--            <field name="parent_id" ref="base.main_company"/>-->
+<!--            <field eval="80.0" name="schedule_range"/>-->
+<!--            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>-->
+<!--        </record>-->
+
+
+   		<record id="res_users_shopuser0" model="res.users">
+            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
+            <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
+            <field eval="[(6,0,[ref('purchase.res_roles_purchase0'),ref('sale.res_roles_salesman0')])]" name="roles_id"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="password"/>
+            <field eval="&quot;&quot;&quot;en_US&quot;&quot;&quot;" name="context_lang"/>
+            <field eval="&quot;&quot;&quot;Shop 1 User&quot;&quot;&quot;" name="name"/>
+            <field name="company_id" ref="stock.res_company_shop0"/>
+            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="login"/>
+            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+        </record>
+        <record id="res_users_shopuser1" model="res.users">
+            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
+            <field model="res.partner.address" name="address_id" search="[('name','=','Eric')]"/>
+            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="password"/>
+            <field eval="&quot;&quot;&quot;Shop 2 User&quot;&quot;&quot;" name="name"/>
+            <field name="company_id" ref="stock.res_company_tinyshop0"/>
+            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
+            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+        </record>
+		<record id="ir_rule_group_posline0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="&quot;&quot;&quot;POS line&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="ir_rule_0" model="ir.rule">
+			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
+			<field name="rule_group" ref="ir_rule_group_posline0"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="res_groups_posuserposline0" model="res.groups">
+			<field eval="[(6,0,[ref('point_of_sale.menu_action_pos_order_line'),ref('point_of_sale.menu_action_pos_order_line_day')])]" name="menu_access"/>
+			<field eval="[(6,0,[ref('ir_rule_group_posline0')])]" name="rule_groups"/>
+			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
+			<field eval="&quot;&quot;&quot;POS_user_pos_line&quot;&quot;&quot;" name="name"/>
+		</record>
+		<record id="ir_model_access_posorderline0_1" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order.line&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuserposline0"/>
+		</record>
+		<record id="ir_model_access_posorder0_1" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuserposline0"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="ir_rule_group_point0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="ir_rule_0" model="ir.rule">
+			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_pos_order_company_id"/>
+			<field name="rule_group" ref="ir_rule_group_point0"/>
+		</record>
+
+
+		 <record id="ir_rule_group_poslinecompany0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="&quot;&quot;&quot;POS line company&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="ir_rule_4" model="ir.rule">
+			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
+			<field name="rule_group" ref="ir_rule_group_poslinecompany0"/>
+		</record>
+
+		<record id="ir_rule_group_posreporting0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
+			<field eval="&quot;&quot;&quot;POS Reporting&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+
+		<record id="ir_rule_5" model="ir.rule">
+			<field eval="&quot;&quot;&quot;=&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_report_transaction_pos_user_id"/>
+			<field name="rule_group" ref="ir_rule_group_posreporting0"/>
+		</record>
+
+	</data>
+
+	<data>
+		<record id="res_groups_posuser0" model="res.groups">
+			<field eval="[(6,0,[ref('point_of_sale.menu_point_ofsale'),
+	 		ref('point_of_sale.menu_point_config'),
+      ref('stock.menu_action_location_form'),
+	 		ref('stock.menu_action_location_tree'),
+      ref('stock.menu_picking_waiting'),
+	 		ref('stock.menu_action_picking_tree3'),
+      ref('stock.menu_action_picking_tree5'),
+	 		ref('stock.menu_action_picking_form'),
+      ref('stock.menu_action_picking_tree7'),
+	 		ref('stock.menu_action_picking_tree8'),
+      ref('stock.menu_action_picking_tree9'),
+	 		ref('mrp.menu_mrp_procurement_action3'),
+	 		ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
+			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
+ 				<field eval="[(6,0,[ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
+			<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
+		</record>
+		<record id="ir_model_access_point0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_reporttransacationpos0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;report.transacation.pos&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_posorderline0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order.line&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_modelsmrp_pdt0" model="ir.model.access">
+			<field name="model_id" ref="mrp.model_mrp_procurement"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;MRP - Procurement&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_modelsupp_pdt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_supplierinfo"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - Supplier Infos&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_modeluom_pdt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_uom"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - UOM&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accountmoveline0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_move_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Move Line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_accountmove0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_move"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Move&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accountjournal0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Journal&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_saleshop0" model="ir.model.access">
+			<field name="model_id" ref="sale.model_sale_shop"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;sale.shop&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockwarehouse0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_warehouse"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.warehouse&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockwarehouseorderpoint0" model="ir.model.access">
+			<field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.warehouse.orderpoint&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stocklocation0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_location"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.location&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_saleorder0" model="ir.model.access">
+			<field name="model_id" ref="sale.model_sale_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;sale.order&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+		</record>
+
+		<record id="ir_model_access_saleorderline0" model="ir.model.access">
+			<field name="model_id" ref="sale.model_sale_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;sale.order.line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_purchaseorder0" model="ir.model.access">
+			<field name="model_id" ref="purchase.model_purchase_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;purchase.order&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_purchaseorderlines0" model="ir.model.access">
+			<field name="model_id" ref="purchase.model_purchase_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Purchase Order lines&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_inv0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_invoice"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_invorderlines0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_invoice_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Invoice lines&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_acc0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_account"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_period0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_period"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Period&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_journalperiod0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal_period"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Journal - Period&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_values0" model="ir.model.access">
+			<field name="model_id" ref="base.model_ir_values"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;values&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_prop0" model="ir.model.access">
+			<field name="model_id" ref="base.model_ir_property"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;properties&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_pdt_pdt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_product"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - Product&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_pdt_tmplt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_template"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - Template&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accountinvtax0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_invoice_tax"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Invoice Tax&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_productpricelist0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_pricelist"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.pricelist&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productpricelisttype0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_pricelist_type"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.pricelist.type&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productpricetype0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_price_type"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.price.type&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productcategory0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_category"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.category&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockpicking0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_picking"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.picking&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockmove0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_move"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.move&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productunitofmeasure0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_uom"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product Unit of Measure&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_journalview0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal_view"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Journal View&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_journalcolumn0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal_column"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Journal Column&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_paymenttermline0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_payment_term_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Payment Term Line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_paymentterm0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_payment_term"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Payment Term&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_rescompany0" model="ir.model.access">
+			<field name="model_id" ref="base.model_res_company"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;res.company&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accounttype0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_account_type"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Type&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+        <record id="ir_model_access_procurement0" model="ir.model.access">
+            <field name="model_id" ref="mrp.model_mrp_procurement" />
+            <field eval="1" name="perm_read" />
+            <field eval="1" name="perm_write" />
+            <field eval="1" name="perm_create" />
+            <field eval="0" name="perm_unlink" />
+            <field name="name" eval="&quot;&quot;&quot;mrp.procurement&quot;&quot;&quot;" />
+			<field name="group_id" ref="res_groups_posuser0"/>
+        </record>
+        <record id="ir_model_access_tax0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_tax"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;TAX&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<menuitem
+            id="stock.next_id_61"
+            name="Reporting"
+            parent="stock.menu_stock_root" groups="base.group_user"/>
+        <menuitem
+            id="stock.next_id_62"
+            name="Traceability"
+            parent="stock.next_id_61" groups="base.group_user"/>
+        <menuitem id="stock.menu_traceability_low" name="Low Level" parent="stock.menu_traceability" groups="base.group_user"/>
+		<menuitem action="stock.action_picking_tree" id="stock.menu_action_picking_tree" parent="stock.menu_stock_root" sequence="19" groups="res_groups_posuser0"/>
+        <menuitem id="mrp.menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4" groups="base.group_user"/>
+        <menuitem parent="stock.next_id_61" action="stock.action_stock_line_date" id="stock.menu_report_stock_line_date" groups="base.group_user"/>
+
+	</data>
+</openerp>
+
diff --git a/addons/point_of_sale/posrule_data2.xml b/addons/point_of_sale/posrule_data2.xml
new file mode 100644
index 00000000000..170bce20374
--- /dev/null
+++ b/addons/point_of_sale/posrule_data2.xml
@@ -0,0 +1,592 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+        <record id="res_partner_tinyshop0" model="res.partner">
+            <field eval="0" name="customer"/>
+            <field eval="0" name="supplier"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;Tiny Shop 1&quot;&quot;&quot;" name="name"/>
+        </record>
+        <record id="res_partner_address_fabien0" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;92000&quot;&quot;&quot;" name="zip"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field name="partner_id" ref="res_partner_tinyshop0"/>
+            <field name="country_id" ref="base.fr"/>
+            <field eval="&quot;&quot;&quot;Avenue de Paris&quot;&quot;&quot;" name="street"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
+        </record>
+        <record id="res_company_shop0" model="res.company">
+            <field eval="5.0" name="security_lead"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop0"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+
+        </record>
+        <record id="res_partner_tinyshop1" model="res.partner">
+            <field eval="1" name="customer"/>
+            <field eval="0" name="supplier"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;Tiny Shop 2&quot;&quot;&quot;" name="name"/>
+       </record>
+        <record id="res_partner_address_eric0" model="res.partner.address">
+            <field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;1500&quot;&quot;&quot;" name="zip"/>
+            <field eval="&quot;&quot;&quot;M.&quot;&quot;&quot;" name="title"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field name="country_id" ref="base.fr"/>
+            <field eval="&quot;&quot;&quot;Avenue de la Resistance&quot;&quot;&quot;" name="street"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1" name="active"/>
+        </record>
+        <record id="res_company_tinyshop0" model="res.company">
+            <field name="currency_id" ref="base.EUR"/>
+            <field eval="1.0" name="po_lead"/>
+            <field name="partner_id" ref="res_partner_tinyshop1"/>
+            <field eval="1.0" name="manufacturing_lead"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field eval="80.0" name="schedule_range"/>
+            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
+        </record>
+
+
+        <record id="res_users_shopuser0" model="res.users">
+            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
+            <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
+            <field eval="[(6,0,[ref('purchase.res_roles_purchase0'),ref('sale.res_roles_salesman0')])]" name="roles_id"/>
+            <field eval="1" name="active"/>
+            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="password"/>
+            <field eval="&quot;&quot;&quot;en_US&quot;&quot;&quot;" name="context_lang"/>
+            <field eval="&quot;&quot;&quot;Shop 1 User&quot;&quot;&quot;" name="name"/>
+            <field name="company_id" ref="res_company_shop0"/>
+            <field eval="&quot;&quot;&quot;shop1&quot;&quot;&quot;" name="login"/>
+            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+        </record>
+        <record id="res_users_shopuser1" model="res.users">
+            <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
+            <field eval="[(6,0,[ref('base.group_partner_manager')])]" name="groups_id"/>
+            <field model="res.partner.address" name="address_id" search="[('name','=','Eric')]"/>
+            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="password"/>
+            <field eval="&quot;&quot;&quot;Shop 2 User&quot;&quot;&quot;" name="name"/>
+            <field name="company_id" ref="res_company_tinyshop0"/>
+            <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
+            <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
+        </record>
+
+
+
+		<record id="ir_rule_group_posline0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="&quot;&quot;&quot;POS line&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="ir_rule_0" model="ir.rule">
+			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
+			<field name="rule_group" ref="ir_rule_group_posline0"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="res_groups_posuserposline0" model="res.groups">
+			<field eval="[(6,0,[ref('point_of_sale.menu_action_pos_order_line'),ref('point_of_sale.menu_action_pos_order_line_day')])]" name="menu_access"/>
+			<field eval="[(6,0,[ref('ir_rule_group_posline0')])]" name="rule_groups"/>
+			<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
+			<field eval="&quot;&quot;&quot;POS_user_pos_line&quot;&quot;&quot;" name="name"/>
+		</record>
+		<record id="ir_model_access_posorderline0_1" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order.line&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuserposline0"/>
+		</record>
+		<record id="ir_model_access_posorder0_1" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuserposline0"/>
+		</record>
+	</data>
+
+	<data>
+		<record id="ir_rule_group_point0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="ir_rule_0" model="ir.rule">
+			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_pos_order_company_id"/>
+			<field name="rule_group" ref="ir_rule_group_point0"/>
+		</record>
+
+
+		 <record id="ir_rule_group_poslinecompany0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="&quot;&quot;&quot;POS line company&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="ir_rule_4" model="ir.rule">
+			<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
+			<field name="rule_group" ref="ir_rule_group_poslinecompany0"/>
+		</record>
+
+		<record id="ir_rule_group_posreporting0" model="ir.rule.group">
+			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
+			<field eval="&quot;&quot;&quot;POS Reporting&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+
+		<record id="ir_rule_5" model="ir.rule">
+			<field eval="&quot;&quot;&quot;=&quot;&quot;&quot;" name="operator"/>
+			<field eval="&quot;&quot;&quot;user.id&quot;&quot;&quot;" name="operand"/>
+			<field name="field_id" ref="point_of_sale.field_report_transaction_pos_user_id"/>
+			<field name="rule_group" ref="ir_rule_group_posreporting0"/>
+		</record>
+
+	</data>
+
+	<data>
+		<record id="res_groups_posuser0" model="res.groups">
+			<field eval="[(6,0,[ref('point_of_sale.menu_point_ofsale'),
+	 		ref('point_of_sale.menu_point_config'),
+      ref('stock.menu_action_location_form'),
+	 		ref('stock.menu_action_location_tree'),
+      ref('stock.menu_picking_waiting'),
+	 		ref('stock.menu_action_picking_tree3'),
+      ref('stock.menu_action_picking_tree5'),
+	 		ref('stock.menu_action_picking_form'),
+      ref('stock.menu_action_picking_tree7'),
+	 		ref('stock.menu_action_picking_tree8'),
+      ref('stock.menu_action_picking_tree9'),
+	 		ref('mrp.menu_mrp_procurement_action3'),
+	 		ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
+ 				<field eval="[(6,0,[ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
+			<field eva="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
+			<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
+		</record>
+		<record id="ir_model_access_point0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_reporttransacationpos0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;report.transacation.pos&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_posorderline0" model="ir.model.access">
+			<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;pos.order.line&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_modelsmrp_pdt0" model="ir.model.access">
+			<field name="model_id" ref="mrp.model_mrp_procurement"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;MRP - Procurement&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_modelsupp_pdt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_supplierinfo"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - Supplier Infos&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_modeluom_pdt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_uom"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - UOM&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accountmoveline0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_move_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Move Line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_accountmove0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_move"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Move&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accountjournal0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Journal&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_saleshop0" model="ir.model.access">
+			<field name="model_id" ref="sale.model_sale_shop"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;sale.shop&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockwarehouse0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_warehouse"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.warehouse&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockwarehouseorderpoint0" model="ir.model.access">
+			<field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.warehouse.orderpoint&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stocklocation0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_location"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.location&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_saleorder0" model="ir.model.access">
+			<field name="model_id" ref="sale.model_sale_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;sale.order&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_saleorderline0" model="ir.model.access">
+			<field name="model_id" ref="sale.model_sale_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;sale.order.line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_purchaseorder0" model="ir.model.access">
+			<field name="model_id" ref="purchase.model_purchase_order"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;purchase.order&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_purchaseorderlines0" model="ir.model.access">
+			<field name="model_id" ref="purchase.model_purchase_order_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Purchase Order lines&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_inv0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_invoice"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_invorderlines0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_invoice_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Invoice lines&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_acc0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_account"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_period0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_period"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Period&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_journalperiod0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal_period"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Journal - Period&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_values0" model="ir.model.access">
+			<field name="model_id" ref="base.model_ir_values"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;values&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_prop0" model="ir.model.access">
+			<field name="model_id" ref="base.model_ir_property"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;properties&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_pdt_pdt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_product"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - Product&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_pdt_tmplt0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_template"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product - Template&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accountinvtax0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_invoice_tax"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Invoice Tax&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_productpricelist0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_pricelist"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.pricelist&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productpricelisttype0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_pricelist_type"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.pricelist.type&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productpricetype0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_price_type"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.price.type&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productcategory0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_category"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;product.category&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockpicking0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_picking"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.picking&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_stockmove0" model="ir.model.access">
+			<field name="model_id" ref="stock.model_stock_move"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;stock.move&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_productunitofmeasure0" model="ir.model.access">
+			<field name="model_id" ref="product.model_product_uom"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Product Unit of Measure&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_journalview0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal_view"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Journal View&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_journalcolumn0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_journal_column"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Journal Column&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_paymenttermline0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_payment_term_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Payment Term Line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_paymentterm0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_payment_term"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Payment Term&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_rescompany0" model="ir.model.access">
+			<field name="model_id" ref="base.model_res_company"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;res.company&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+		<record id="ir_model_access_accounttype0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_account_type"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;Account Type&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+        <record id="ir_model_access_procurement0" model="ir.model.access">
+            <field name="model_id" ref="mrp.model_mrp_procurement" />
+            <field eval="1" name="perm_read" />
+            <field eval="1" name="perm_write" />
+            <field eval="1" name="perm_create" />
+            <field eval="0" name="perm_unlink" />
+            <field name="name" eval="&quot;&quot;&quot;mrp.procurement&quot;&quot;&quot;" />
+			<field name="group_id" ref="res_groups_posuser0"/>
+        </record>
+        <record id="ir_model_access_tax0" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_tax"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;TAX&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="res_groups_posuser0"/>
+		</record>
+
+		<menuitem
+            id="stock.next_id_61"
+            name="Reporting"
+            parent="stock.menu_stock_root" groups="base.group_user"/>
+        <menuitem
+            id="stock.next_id_62"
+            name="Traceability"
+            parent="stock.next_id_61" groups="base.group_user"/>
+        <menuitem id="stock.menu_traceability_low" name="Low Level" parent="stock.menu_traceability" groups="base.group_user"/>
+		<menuitem action="stock.action_picking_tree" id="stock.menu_action_picking_tree" parent="stock.menu_stock_root" sequence="19" groups="res_groups_posuser0"/>
+        <menuitem parent="stock.next_id_61" action="stock.action_stock_line_date" id="stock.menu_report_stock_line_date" groups="base.group_user"/>
+
+	</data>
+</openerp>
+
diff --git a/addons/point_of_sale/report/__init__.py b/addons/point_of_sale/report/__init__.py
index ee61a93ecef..a5798add7b4 100644
--- a/addons/point_of_sale/report/__init__.py
+++ b/addons/point_of_sale/report/__init__.py
@@ -1,29 +1,40 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    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 pos_users_product
+import account_statement
+import all_closed_cashbox_of_the_day
 import pos_receipt
 import pos_invoice
 import pos_lines
 import pos_details
 import pos_details_summary
-
+import pos_payment_report
+import pos_sales_user
+import pos_sales_user_today
+import pos_payment_report_date
+import pos_payment_report_user
+import pos_sales_user_today_current_user
+import pos_receipt_with_remboursment
+import pos_receipt_without_remboursment
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/report/account_statement.py b/addons/point_of_sale/report/account_statement.py
new file mode 100644
index 00000000000..6b863a40469
--- /dev/null
+++ b/addons/point_of_sale/report/account_statement.py
@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class account_statement(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(account_statement, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'get_total':self._get_total,
+                })
+    def _get_total(self,statement_line_ids):
+        total = 0.0
+        for line in statement_line_ids:
+            total += line.amount
+        return total
+report_sxw.report_sxw('report.account.statement', 'account.bank.statement', 'addons/statement/report/account_statement.rml', parser=account_statement)
diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
new file mode 100644
index 00000000000..90d3fcf7d78
--- /dev/null
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -0,0 +1,296 @@
+<?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="statement_tbl">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_data">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_header">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_data1">
+      <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"/>
+    </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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" 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"/>
+    </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="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="6.0" spaceAfter="6.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="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_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="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 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,'statement') ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="120.0,120.0,120.0,121.0" style="statement_tbl">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Statement Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Journal</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">User</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="120.0,120.0,120.0,121.0" style="statement_data">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ statement.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ statement.journal_id.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ statement.company_id.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ statement.user_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="120.0,120.0,120.0,121.0" style="statement_header">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Opening Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Closing Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Starting Balance</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Ending Balance</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="120.0,120.0,120.0,121.0" style="statement_data1">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.date,date_time=True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date_time=True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="163.0,257.0,62.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Partner</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Amount</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+    <para style="terp_default_9">[[ repeatIn(statement.line_ids,'line_ids') ]]</para>
+    <blockTable colWidths="163.0,257.0,62.0" style="Table2">
+      <tr>
+        <td>
+
+          <para style="terp_default_9">[[ line_ids.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ line_ids.partner_id.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(line_ids.amount) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    </section>
+    <blockTable colWidths="163.0,218.0,39.0,62.0" style="statement_total">
+      <tr>
+        <td>
+          <para style="P1">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P1">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total : </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids)) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
new file mode 100644
index 00000000000..854acfde3a9
--- /dev/null
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -0,0 +1,141 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(all_closed_cashbox_of_the_day, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+                'time': time,
+                'get_data':self._get_data,
+                'get_bal':self._get_bal,
+                'get_lines':self._get_lines,
+                'get_partner':self._get_partner,
+                'get_net_total':self._get_net_total,
+                'get_user':self._get_user,
+                'get_sub_total':self._get_sub_total,
+                'get_net_total_starting':self._get_net_total_starting,
+                })
+    def _get_user(self,line_ids):
+        sql = "select name from res_users where id = %d"%(line_ids['create_uid'])
+        self.cr.execute(sql)
+        user = self.cr.fetchone()
+        return user[0]
+
+    def _get_data(self,user):
+        data = {}
+        sql = """ SELECT abs.journal_id,abs.id,abs.date,abs.closing_date,abs.name as statement,aj.name as journal,ap.name as period,ru.name as user,rc.name as company,
+                       abs.state,abs.balance_end_real FROM account_bank_statement as abs
+                       LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
+                       LEFT JOIN account_period as ap ON ap.id = abs.period_id
+                       LEFT JOIN res_users as ru ON ru.id = abs.user_id
+                       LEFT JOIN res_company as rc ON rc.id = abs.company_id
+                       WHERE to_char(date_trunc('day',abs.date),'YYYY-MM-DD')::date  = current_date and abs.state in ('confirm','open') and abs.user_id = %d"""%(user.id)
+        self.cr.execute(sql)
+        data = self.cr.dictfetchall()
+        return data
+
+    def _get_lines(self,statement):
+        data = {}
+        sql = """ select absl.* from account_bank_statement_line as absl, account_bank_statement as abs
+                           where absl.statement_id = abs.id and abs.id = %d"""%(statement['id'])
+        self.cr.execute(sql)
+        data = self.cr.dictfetchall()
+        return data
+
+    def _get_bal(self,data):
+        res = {}
+        sql =""" select sum(pieces*number) as bal from singer_statement where starting_id = %d """%(data['id'])
+        self.cr.execute(sql)
+        res = self.cr.dictfetchall()
+        if res :
+            return res[0]['bal']
+        else :
+            return False
+
+    def _get_sub_total(self,user,data,date):
+        res={}
+        self.cr.execute(""" select sum(absl.amount) from account_bank_statement as abs
+                            LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
+                            WHERE abs.journal_id = %d
+                            and abs.state in ('confirm','open')
+                            and abs.date = '%s'
+                            and abs.user_id = %d
+                            """%(data,date,user.id))
+        res = self.cr.fetchall()
+        if res[0][0]:
+            return res[0][0]
+        else:
+            return False
+    def _get_partner(self,statement):
+        res = {}
+        sql =""" select rp.name  from account_bank_statement_line as absl,res_partner as rp
+                                        where absl.partner_id = rp.id
+                                        and absl.pos_statement_id = %d"""%(statement['pos_statement_id'])
+        self.cr.execute(sql)
+        res = self.cr.dictfetchall()
+        if res :
+            return res[0]['name']
+        else :
+            return 0.00
+
+
+    def _get_net_total_starting(self,user):
+        lst = []
+        res={}
+        total_ending_bal = 0.0
+        total_starting_bal = 0.0
+        sql = """ SELECT abs.id,abs.balance_end_real as net_total FROM account_bank_statement as abs
+                    WHERE to_char(date_trunc('day',abs.date),'YYYY-MM-DD')::date  = current_date
+                    and abs.state in ('confirm','open') 
+                    and abs.user_id = %d"""%(user.id)
+        self.cr.execute(sql)
+        res = self.cr.dictfetchall()
+        for r in res :
+            total_ending_bal += (r['net_total'] or 0.0)
+            sql1 =""" select sum(pieces*number) as bal from singer_statement where starting_id = %d"""%(r['id'])
+            self.cr.execute(sql1)
+            data = self.cr.dictfetchall()
+            if data[0]['bal']:
+                total_starting_bal += data[0]['bal']
+        lst.append(total_ending_bal)
+        lst.append(total_starting_bal)
+        return lst
+
+    def _get_net_total(self,user):
+        lst = []
+        res={}
+        total_ending_bal = 0.0
+        total_starting_bal = 0.0
+        sql = """select sum(absl.amount) as net_total from account_bank_statement as abs
+                    LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
+                    where abs.state in ('confirm','open') and abs.user_id = %d
+                    and to_char(date_trunc('day',abs.date),'YYYY-MM-DD')::date  = current_date """%(user.id)
+
+        self.cr.execute(sql)
+        res = self.cr.dictfetchall()
+        return res[0]['net_total'] or 0.0
+
+report_sxw.report_sxw('report.all.closed.cashbox.of.the.day', 'account.bank.statement', 'addons/statement/report/all_closed_cashbox_of_the_day.rml', parser=all_closed_cashbox_of_the_day)
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
new file mode 100644
index 00000000000..63bae7c798f
--- /dev/null
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
@@ -0,0 +1,299 @@
+<?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="statement_tbl">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_data">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_header">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_data1">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1_detail">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="1,0"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="Table2_detail">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="statement_total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" 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"/>
+    </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="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_8_centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8_right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" 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_Bold_9_centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" 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="6.0" spaceAfter="6.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="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_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="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 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">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="258.0,258.0" style="statement_tbl">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">User</para>
+        </td>
+            </tr>
+    </blockTable>
+
+
+    <blockTable colWidths="258.0,258.0" style="statement_data">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ user.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+ <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="70.0,90.0,100.0,100.0,80.0,80.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General">St.Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Journal</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Opening Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Closing Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Right">Starting Balance</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Right">Ending Balance</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_tblheader_General">Total : </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre"></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre"></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre"></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1]) ]]</u></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user)) ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
+
+ <section>
+<para style="terp_default_8">[[ repeatIn(get_data(user),'statement') ]]</para>
+    <blockTable colWidths="70.0,90.0,100.0,100.0,80.0,80.0" style="Table1_detail">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_8">[[ statement['statement'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_8_centre">[[ statement['journal'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_8_centre">[[ statement['date'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_8_centre">[[ statement['closing_date'] ]]</para>
+        </td>
+         <td>
+          <para style="terp_default_Bold_8_right"><u> [[ (get_bal(statement)) or '0.00' ]]</u></para>
+        </td>
+        <td>
+        	<para style="terp_default_Bold_8_right"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
+
+	<section>
+	<para style="terp_default_9">[[ repeatIn(get_lines(statement),'line_ids') ]]</para>
+     <blockTable colWidths="129.0,150.0,83.0,80.0,80.0" style="Table2_detail">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_9"><font>[[ get_partner(line_ids) or removeParentNode('font') ]]</font></para>
+        </td>
+		<td>
+		   <para style="terp_default_9"><font>[[ get_user(line_ids) or removeParentNode('font') ]]</font></para>
+		</td>
+		<td></td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(line_ids['amount']) ]]</para>
+        </td>
+      </tr>
+     </blockTable>
+</section>
+    </section>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 8c190e73fac..3ab4055f04d 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,16 +26,83 @@ from report import report_sxw
 
 class pos_details(report_sxw.rml_parse):
 
-    def _get_qty_total(self, objects):
-        #code for the sum of qty_total
-        return reduce(lambda acc, object:
-                                        acc + reduce(
-                                                lambda sum_qty, line:
-                                                        sum_qty + line.qty,
-                                                object.lines,
-                                                0),
-                                    objects,
-                                    0)
+    def _get_invoice(self,inv_id,user):
+        res={}
+        self.cr.execute("select name from account_invoice as ac where id = %d" %(inv_id))
+        res = self.cr.fetchone()
+        if res:
+            return res[0]
+        else:
+            return  ''
+
+    def _pos_sales_details(self,form,user):
+        data={}
+        self.cr.execute ("select po.name as pos_name,po.date_order,pt.name ,pol.qty,pol.price_unit,pol.discount,po.invoice_id,sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as Total " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,res_users as ru,res_company as rc " \
+                         "where  pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  in ('done','paid','invoiced') " \
+                         "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
+                         "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
+                         "group by po.name,pol.qty,po.date_order,pt.name,pol.price_unit,pol.discount,po.invoice_id " \
+                             ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
+        data=self.cr.dictfetchall()
+        if data:
+            for d in data:
+                self.total += d['total']
+                self.qty += d['qty']
+                return data
+        else:
+            return {}
+
+    def _get_qty_total_2(self, form,user):
+        qty=[]
+        self.cr.execute("select sum(pol.qty) as qty " \
+                        "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,res_users as ru,res_company as rc " \
+                        "where  pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  in ('done','paid','invoiced') " \
+                        " and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
+                        "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
+                         ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
+        qty = self.cr.fetchone()
+        return qty[0] or 0.00
+
+    def _get_sales_total_2(self, form,user):
+        self.cr.execute("sELECT sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as Total from  pos_order_line as pol , pos_order po, product_product as pp,product_template as pt  where po.company_id='%s' and po.id=pol.order_id and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= '%s' and  to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= '%s' and po.state in ('paid','invoiced','done') and pt.id=pp.product_tmpl_id and pol.product_id=pp.id"% (str(user.company_id.id),form['date_start'],form['date_end']))
+        res2=self.cr.fetchone()
+        return res2 and res2[0] or 0.0
+
+    def _get_sum_invoice_2(self,form,user):
+        res2=[]
+        self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))" \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt ,res_users as ru,res_company as rc " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  in('invoiced')  " \
+                         "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
+                         "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
+                         ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
+        res2=self.cr.fetchone()
+        self.total_invoiced=res2[0]
+        return res2[0] or False
+
+    def _paid_total_2(self,form,user):
+        res3=[]
+        self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))" \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt, res_users as ru,res_company as rc " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  in('paid','invoiced','done')  " \
+                         "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
+                         "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
+                         ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
+        res3=self.cr.fetchone()
+        self.total_paid=res3[0]
+        return res3[0] or False
+
+#    def _get_qty_total(self, objects):
+#        #code for the sum of qty_total
+#        return reduce(lambda acc, object:
+#                                        acc + reduce(
+#                                                lambda sum_qty, line:
+#                                                        sum_qty + line.qty,
+#                                                object.lines,
+#                                                0),
+#                                    objects,
+#                                    0)
 
     def _get_sum_discount(self, objects):
         #code for the sum of discount value
@@ -47,29 +115,54 @@ class pos_details(report_sxw.rml_parse):
                                     objects,
                                     0.0)
 
-    def _get_payments(self, objects, ignore_gift=False):
+    def _get_payments(self, form,user, ignore_gift=False):
+#        gift_journal_id = None
+#        if ignore_gift:
+#            config_journal_ids = self.pool.get("pos.config.journal").search(self.cr, self.uid, [('code', '=', 'GIFT')])
+#            if len(config_journal_ids):
+#                config_journal = self.pool.get("pos.config.journal").browse(self.cr, self.uid, config_journal_ids, {})[0]
+#                gift_journal_id = config_journal.journal_id.id
+#
+#        result = {}
+#        for obj in objects:
+#            for payment in obj.statement_ids:
+#                result[payment.journal_id] = result.get(payment.journal_id, 0.0) + payment.amount
+#        return result
+        statement_line_obj = self.pool.get("account.bank.statement.line")
         gift_journal_id = None
         if ignore_gift:
             config_journal_ids = self.pool.get("pos.config.journal").search(self.cr, self.uid, [('code', '=', 'GIFT')])
             if len(config_journal_ids):
                 config_journal = self.pool.get("pos.config.journal").browse(self.cr, self.uid, config_journal_ids, {})[0]
                 gift_journal_id = config_journal.journal_id.id
+        pos_ids=self.pool.get("pos.order").search(self.cr, self.uid, [('date_order','>=',form['date_start'] + ' 00:00:00'),('date_order','<=',form['date_end'] + ' 23:59:59'),('state','in',['paid','invoiced','done']),('user_id','=',self.uid)])
+        data={}
+        if pos_ids:
+            st_line_ids = statement_line_obj.search(self.cr, self.uid, [('pos_statement_id', 'in', pos_ids)])
+            if st_line_ids:
+                st_id = statement_line_obj.browse(self.cr, self.uid, st_line_ids)
+                a_l=[]
+                for r in st_id :
+                    a_l.append(r['id'])
+                    a = ','.join(map(str,a_l))
+                self.cr.execute("select aj.name,sum(amount) from account_bank_statement_line as absl,account_bank_statement as abs,account_journal as aj " \
+                                "where absl.statement_id = abs.id and abs.journal_id = aj.id  and absl.id in (%s) " \
+                                "group by aj.name " \
+                                %(a))
 
-        result = {}
-        for obj in objects:
-            for payment in obj.payments:
-                if gift_journal_id and gift_journal_id == payment.journal_id.id:
-                    continue
-                result[payment.journal_id.name] = result.get(payment.journal_id.name, 0.0) + payment.amount
-        return result
-
-    def _paid_total(self, objects):
-        return sum(self._get_payments(objects, True).values(), 0.0)
+                data=self.cr.dictfetchall()
+                return data
+        else:
+            return {}
 
     def _total_of_the_day(self, objects):
-        total_paid = sum(self._get_payments(objects, True).values(), 0.0)
-        total_invoiced = self._sum_invoice(objects)
-        return total_paid - total_invoiced
+        if self.total_paid:
+             if self.total_paid == self.total_invoiced :
+                 return self.total_paid
+             else:
+                 return ((self.total_paid or 0.00) - (self.total_invoiced or 0.00))
+        else:
+            return False
 
     def _sum_invoice(self, objects):
         return reduce(lambda acc, obj:
@@ -87,47 +180,63 @@ class pos_details(report_sxw.rml_parse):
     def _strip_name(self, name, maxlen=50):
         return self._ellipsis(name, maxlen, ' ...')
 
-    def _get_tax_amount(self, objects):
+    def _get_tax_amount(self, form,user):
         res = {}
+        temp={}
         list_ids = []
-        for order in objects:
+        c=[]
+        temp2 = 0.0
+        pos_ids=self.pool.get("pos.order").search(self.cr, self.uid, [('date_order','>=',form['date_start'] + ' 00:00:00'),('date_order','<=',form['date_end'] + ' 23:59:59'),('state','in',['paid','invoiced','done']),('user_id','=',self.uid)])
+        temp.update({'name':''})
+        for order in self.pool.get("pos.order").browse(self.cr, self.uid, pos_ids):
+            temp2 +=order.amount_tax
             for line in order.lines:
                 if len(line.product_id.taxes_id):
                     tax = line.product_id.taxes_id[0]
                     res[tax.name] = (line.price_unit * line.qty * (1-(line.discount or 0.0) / 100.0)) + (tax.id in list_ids and res[tax.name] or 0)
                     list_ids.append(tax.id)
-        return res
+                    temp.update({'name':tax.name})
+        temp.update({'amount':temp2})
+        return [temp] or False
 
-    def _get_sales_total(self, objects):
-        return reduce(lambda x, o: x + len(o.lines), objects, 0)
+#    def _get_period(self, form):
+#        min_date = form['date_start']
+#        max_date = form['date_end']
+#        if min_date == max_date:
+#            return '%s' % min_date
+#        else:
+#            return '%s - %s' % (min_date, max_date)
+    def _get_period(self, form):
+        return form['date_start']
 
-    def _get_period(self, objects):
-        date_orders = [obj.date_order for obj in objects]
-        min_date = min(date_orders)
-        max_date = max(date_orders)
-        if min_date == max_date:
-            return '%s' % min_date
-        else:
-            return '%s - %s' % (min_date, max_date)
+    def _get_period2(self,form):
+        return form['date_end']
 
     def __init__(self, cr, uid, name, context):
-        super(pos_details, self).__init__(cr, uid, name, context=context)
+        super(pos_details, self).__init__(cr, uid, name, context)
         self.total = 0.0
+        self.qty = 0.0
+        self.invoice_id = ''
+        self.total_paid = 0.0
+        self.total_invoiced = 0.0
         self.localcontext.update({
             'time': time,
             'strip_name': self._strip_name,
             'getpayments': self._get_payments,
-            'getqtytotal': self._get_qty_total,
             'getsumdisc': self._get_sum_discount,
-            'getpaidtotal': self._paid_total,
             'gettotalofthaday': self._total_of_the_day,
-            'getsuminvoice': self._sum_invoice,
             'gettaxamount': self._get_tax_amount,
-            'getsalestotal': self._get_sales_total,
             'getperiod': self._get_period,
+            'getperiod2':self._get_period2,
+            'pos_sales_details':self._pos_sales_details,
+            'getqtytotal2': self._get_qty_total_2,
+            'getsalestotal2': self._get_sales_total_2,
+            'getsuminvoice2':self._get_sum_invoice_2,
+            'getpaidtotal2': self._paid_total_2,
+            'getinvoice':self._get_invoice,
         })
 
-report_sxw.report_sxw('report.pos.details', 'pos.order', 'addons/point_of_sale/report/pos_details.rml', parser=pos_details, header=None)
+report_sxw.report_sxw('report.pos.details', 'pos.order', 'addons/point_of_sale_singer/report/pos_details.rml', parser=pos_details, header=None)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 0fdbc060f79..10bfb2435dc 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -6,6 +6,73 @@
         </pageTemplate>
     </template>
     <stylesheet>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+
+    </blockTableStyle>
+
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+
+    </blockTableStyle>
+
+	<blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
+	  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,0"/>
+
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+	  <lineStyle kind="LINEABOVE" colorName="#000000" start="0,-1" stop="-1,-1"/>
+
+    </blockTableStyle>
         <blockTableStyle id="Standard_Outline">
             <blockAlignment value="LEFT"/>
             <blockValign value="TOP"/>
@@ -22,10 +89,7 @@
             <lineStyle kind="GRID" colorName="grey"/>
             <blockBackground colorName="#e6e6e6" start="0,-1" stop="-1,-1"/>
         </blockTableStyle>
-        <blockTableStyle id="Tableau7">
-            <blockAlignment value="LEFT"/>
-            <blockValign value="TOP"/>
-        </blockTableStyle>
+
         <blockTableStyle id="Table1">
             <blockAlignment value="LEFT"/>
             <blockValign value="TOP"/>
@@ -51,6 +115,20 @@
         <initialize>
             <paraStyle name="all" alignment="justify"/>
         </initialize>
+        <paraStyle name="terp_tblheader_Details_Center" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="Center" spaceBefore="6.0" spaceAfter="6.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_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.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_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.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_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Left_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" 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_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="-6.0" spaceAfter="6.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_bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" 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="P1" fontName="Times-Roman" fontSize="11.0" leading="14"/>
         <paraStyle name="P2" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
         <paraStyle name="P3" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -77,134 +155,242 @@
         <paraStyle name="Index" fontName="Times-Roman"/>
     </stylesheet>
     <story>
-        <para style="Heading">
-            <font face="Times-Roman" size="11.0">Detail of Sales</font>
-        </para>
-        <para style="Heading1">
-            <font face="Times-Roman" size="11.0"> </font>
-        </para>
-        <para style="P12">
-            <font face="Times-Roman" size="11.0">Company: [[ company.name ]]</font>
-        </para>
-        <para style="P12">
-            <font face="Times-Roman" size="11.0">Print Date: [[time.strftime('%Y-%m-%d')]]</font>
-        </para>
-        <para style="P12">
-            <font face="Times-Roman" size="11.0">Period: [[ '%s' % getperiod(objects) ]]</font>
-        </para>
+    <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+	<para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+     <para style="terp_header"> Detail of Sales </para>
+     <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+     <blockTable colWidths="178.0,178.0,178.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Period </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="178.0,178.0,178.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(getperiod(data['form']),date = True) ]] - [[ formatLang(getperiod2(data['form']),date = True) ]] </para>
+        </td>
+
+      </tr>
+    </blockTable>
+	  <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+        <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+
+      <!--<blockTable colWidths="95,42,180,40,27,37,37,40,40"  style="Table7" rowHeights="0.5cm">
 
-        <blockTable colWidths="80,57,180,40,27,37,37,40,40" style="Tableau8" rowHeights="0.5cm">
             <tr>
-                <td> <para style="P3">Date</para> </td>
-                <td> <para style="P3">Code</para> </td>
-                <td> <para style="P3">Product</para> </td>
-                <td> <para style="P3">Price</para> </td>
-                <td> <para style="P3">Qty</para> </td>
-                <td> <para style="P3">Disc</para> </td>
-                <td> <para style="P3">VAT(%)</para> </td>
-                <td> <para style="P3">VAT</para> </td>
-                <td> <para style="P3">Invoiced</para> </td>
+                <td> <para style="terp_tblheader_Details">Date</para> </td>
+                <td> <para style="terp_tblheader_Details">Code</para> </td>
+                <td> <para style="terp_tblheader_Details">Product</para> </td>
+                <td> <para style="terp_tblheader_Details">Price</para> </td>
+                <td> <para style="terp_tblheader_Details">Qty</para> </td>
+                <td> <para style="terp_tblheader_Details">Disc</para> </td>
+                <td> <para style="terp_tblheader_Details">VAT(%)</para> </td>
+                <td> <para style="terp_tblheader_Details">VAT</para> </td>
+                <td> <para style="terp_tblheader_Details">Invoiced</para> </td>
+            </tr>
+        </blockTable> -->
+        <blockTable colWidths="100,52,170,60,34,37,85"  style="Table7" rowHeights="0.5cm">
+
+            <tr>
+                <td> <para style="terp_tblheader_Details">Date</para> </td>
+                <td> <para style="terp_tblheader_Details">Code</para> </td>
+                <td> <para style="terp_tblheader_Details">Product</para> </td>
+                <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
+                <td> <para style="terp_tblheader_Details_Right">Qty</para> </td>
+                <td> <para style="terp_tblheader_Details_Right">Disc</para> </td>
+                <td> <para style="terp_tblheader_Details_Center">Invoiced</para> </td>
             </tr>
         </blockTable>
         <section>
+        <para style="terp_default_8">[[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]]</para>
+			<blockTable colWidths="100,52,170,60,34,37,85" style="Tableau7">
+	        <tr>
+	          <td>
+	            <para style="terp_default_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
+	          </td>
+	          <td>
+	            <para style="terp_default_9">[[ line_ids['pos_name'] ]]</para>
+	          </td>
+	          <td>
+	            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+	          </td>
+	          <td>
+	            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
+	          </td>
+	           <td>
+	            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+	          </td>
+	          <td>
+	            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
+	          </td>
+			  <td>
+			  <para style="terp_default_Right_9"><font>[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</font></para>
+	            <!--<para style="terp_default_Right_9">[[ line_ids['invoice_id'] ]]</para-->
+	          </td>
+	        </tr>
+	      </blockTable>
+	      </section>
+
+        <!--<section>
             [[ repeatIn(objects,'o') ]]
-            <blockTable colWidths="80,57,180,40,27,37,37,40,40" style="Tableau6" rowHeights="0.5cm">
+            <blockTable colWidths="95,42,180,40,27,37,37,40,40" style="Table8" rowHeights="0.5cm">
                 <tr>
-                    <td>[[ repeatIn(o.lines,'line') ]]<para style="P5">[[line.create_date ]]</para> </td>
+                    <td>[[ repeatIn(o.lines,'line') ]]<para style="terp_default_9">[[line.create_date ]]</para> </td>
                     <td> </td>
-                    <td> <para style="P5"> [[strip_name(line.product_id.name, 32) ]] </para></td>
-                    <td> <para style="P16"> [[ '%.2f' % (line.price_subtotal,) ]]</para></td>
-                    <td> <para style="P16"> [[ '%d' % line.qty ]]</para></td>
-                    <td> <para style="P16"> [[ '%d%%' % (line.discount) ]]</para></td>
-                    <td> <para style="P16"> [[ len(line.product_id.taxes_id) > 0 and ('%d%%' % (line.product_id.taxes_id[0].amount * 100)) or '' ]] </para></td>
+                    <td> <para style="terp_default_9"> [[strip_name(line.product_id.name, 32) ]] </para></td>
+                    <td> <para style="terp_default_Right_9"> [[ '%.2f' % (line.price_subtotal,) ]]</para></td>
+                    <td> <para style="terp_default_Right_9"> [[ '%d' % line.qty ]]</para></td>
+                    <td> <para style="terp_default_Right_9"> [[ '%d%%' % (line.discount) ]]</para></td>
+                    <td> <para style="terp_default_Right_9"> [[ len(line.product_id.taxes_id) > 0 and ('%d%%' % (line.product_id.taxes_id[0].amount * 100)) or '' ]] </para></td>
                     <td></td>
                     <td></td>
                 </tr>
                 <tr>
-                    <td> <para style="P5">[[ o.date_order ]] </para></td>
-                    <td> <para style="P5">[[ o.name ]] </para></td>
-                    <td> <para style="P5">[[ o.user_id.name ]] </para></td>
-                    <td> <para style="P17">[[ '%.2f' % (o.amount_total,) ]]</para></td>
+                    <td> <para style="terp_default_9">[[ o.date_order ]] </para></td>
+                    <td> <para style="terp_default_9">[[ o.name ]] </para></td>
+                    <td> <para style="terp_default_9">[[ o.user_id.name ]] </para></td>
+                    <td> <para style="terp_default_Right_9">[[ '%.2f' % (o.amount_total,) ]]</para></td>
                     <td></td>
                     <td></td>
                     <td></td>
-                    <td><para style="P16">[[ o.amount_tax ]] </para></td>
-                    <td><para style="P16">[[ o.invoice_id and o.invoice_id.number or '']]</para></td>
+                    <td><para style="terp_default_Right_9">[[ o.amount_tax ]] </para></td>
+                    <td><para style="terp_default_Right_9">[[ o.invoice_id and o.invoice_id.number or '']]</para></td>
                 </tr>
             </blockTable>
-        </section>
+        </section>-->
         <para>
             <font color="white"> </font>
         </para>
         <para>
             <font color="white"> </font>
         </para>
-        <blockTable colWidths="238.0,238.0" style="tmpTable2">
-            <tr>
-                <td>
-                    <blockTable colWidths="150,50" style="Tableau8">
+        <blockTable colWidths="267.0,267.0" style="Table4">
                         <tr>
                             <td>
-                                <para style="P3">
+                                <para style="terp_tblheader_Details">
                                     <font face="Helvetica-Bold" size="10.0">Mode of Taxes</font>
                                 </para>
                             </td>
                             <td></td>
                         </tr>
-                        <tr>[[ repeatIn(gettaxamount(objects).items(), 'p') ]]
-                            <td>[[ p[0] ]]</td>
-                            <td><para style="P17">[[ '%.2f' % (p[1],) ]]</para></td>
+                        <tr><para>[[ repeatIn(gettaxamount(data['form'],user), 'p') ]]</para>
+                            <td>[[ p['name'] or removeParentNode('tr') ]]</td>
+                            <td><para style="terp_default_Right_9"><font>[[  formatLang(p['amount']) or removeParentNode('font') ]]</font></para></td>
                         </tr>
-                    </blockTable>
-                    <para style="P2"><font color="white" /> </para>
-                    <blockTable colWidths="150,50" style="Tableau8">
+       </blockTable>
+
+       <blockTable colWidths="267.0,267.0" style="Table4">
                         <tr>
                             <td>
-                                <para style="P3">
+                                <para style="terp_tblheader_Details">
                                     <font face="Helvetica-Bold" size="10.0">Mode of payment</font>
                                 </para>
                             </td>
                             <td></td>
                         </tr>
-                        <tr>[[ repeatIn(getpayments(objects).items(), 'p') ]]
-                            <td>[[ p[0] ]]</td>
-                            <td><para style="P17">[[ '%.2f' % (p[1],) ]]</para></td>
+                        <tr>[[ repeatIn(getpayments(data['form'],user), 'p') ]]
+                            <td>[[ p['name'] or removeParentNode('tr') ]]</td>
+                            <td><para style="terp_default_Right_9">[[ formatLang(p['sum']) or removeParentNode('tr') ]]</para></td>
+                            <!--<td>[[ p.statement_id.journal_id.name ]]</td>
+                            <td><para style="terp_default_Right_9">[[ formatLang(p.amount) ]]</para></td>-->
                         </tr>
                     </blockTable>
-                </td>
-                <td>
-                    <blockTable colWidths="150.0,50.0" style="Tableau8">
-                        <tr>
-                            <td colspan="2"><para style="P3"><font face="Helvetica-Bold" size="10.0">Summary</font></para></td>
-                        </tr>
-                        <tr>
-                            <td>Sales total</td>
-                            <td><para style="P17">[[ '%d' % getsalestotal(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td>Qty of product</td>
-                            <td><para style="P17">[[ '%d' % getqtytotal(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td>Total invoiced</td>
-                            <td><para style="P17">[[ '%.2f' % getsuminvoice(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td>Total discount</td>
-                            <td><para style="P17">[[ '%.2f' % getsumdisc(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td>Total paid</td>
-                            <td><para style="P17">[[ '%.2f' % getpaidtotal(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td>Total of the day</td>
-                            <td><para style="P17">[[ '%.2f' % gettotalofthaday(objects) ]]</para></td>
-                        </tr>
-                    </blockTable>
-                </td>
+
+		<para style="terp_default_8">
+            <font color="white"> </font>
+    	</para>
+    	<para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+			<section>
+
+         <blockTable colWidths="267.0,267.0" style="Table5">
+         	<tr>
+            	<td colspan="2">
+                	<para style="terp_default_Left_9_Bold"><font face="Helvetica-Bold" size="10.0">Summary</font></para></td>
             </tr>
-        </blockTable>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Sales total</para></td>
+
+                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getsalestotal2(data['form'],user)) ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Qty of product</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getqtytotal2(data['form'],user)) ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Total invoiced</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getsuminvoice2(data['form'],user)) ]]</para></td>
+                        </tr>
+                        <!--<tr>
+                            <td><para style="terp_tblheader_Details">Total discount</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[  formatLang(getsumdisc(objects)) ]]</para></td>
+                        </tr>-->
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Total paid</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ formatLang(getpaidtotal2(data['form'],user))  ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Total of the day</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ formatLang(gettotalofthaday(data['form'])) ]]</para></td>
+                        </tr>
+                    </blockTable>
+                    </section>
+         <!--<blockTable colWidths="267.0,267.0" style="Table5">
+         	<tr>
+            	<td colspan="2">
+                	<para style="terp_default_Left_9_Bold"><font face="Helvetica-Bold" size="10.0">Summary</font></para></td>
+            </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Sales total</para></td>
+                            terp_tblheader_Details
+                            <td><para style="terp_default_Right_9_bold">[[ '%d' % getsalestotal(objects) ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Qty of product</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ '%d' % getqtytotal(objects) ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Total invoiced</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % getsuminvoice(objects) ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Total discount</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % getsumdisc(objects) ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Total paid</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % getpaidtotal(objects) ]]</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="terp_tblheader_Details">Total of the day</para></td>
+                            <td><para style="terp_default_Right_9_bold">[[ '%.2f' % gettotalofthaday(objects) ]]</para></td>
+                        </tr>
+                    </blockTable> -->
     </story>
 </document>
 
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index 4f9dcc89232..826844effd6 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -108,7 +109,7 @@ class pos_details_summary(report_sxw.rml_parse):
             return '%s - %s' % (min_date, max_date)
 
     def __init__(self, cr, uid, name, context):
-        super(pos_details_summary, self).__init__(cr, uid, name, context=context)
+        super(pos_details_summary, self).__init__(cr, uid, name, context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 50f70778ab1..254f397b6b6 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -6,6 +6,48 @@
         </pageTemplate>
     </template>
     <stylesheet>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+    </blockTableStyle>
+	<blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+
+    </blockTableStyle>
+
+	<blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+
+    </blockTableStyle>
+
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="1,0"/>
+
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+
+    </blockTableStyle>
+
         <blockTableStyle id="Standard_Outline">
             <blockAlignment value="LEFT"/>
             <blockValign value="TOP"/>
@@ -51,6 +93,13 @@
         <initialize>
             <paraStyle name="all" alignment="justify"/>
         </initialize>
+        <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_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_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Left_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" 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_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
         <paraStyle name="P1" fontName="Times-Roman" fontSize="11.0" leading="14"/>
         <paraStyle name="P2" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
         <paraStyle name="P3" fontName="Times-Roman" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -77,35 +126,59 @@
         <paraStyle name="Index" fontName="Times-Roman"/>
     </stylesheet>
     <story>
-        <para style="Heading">
-            <font face="Times-Roman" size="11.0">Detail of Sales</font>
-        </para>
-        <para style="Heading1">
-            <font face="Times-Roman" size="11.0"> </font>
-        </para>
-        <para style="P12">
-            <font face="Times-Roman" size="11.0">Company: [[ company.name ]]</font>
-        </para>
-        <para style="P12">
-            <font face="Times-Roman" size="11.0">Print Date: [[time.strftime('%Y-%m-%d')]]</font>
-        </para>
-        <para style="P12">
-            <font face="Times-Roman" size="11.0">Period: [[ '%s' % getperiod(objects) ]]</font>
-        </para>
 
-        <para>
+     <para style="terp_default_8">
             <font color="white"> </font>
-        </para>
-        <para>
+          </para>
+	<para style="terp_default_8">
             <font color="white"> </font>
-        </para>
-        <blockTable colWidths="238.0,238.0" style="tmpTable2">
-            <tr>
-                <td>
-                    <blockTable colWidths="150,50" style="Tableau8">
+          </para>
+     <para style="terp_header"> Detail of Sales </para>
+     <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+     <blockTable colWidths="178.0,178.0,178.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Period </para>
+        </td>
+      </tr>
+    </blockTable>
+	<blockTable colWidths="178.0,178.0,178.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[time.strftime('%Y-%m-%d')]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ '%s' % getperiod(objects) ]]</para>
+        </td>
+
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+            <font color="white"> </font>
+    </para>
+
+	<para style="terp_default_8">
+            <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+            <font color="white"> </font>
+    </para>
+
+	<blockTable colWidths="267.0,267.0" style="Table4">
                         <tr>
                             <td>
-                                <para style="P3">
+                                <para style="terp_tblheader_Details">
                                     <font face="Helvetica-Bold" size="10.0">Mode of Taxes</font>
                                 </para>
                             </td>
@@ -115,12 +188,12 @@
                             <td>[[ p[0] ]]</td>
                             <td><para style="P17">[[ '%.2f' % (p[1],) ]]</para></td>
                         </tr>
-                    </blockTable>
-                    <para style="P2"><font color="white" /> </para>
-                    <blockTable colWidths="150,50" style="Tableau8">
+       </blockTable>
+
+       <blockTable colWidths="267.0,267.0" style="Table4">
                         <tr>
                             <td>
-                                <para style="P3">
+                                <para style="terp_tblheader_Details">
                                     <font face="Helvetica-Bold" size="10.0">Mode of payment</font>
                                 </para>
                             </td>
@@ -131,40 +204,48 @@
                             <td><para style="P17">[[ '%.2f' % (p[1],) ]]</para></td>
                         </tr>
                     </blockTable>
-                </td>
-                <td>
-                    <blockTable colWidths="150.0,50.0" style="Tableau8">
+
+		<para style="terp_default_8">
+            <font color="white"> </font>
+    	</para>
+    	<para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+         <blockTable colWidths="267.0,267.0" style="Table5">
+         	<tr>
+            	<td colspan="2">
+                	<para style="terp_default_Left_9_Bold"><font face="Helvetica-Bold" size="10.0">Summary</font></para></td>
+            </tr>
                         <tr>
-                            <td colspan="2"><para style="P3"><font face="Helvetica-Bold" size="10.0">Summary</font></para></td>
+                            <td><para style="terp_tblheader_Details">Sales total</para></td>
+                            terp_tblheader_Details
+                            <td><para style="terp_default_Right_9">[[ '%d' % getsalestotal(objects) ]]</para></td>
                         </tr>
                         <tr>
-                            <td>Sales total</td>
-                            <td><para style="P17">[[ '%d' % getsalestotal(objects) ]]</para></td>
+                            <td><para style="terp_tblheader_Details">Qty of product</para></td>
+                            <td><para style="terp_default_Right_9">[[ '%d' % getqtytotal(objects) ]]</para></td>
                         </tr>
                         <tr>
-                            <td>Qty of product</td>
-                            <td><para style="P17">[[ '%d' % getqtytotal(objects) ]]</para></td>
+                            <td><para style="terp_tblheader_Details">Total invoiced</para></td>
+                            <td><para style="terp_default_Right_9">[[ '%.2f' % getsuminvoice(objects) ]]</para></td>
                         </tr>
                         <tr>
-                            <td>Total invoiced</td>
-                            <td><para style="P17">[[ '%.2f' % getsuminvoice(objects) ]]</para></td>
+                            <td><para style="terp_tblheader_Details">Total discount</para></td>
+                            <td><para style="terp_default_Right_9">[[ '%.2f' % getsumdisc(objects) ]]</para></td>
                         </tr>
                         <tr>
-                            <td>Total discount</td>
-                            <td><para style="P17">[[ '%.2f' % getsumdisc(objects) ]]</para></td>
+                            <td><para style="terp_tblheader_Details">Total paid</para></td>
+                            <td><para style="terp_default_Right_9">[[ '%.2f' % getpaidtotal(objects) ]]</para></td>
                         </tr>
                         <tr>
-                            <td>Total paid</td>
-                            <td><para style="P17">[[ '%.2f' % getpaidtotal(objects) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td>Total of the day</td>
-                            <td><para style="P17">[[ '%.2f' % gettotalofthaday(objects) ]]</para></td>
+                            <td><para style="terp_tblheader_Details">Total of the day</para></td>
+                            <td><para style="terp_default_Right_9">[[ '%.2f' % gettotalofthaday(objects) ]]</para></td>
                         </tr>
                     </blockTable>
-                </td>
-            </tr>
-        </blockTable>
+
     </story>
 </document>
 
diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index ea6162d7508..d9f345ca185 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -28,10 +29,11 @@ from tools.translate import _
 class pos_invoice(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_invoice, self).__init__(cr, uid, name, context=context)
+        super(pos_invoice, self).__init__(cr, uid, name, context)
         self.localcontext.update({
             'time': time,
         })
+        print
 
     def set_context(self, objects, data, ids, report_type=None):
         super(pos_invoice, self).set_context(objects, data, ids, report_type)
diff --git a/addons/point_of_sale/report/pos_lines.py b/addons/point_of_sale/report/pos_lines.py
index ff766ce3d68..1abec66dc80 100644
--- a/addons/point_of_sale/report/pos_lines.py
+++ b/addons/point_of_sale/report/pos_lines.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,7 +27,7 @@ from report import report_sxw
 class pos_lines(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_lines, self).__init__(cr, uid, name, context=context)
+        super(pos_lines, self).__init__(cr, uid, name, context)
         self.total = 0.0
         self.localcontext.update({
                 'time': time,
diff --git a/addons/point_of_sale/report/pos_payment_report.py b/addons/point_of_sale/report/pos_payment_report.py
new file mode 100644
index 00000000000..f27add1e208
--- /dev/null
+++ b/addons/point_of_sale/report/pos_payment_report.py
@@ -0,0 +1,79 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class pos_payment_report(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_payment_report, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'pos_payment': self._pos_payment,
+                'pos_payment_total':self._pos_payment_total,
+                })
+
+    def _pos_payment(self,obj):
+        data={}
+        sql = """ select id from pos_order where id = %d"""%(obj.id)
+        self.cr.execute(sql)
+        if self.cr.fetchone():
+            self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+                                 "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
+                                 "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
+                                 "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                                 "and po.state in ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date and po.id=%d"%(obj.id))
+            data=self.cr.dictfetchall()
+        else :
+            self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+                                 "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
+                                 "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
+                                 "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                                 "and po.state in ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date")
+            data=self.cr.dictfetchall()
+        print data
+        for d in data:
+            self.total += d['price_unit'] * d['qty']
+        return data
+
+
+    def _pos_payment_total(self,o):
+#        res=[]
+#        self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
+#                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
+#                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
+#                         "and po.state='paid' and po.date_order = current_date and po.id=%d"%(o.id))
+#        res=self.cr.fetchone()[0]
+        return self.total
+
+
+report_sxw.report_sxw('report.pos.payment.report', 'pos.order', 'addons/point_of_sale/report/pos_payment_report.rml', parser=pos_payment_report)
+
+
+
+
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
new file mode 100644
index 00000000000..ebe30bdf3bc
--- /dev/null
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -0,0 +1,216 @@
+<?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="2.0" y1="57.0" width="537" 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="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="LINEAFTER" 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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <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="LINEAFTER" 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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <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="6.0" spaceAfter="6.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="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_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="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+
+	<para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="268.0,268.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="268.0,268.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Product</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total</para>
+        </td>
+     </tr>
+    </blockTable>
+    <section>
+	<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+	<section>
+      <para style="terp_default_8">[[ repeatIn(pos_payment(o), 'line_ids') ]]</para>
+      <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Tableau7">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para>
+          </td>
+
+        </tr>
+      </blockTable>
+       </section>
+       </section>
+      <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">Net Total </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]]</para>
+        </td>
+      </tr>
+      </blockTable>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.py b/addons/point_of_sale/report/pos_payment_report_date.py
new file mode 100644
index 00000000000..1578f0e6958
--- /dev/null
+++ b/addons/point_of_sale/report/pos_payment_report_date.py
@@ -0,0 +1,71 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class pos_payment_report_date(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_payment_report_date, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'pos_payment_date': self.__pos_payment_date__,
+                'pos_payment_date_total':self.__pos_payment_date__total__,
+                })
+
+    def __pos_payment_date__(self,form):
+        dt1 = form['date_start'] + ' 00:00:00'
+        dt2 = form['date_end'] + ' 23:59:59'
+        data={}
+        self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+                         "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                         "and po.state in ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s and po.user_id in %s " \
+                         ,(dt1,dt2,tuple(form['user_id'][0][-1])))
+        data=self.cr.dictfetchall()
+        return data
+
+    def __pos_payment_date__total__(self,form):
+        dt1 = form['date_start'] + ' 00:00:00'
+        dt2 = form['date_end'] + ' 23:59:59'
+        res=[]
+        self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
+                         "and po.state in ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s and po.user_id in %s " \
+                         ,(dt1,dt2,tuple(form['user_id'][0][-1])))
+        res=self.cr.fetchone()[0]
+        return res
+
+
+report_sxw.report_sxw('report.pos.payment.report.date', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_date.rml', parser=pos_payment_report_date)
+
+
+
+
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
new file mode 100644
index 00000000000..f83d985b6b4
--- /dev/null
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -0,0 +1,213 @@
+<?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="2.0" y1="57.0" width="537" 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="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="LINEAFTER" 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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <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="LINEAFTER" 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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <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="6.0" spaceAfter="6.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="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_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="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+	<para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="268.0,268.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="268.0,268.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Product</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total</para>
+        </td>
+     </tr>
+    </blockTable>
+    <section>
+
+      <para style="terp_default_8">[[ repeatIn(pos_payment_date(data['form']), 'line_ids') ]]</para>
+      <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Tableau7">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para>
+          </td>
+
+        </tr>
+      </blockTable>
+       </section>
+      <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total : </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(pos_payment_date_total(data['form'])) or removeParentNode('blockTable')]]</para>
+        </td>
+      </tr>
+      </blockTable>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_payment_report_user.py b/addons/point_of_sale/report/pos_payment_report_user.py
new file mode 100644
index 00000000000..cde5162425e
--- /dev/null
+++ b/addons/point_of_sale/report/pos_payment_report_user.py
@@ -0,0 +1,80 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+class pos_payment_report_user(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_payment_report_user, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'pos_payment_user': self.__pos_payment_user__,
+                'pos_payment_user_total':self.__pos_payment_user__total__,
+                })
+
+    def __pos_payment_user__(self,form):
+        data={}
+        ids = form['user_id'][0][-1]
+        idss = map(str, ids)
+        sql = "select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+                         "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                         "and po.state in ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date " \
+                         "and po.user_id in (%s)" % (",".join(idss), )
+        self.cr.execute (sql)
+        data=self.cr.dictfetchall()
+        return data
+    def __pos_payment_user__total__(self,form):
+        res=[]
+        ids = form['user_id'][0][-1]
+        idss = map(str, ids)
+        self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
+                         "and po.state='paid' and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date " \
+                         "and po.user_id in (%s)" % (",".join(idss), ))
+        res=self.cr.fetchone()
+        res = res and res[0] or None
+
+        return res
+
+
+report_sxw.report_sxw('report.pos.payment.report.user', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_user.rml', parser=pos_payment_report_user)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
new file mode 100644
index 00000000000..f3a9311e186
--- /dev/null
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -0,0 +1,215 @@
+<?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="2.0" y1="57.0" width="537" 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="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="LINEAFTER" 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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <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="LINEAFTER" 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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <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="6.0" spaceAfter="6.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="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_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="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+	<para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="268.0,268.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="268.0,268.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Product</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total</para>
+        </td>
+     </tr>
+    </blockTable>
+    <section>
+
+      <para style="terp_default_8">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para>
+      <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Tableau7">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para>
+          </td>
+
+        </tr>
+      </blockTable>
+       </section>
+      <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total : </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]]</para>
+        </td>
+      </tr>
+      </blockTable>
+
+
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_receipt.py b/addons/point_of_sale/report/pos_receipt.py
index b8e9156d1d9..fbceae7ebf4 100644
--- a/addons/point_of_sale/report/pos_receipt.py
+++ b/addons/point_of_sale/report/pos_receipt.py
@@ -1,51 +1,53 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import time
 from report import report_sxw
-from mx.DateTime.ISO import ParseAny
 import pooler
 
+def titlize(journal_name):
+    res = []
+    words = journal_name.split()
+    while words.pop() != 'journal':
+        continue
+    return ' '.join(words)
 
 class order(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(order, self).__init__(cr, uid, name, context=context)
+        super(order, self).__init__(cr, uid, name, context)
 
         user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
         partner = user.company_id.partner_id
 
         self.localcontext.update({
             'time': time,
-            'dformat': '%Y/%m/%d %H:%M:%S',
             'disc': self.discount,
             'net': self.netamount,
-            'formatdate': self.formatdate,
+            'get_journal_amt': self._get_journal_amt,
             'address': partner.address and partner.address[0] or False,
+            'titlize': titlize
         })
 
-    def formatdate(self, datestr):
-        dateobj = ParseAny(datestr)
-        return dateobj.strftime(self.localcontext['dformat'])
-
     def netamount(self, order_line_id):
         sql = 'select (qty*price_unit) as net_price from pos_order_line where id = %s'
         self.cr.execute(sql, (order_line_id,))
@@ -62,6 +64,16 @@ class order(report_sxw.rml_parse):
                 dsum = dsum +(line[2] * (line[0]*line[1]/100))
         return dsum
 
+    def _get_journal_amt(self, order_id):
+        data={}
+        sql = """ select aj.name,absl.amount as amt from account_bank_statement as abs
+                        LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
+                        LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
+                        WHERE absl.pos_statement_id =%d"""%(order_id)
+        self.cr.execute(sql)
+        data = self.cr.dictfetchall()
+        return data
+
 report_sxw.report_sxw('report.pos.receipt', 'pos.order', 'addons/point_of_sale/report/pos_receipt.rml', parser=order, header=False)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 6dd8df26924..ecf1aa8c52a 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -1,185 +1,197 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(224.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau2">
-      <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"/>
-      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau3">
-      <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"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Dicount_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Amount">
-      <blockAlignment value="LEFT"/>
-          <blockValign value="TOP"/>
-    </blockTableStyle>
+    <template pageSize="(204.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+        <pageTemplate id="first">
+            <frame id="first" x1="0.0" y1="0.0" width="204" height="842"/>
+        </pageTemplate>
+    </template>
+    <stylesheet>
+        <blockTableStyle id="Standard_Outline">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+        </blockTableStyle>
+        <blockTableStyle id="Tableau2" dash = "3,2">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <blockBackground colorName="#ffffff" start="0,0" stop="0,0"/>
+            <blockBackground colorName="#ffffff" start="1,0" stop="1,0"/>
+            <blockBackground colorName="#ffffff" start="2,0" stop="2,0"/>
+            <lineStyle kind="LINEBELOW" colorName="lightgrey" start="0,-1" stop="2,-1"  thickness="0.25"/>
+        </blockTableStyle>
+        <blockTableStyle id="Tableau3">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+        </blockTableStyle>
+        <blockTableStyle id="Table1">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
 
-    <blockTableStyle id="Table_Discount_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <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="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_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.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="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_1" fontName="Helvetica-Bold" fontSize="9.0" leading="7" alignment="LEFT" spaceBefore="6.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_8a" fontName="Helvetica" fontSize="7.0" leading="8.0" 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_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.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="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" 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="12.0" spaceAfter="6.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_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9b" fontName="Helvetica" fontSize="8.5" leading="11" 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_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9b" fontName="Helvetica-Bold" fontSize="12.0" leading="20" 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_Bold_9_Right1" fontName="Helvetica-Bold" fontSize="9.0" leading="10.5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-    <para style="terp_default_8">[[ setLang(o.user_id.context_lang) ]]</para>
-    <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
-    <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
-    <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
-    <para style="terp_default_Centre_9">Fax : [[ address and address.fax ]]</para>
-    <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
-    <para style="terp_default_Centre_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_Centre_9b">OPERATION N° : [[ o.name ]]</para>
-    <para style="terp_default_Centre_9">Date : [[ formatdate(o.date_order) ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="125.0,25.0,35.0" repeatRows="1" style="Tableau2">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="terp_default_8">[[ repeatIn(o.lines,'line') ]]</para>
-      <blockTable colWidths="125.0,25.0,35.0" style="Tableau3">
-        <tr>
-          <td>
-            <para style="terp_default_9b">[[ len(line.product_id.name) > 39 and line.product_id.name[:39] + '...' or line.product_id.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ '%.f' % line.qty ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % net(line.id) ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <blockTable colWidths="185.0" style="Table_Dicount_Total">
-      <tr>
-        <td>
-          <blockTable colWidths="97.0,88.0" style="Table_Total">
-            <tr>
-              <td>
-                <para style="terp_tblheader_Details">Discount : </para>
-              </td>
-              <td>
-                <para style="terp_default_Bold_9_Right">[[ not(disc(o.id)) and removeParentNode('blockTable') or disc(o.id) ]] [[ o.pricelist_id.currency_id.name ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="100.0,85.0" style="Table_Discount_Total">
-            <tr>
-              <td>
-                <para style="terp_tblheader_Details">Total :</para>
-              </td>
-              <td>
-                <para style="terp_default_Bold_9_Right">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-	<blockTable colWidths="105.0,78.0" style="Table_Amount">
-	      <tr>
-	        <td>
-	          <para style="terp_default_2">[[ repeatIn(o.payments,'d') or removeParentNode('blockTable') ]]</para>
-	          <para style="terp_default_Bold_9_Right1">[[ d.journal_id.name ]]:</para>
-	        </td>
-	        <td>
-	          <para style="terp_default_Bold_9_Right2">[[ d.amount ]]</para>
-	        </td>
-	      </tr>
-		</blockTable>
-          <para style="terp_default_2">
+        </blockTableStyle>
+
+        <blockTableStyle id="Table3">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0" dash = '3,2'/>
+            <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
+
+        </blockTableStyle>
+
+        <blockTableStyle id="Table4">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="-1,0" dash = '3,2'/>
+            <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+        </blockTableStyle>
+
+        <blockTableStyle id="Table5">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+            <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
+            <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
+        </blockTableStyle>
+
+        <blockTableStyle id="Table6">
+            <blockAlignment value="LEFT"/>
+            <blockValign value="TOP"/>
+        </blockTableStyle>
+
+        <initialize>
+            <paraStyle name="all" alignment="justify"/>
+        </initialize>
+        <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="10.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="10.0" leading="11" 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_Bold_9_Right" fontName="Helvetica-Bold" fontSize="10.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_8" fontName="Courier" fontSize="10.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="P30" fontName="Courier-Oblique" fontSize="10.0" leading="9" alignment="LEFT"/>
+        <paraStyle name="P31" fontName="Courier-Bold" fontSize="10.0" leading="9" alignment="CENTER" backColor="#dddddd"/>
+        <paraStyle name="P4" fontName="Courier-Bold" fontSize="10.0" leading="10" alignment="CENTER"/>
+        <paraStyle name="P4b" fontName="Courier-Bold" fontSize="10.0" leading="1" alignment="CENTER"/>
+        <paraStyle name="P5" fontName="Courier-Bold" fontSize="10.0" leading="10" alignment="LEFT"/>
+        <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="RIGHT"/>
+        <paraStyle name="P6a" fontName="Helvetica" fontSize="10.0" leading="10" alignment="RIGHT"/>
+        <paraStyle name="P7" fontName="Courier-Bold" fontSize="10.0" leading="10" alignment="RIGHT"/>
+        <paraStyle name="P7a" fontName="Courier" fontSize="10.0" leading="10" alignment="RIGHT"/>
+        <paraStyle name="P8" fontName="Courier-Bold" fontSize="10.0" leading="8" alignment="LEFT"/>
+        <paraStyle name="P9" fontName="Courier-Oblique" fontSize="6.0" leading="0" alignment="LEFT"/>
+        <paraStyle name="terp_default_Bold_9_Right1" fontName="Helvetica" fontSize="9.0" leading="10.5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_Bold_9_Right2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="terp_default_9b" fontName="Helvetica" fontSize="8.5" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        <paraStyle name="P10" fontName="Courier-Oblique" fontSize="6.0" leading="9" alignment="RIGHT"/>
+        <paraStyle name="P11" rightIndent="0.0" leftIndent="-3.0" fontName="Courier-Bold" fontSize="10.0" leading="10" alignment="CENTER"/>
+        <paraStyle name="P12" rightIndent="0.0" leftIndent="-2.0" fontName="Courier-Bold" fontSize="10.0" leading="10" alignment="CENTER"/>
+        <paraStyle name="P13" fontName="Courier-Bold" fontSize="10.0" leading="10" alignment="RIGHT"/>
+        <paraStyle name="terp_header_Centre" fontName="Courier-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+        <paraStyle name="P14" fontName="Courier-Bold" fontSize="10.0" leading="10" alignment="LEFT"/>
+        <paraStyle name="Standard" fontName="Courier-Oblique"/>
+        <paraStyle name="Text body" fontName="Courier-Oblique" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="Heading" fontName="Courier" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+        <paraStyle name="List" fontName="Courier-Oblique" spaceBefore="0.0" spaceAfter="6.0"/>
+        <paraStyle name="Table Contents" fontName="Courier-Oblique"/>
+        <paraStyle name="Table Heading" fontName="Courier-Oblique" alignment="CENTER"/>
+        <paraStyle name="Caption" fontName="Courier-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+        <paraStyle name="Index" fontName="Courier-Oblique"/>
+    </stylesheet>
+    <story>
+
+        <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+        <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
+        <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
+        <para style="terp_default_Centre_9">[[ address and address.country_id.name ]]</para>
+        <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
+        <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
+        <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
+        <para style="terp_default_Centre_9">Vendeur : [[ o.user_id1.name ]]</para>
+        <para style="terp_default_Centre_9">Date : [[ o.date_order ]]</para>
+        <para style="P4">
             <font color="white"> </font>
-          </para>
-          <para style="terp_default_2">
+        </para>
+        <para style="P4">
             <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-  </story>
+        </para>
+        <para style="P4">[[o.type_rec]]</para>
+        <para style="P4b">
+            <font color="white"> </font>
+        </para>
+        <para style="P4"> N° : [[ o.name ]]</para>
+        <para style="P4"> Contract : [[ o.contract_number ]]</para>
+
+        <blockTable colWidths="115.0,30.0,40.0" repeatRows="1" style="Table3">
+            <tr>
+                <td>
+                    <para style="P5">Description</para>
+                </td>
+                <td>
+                    <para style="P7">Qty</para>
+                </td>
+                <td>
+                    <para style="P7">Price</para>
+                </td>
+            </tr>
+            <tr>
+                <td><para style="P8">[[ repeatIn(o.lines,'line') ]]</para>
+                    <para style="terp_default_9b">[[ len(line.product_id.name) > 39 and line.product_id.name[:39] + '...' or line.product_id.name ]]</para>
+                    
+                </td>
+                <td>
+                    <para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]</para>
+                    
+                </td>
+                <td>
+                    <para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] <font> [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.2f' % line.discount ]]%)</font></para>
+                </td>
+            </tr>
+        </blockTable>
+        <blockTable colWidths="140.0,43.0" style="Table4">
+            <tr>
+                <td>
+                    <para style="P6a">Taxes :</para>
+                </td>
+                <td>
+                    <para style="P7a">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_tax ]]</para>
+                </td>
+            </tr>
+        </blockTable>
+        <blockTable colWidths="115.0,35.0,45.0" style="Table6">
+            <tr>
+                <td>
+                </td>
+                <td>
+                    <para style="P6">Total :</para>
+                </td>
+                <td>
+                    <para style="P7">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total ]]</para>
+                </td>
+            </tr>
+        </blockTable>
+
+        <blockTable colWidths="115.0,30.0,40.0" style="Table5">
+            <tr>
+                <td>
+                    <para style="P5">Payment Mode</para>
+                </td>
+                <td></td>
+                <td>
+                    <para style="P13">Amount</para>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <para style="P9">[[ repeatIn(get_journal_amt(o),'d') ]]</para>
+                    <para style="terp_default_Bold_9_Right1">[[ d['name'] ]]</para>
+                </td>
+                <td></td>
+                <td>
+                    <para style="terp_default_Bold_9_Right2">[[ '%.2f' %(d['amt'] or 0) ]]</para>
+                </td>
+            </tr>
+        </blockTable>
+        <para style="P31">
+            [[o.note_2]]
+        </para>
+
+    </story>
 </document>
+
diff --git a/addons/point_of_sale/report/pos_receipt_bis.rml b/addons/point_of_sale/report/pos_receipt_bis.rml
new file mode 100644
index 00000000000..1080a69ea65
--- /dev/null
+++ b/addons/point_of_sale/report/pos_receipt_bis.rml
@@ -0,0 +1,186 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(224.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <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"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau3">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Dicount_Total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Amount">
+      <blockAlignment value="LEFT"/>
+          <blockValign value="TOP"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="Table_Discount_Total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+	  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <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="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_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.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="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_1" fontName="Helvetica-Bold" fontSize="9.0" leading="7" alignment="LEFT" spaceBefore="6.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_8a" fontName="Helvetica" fontSize="7.0" leading="8.0" 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_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.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="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" 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="12.0" spaceAfter="6.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_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9b" fontName="Helvetica" fontSize="8.5" leading="11" 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_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9b" fontName="Helvetica-Bold" fontSize="12.0" leading="20" 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_Bold_9_Right1" fontName="Helvetica-Bold" fontSize="9.0" leading="10.5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_default_8">[[ setLang(o.user_id.context_lang) ]]</para>
+    <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
+    <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
+    <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
+    <para style="terp_default_Centre_9">Fax : [[ address and address.fax ]]</para>
+    <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
+    <para style="terp_default_Centre_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_Centre_9b">Operation N° : [[ o.name ]]</para>
+    <para style="terp_default_Centre_9">Date : [[ o.date_order ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="115.0,25.0,35.0" repeatRows="1" style="Tableau2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(o.lines,'line') ]]</para>
+      <blockTable colWidths="115.0,25.0,35.0" style="Tableau3">
+        <tr>
+          <td>
+            <para style="terp_default_9b">[[ len(line.product_id.name) > 39 and line.product_id.name[:39] + '...' or line.product_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ '%.f' % line.qty ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ '%.2f' % net(line.id) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="175.0" style="Table_Dicount_Total">
+      <tr>
+        <td>
+          <blockTable colWidths="97.0,78.0" style="Table_Total">
+            <tr>
+              <td>
+                <para style="terp_tblheader_Details">Discount : </para>
+              </td>
+              <td>
+                <para style="terp_default_Bold_9_Right">[[ not(disc(o.id)) and removeParentNode('blockTable') or disc(o.id) ]] [[ o.pricelist_id.currency_id.name ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="97.0,78.0" style="Table_Discount_Total">
+            <tr>
+              <td>
+                <para style="terp_tblheader_Details">Total :</para>
+              </td>
+              <td>
+                <para style="terp_default_Bold_9_Right">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+    <blockTable colWidths="97.0,78.0" style="Table_Amount">
+      <tr>
+        <td>
+          <para style="terp_default_2">[[ repeatIn(o.payments,'d') ]]</para>
+          <para style="terp_default_Bold_9_Right1">[[ d.name ]]:</para>
+          </td>
+        <td>
+          <para style="terp_default_Bold_9_Right2">[[ d.amount ]]</para>
+        </td>
+      </tr>
+	</blockTable>
+
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.py b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
new file mode 100644
index 00000000000..539f2d1548d
--- /dev/null
+++ b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
@@ -0,0 +1,80 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+import pooler
+
+
+class order(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(order, self).__init__(cr, uid, name, context)
+
+        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
+        partner = user.company_id.partner_id
+
+        self.localcontext.update({
+            'time': time,
+            'disc': self.discount,
+            'net': self.netamount,
+            'get_journal_amt': self._get_journal_amt,
+            'address': partner.address and partner.address[0] or False,
+        })
+
+    def netamount(self, order_line_id):
+        sql = 'select (qty*price_unit) as net_price from pos_order_line where id = %s'
+        self.cr.execute(sql, (order_line_id,))
+        res = self.cr.fetchone()
+        return res[0]
+
+    def discount(self, order_id):
+        sql = 'select discount, price_unit, qty from pos_order_line where order_id = %s '
+        self.cr.execute(sql, (order_id,))
+        res = self.cr.fetchall()
+        dsum = 0
+        for line in res:
+            if line[0] != 0:
+                dsum = dsum +(line[2] * (line[0]*line[1]/100))
+        return dsum
+    def _get_journal_amt(self, order_id):
+        lst=[]
+        sql = """ select aj.name from account_bank_statement as abs
+                    LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
+                    LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
+                    WHERE absl.pos_statement_id = %d"""%(order_id.id)
+        self.cr.execute(sql)
+        res = self.cr.fetchone()
+        lst.append(res[0])
+        sql2 = """ select sum(absl.amount) as amt from account_bank_statement as abs
+                    LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
+                    LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
+                    where aj.name = '%s' """%(res[0])
+        self.cr.execute(sql2)
+        res1 = self.cr.fetchone()
+        lst.append(res1[0])
+        return lst
+
+report_sxw.report_sxw('report.pos.receipt.with.remboursment', 'pos.order', 'addons/point_of_sale/report/pos_receipt_with_remboursment.rml', parser=order, header=False)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.rml b/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
new file mode 100644
index 00000000000..01fa0e4ac1e
--- /dev/null
+++ b/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
@@ -0,0 +1,131 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(224.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+        <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" 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_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" 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_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+
+    <paraStyle name="P2" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="CENTER"/>
+    <paraStyle name="P30" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT"/>
+    <paraStyle name="P31" fontName="Times-Bold" fontSize="8.0" leading="9" alignment="CENTER" backColor="#dddddd"/>
+    <paraStyle name="P4" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="30"/>
+    <paraStyle name="P6" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P7" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P8" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT"/>
+    <paraStyle name="P11" rightIndent="0.0" leftIndent="-3.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P12" rightIndent="0.0" leftIndent="-2.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P13" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    [[ repeatIn(objects,'o') ]]
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
+    <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
+    <para style="terp_default_Centre_9">[[ address and address.country_id.name ]]</para>
+    <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
+    <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
+    <para style="terp_default_Centre_9">Salesman : [[ o.user_id.name ]]</para>
+    <para style="terp_default_Centre_9">Sale Date : [[ o.date_order ]]</para>
+	  <para style="P5">Refund Receipt: [[o.name]]</para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="118.0,30.0,38.0" repeatRows="1" style="Tableau2">
+
+      <tr>
+        <td>
+          <para style="P5">Description</para>
+        </td>
+        <td>
+          <para style="P11">Qty</para>
+        </td>
+        <td>
+          <para style="P12">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="P8">[[ repeatIn(o.lines,'line') ]]</para>
+      <blockTable colWidths="100.0,30.0,55.0" style="Tableau3">
+
+        <tr>
+          <td>
+            <para style="P9">[[ line.product_id.name ]]</para>
+          </td>
+          <td>
+            <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]</para>
+          </td>
+          <td>
+            <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] <font> [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.f' % line.discount ]]%)</font></para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="149.0,37.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P13">Disc : </para>
+        </td>
+        <td>
+          <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % (disc(o.id) or 0.0,) ]] </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Total :</para>
+        </td>
+        <td>
+          <para style="P7">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]</para>
+  </story>
+</document>
+
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.py b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
new file mode 100644
index 00000000000..843041f3863
--- /dev/null
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
@@ -0,0 +1,81 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+import pooler
+
+
+class order(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(order, self).__init__(cr, uid, name, context)
+
+        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
+        partner = user.company_id.partner_id
+
+        self.localcontext.update({
+            'time': time,
+            'disc': self.discount,
+            'net': self.netamount,
+            'get_journal_amt': self._get_journal_amt,
+            'address': partner.address and partner.address[0] or False,
+        })
+
+    def netamount(self, order_line_id):
+        sql = 'select (qty*price_unit) as net_price from pos_order_line where id = %s'
+        self.cr.execute(sql, (order_line_id,))
+        res = self.cr.fetchone()
+        return res[0]
+
+    def discount(self, order_id):
+        sql = 'select discount, price_unit, qty from pos_order_line where order_id = %s '
+        self.cr.execute(sql, (order_id,))
+        res = self.cr.fetchall()
+        dsum = 0
+        for line in res:
+            if line[0] != 0:
+                dsum = dsum +(line[2] * (line[0]*line[1]/100))
+        return dsum
+
+    def _get_journal_amt(self, order_id):
+        lst=[]
+        sql = """ select aj.name from account_bank_statement as abs
+                    LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
+                    LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
+                    WHERE absl.pos_statement_id = %d"""%(order_id.id)
+        self.cr.execute(sql)
+        res = self.cr.fetchone()
+        lst.append(res[0])
+        sql2 = """ select sum(absl.amount) as amt from account_bank_statement as abs
+                    LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
+                    LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
+                    where aj.name = '%s' """%(res[0])
+        self.cr.execute(sql2)
+        res1 = self.cr.fetchone()
+        lst.append(res1[0])
+        return lst
+
+report_sxw.report_sxw('report.pos.receipt.without.remboursment', 'pos.order', 'addons/point_of_sale/report/pos_receipt_without_remboursment.rml', parser=order, header=False)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
new file mode 100644
index 00000000000..d863efd40f3
--- /dev/null
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
@@ -0,0 +1,138 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(224.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,0"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,0"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+        <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" 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_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" 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_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+
+    <paraStyle name="P2" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P3" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="CENTER"/>
+    <paraStyle name="P30" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT"/>
+    <paraStyle name="P31" fontName="Times-Bold" fontSize="8.0" leading="9" alignment="CENTER" backColor="#dddddd"/>
+    <paraStyle name="P4" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P6" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P7" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P8" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="P9" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT"/>
+    <paraStyle name="P11" rightIndent="0.0" leftIndent="-3.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P12" rightIndent="0.0" leftIndent="-2.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P13" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <story>
+    [[ repeatIn(objects,'o') ]]
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
+    <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
+    <para style="terp_default_Centre_9">[[ address and address.country_id.name ]]</para>
+    <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
+    <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
+    <para style="terp_default_Centre_9">Salesman : [[ o.user_id.name ]]</para>
+    <para style="terp_default_Centre_9">Sale Date : [[ o.date_order ]]</para>
+	  <para style="P5">Purchase Voucher : [[o.name]]</para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="118.0,30.0,38.0" repeatRows="1" style="Tableau2">
+
+      <tr>
+        <td>
+          <para style="P5">Description</para>
+        </td>
+        <td>
+          <para style="P11">Qty</para>
+        </td>
+        <td>
+          <para style="P12">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="P8">[[ repeatIn(o.lines,'line') ]]</para>
+      <blockTable colWidths="100.0,30.0,55.0" style="Tableau3">
+
+        <tr>
+          <td>
+            <para style="P9">[[ line.product_id.name ]]</para>
+          </td>
+          <td>
+            <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]</para>
+          </td>
+          <td>
+            <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] <font> [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.f' % line.discount ]]%)</font></para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="149.0,37.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P13">Disc : </para>
+        </td>
+        <td>
+          <para style="P10">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % (disc(o.id) or 0.0,) ]] </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P6">Total :</para>
+        </td>
+        <td>
+          <para style="P7">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]</para>
+
+	<section>
+		[[ repeatIn((o.state=='cancel' and o.statement_ids) and [1] or [], 'p') ]]
+		<para style="P31">
+			Ce bon est valide jusqu'au [[ time.strftime('%d/%m/%Y', time.strptime(o.date_validity,'%Y-%m-%d')) ]].
+		</para>
+	</section>
+  </story>
+</document>
+
diff --git a/addons/point_of_sale/report/pos_sales_user.py b/addons/point_of_sale/report/pos_sales_user.py
new file mode 100644
index 00000000000..034587a8ae4
--- /dev/null
+++ b/addons/point_of_sale/report/pos_sales_user.py
@@ -0,0 +1,58 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class pos_sales_user(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_sales_user, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'get_data':self._get_data,
+
+                })
+
+    def _get_data(self,form):
+        dt1 = form['date_start'] + ' 00:00:00'
+        dt2 = form['date_end'] + ' 23:59:59'
+        data={}
+        self.cr.execute("select po.name as pos,po.date_order,ru.name as user,po.state,rc.name " \
+                        "from pos_order as po,res_users as ru,res_company as rc " \
+                        "where po.date_order >= %s and po.date_order <= %s " \
+                        "and po.company_id=rc.id and po.user_id=ru.id and po.user_id in %s " \
+                            ,(dt1,dt2,tuple(form['user_id'][0][-1])))
+
+        data = self.cr.dictfetchall()
+        return data
+
+report_sxw.report_sxw('report.pos.sales.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user.rml', parser=pos_sales_user)
+
+
+
+
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml
new file mode 100644
index 00000000000..b6a3dae9685
--- /dev/null
+++ b/addons/point_of_sale/report/pos_sales_user.rml
@@ -0,0 +1,188 @@
+<?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="2.0" y1="57.0" width="537" 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="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="LINEAFTER" 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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <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="LINEAFTER" 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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+	<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <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="6.0" spaceAfter="6.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="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_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="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+	<para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="268.0,268.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="268.0,268.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Date Order</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">User</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">State</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Company</para>
+        </td>
+     </tr>
+    </blockTable>
+     <section>
+
+      <para style="terp_default_8">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
+      <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau7">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line_ids['pos'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line_ids['user'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ line_ids['state'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line_ids['name'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+       </section>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_sales_user_today.py b/addons/point_of_sale/report/pos_sales_user_today.py
new file mode 100644
index 00000000000..4e06a936116
--- /dev/null
+++ b/addons/point_of_sale/report/pos_sales_user_today.py
@@ -0,0 +1,58 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class pos_sales_user_today(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_sales_user_today, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'get_data':self._get_data,
+
+                })
+
+    def _get_data(self,form):
+        data={}
+        ids = form['user_id'][0][-1]
+        idss = map(str, ids)
+
+        self.cr.execute("select po.name as pos,po.date_order,ru.name as user,po.state,rc.name " \
+                        "from pos_order as po,res_users as ru,res_company as rc " \
+                        "where to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date " \
+                        "and po.company_id=rc.id and po.user_id=ru.id and po.user_id in (%s)"% (",".join(idss), ))
+
+        data = self.cr.dictfetchall()
+        return data
+
+report_sxw.report_sxw('report.pos.sales.user.today', 'pos.order', 'addons/point_of_sale/report/pos_sales_user_today.rml', parser=pos_sales_user_today)
+
+
+
+
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml
new file mode 100644
index 00000000000..7db76e33ff4
--- /dev/null
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -0,0 +1,187 @@
+<?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="2.0" y1="57.0" width="537" 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="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="LINEAFTER" 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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <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="LINEAFTER" 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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <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="6.0" spaceAfter="6.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="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_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="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+	<para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="268.0,268.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="268.0,268.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Date Order</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">User</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">State</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Company</para>
+        </td>
+     </tr>
+    </blockTable>
+     <section>
+
+      <para style="terp_default_8">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
+      <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau7">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line_ids['pos'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line_ids['user'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ line_ids['state'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line_ids['name'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+       </section>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.py b/addons/point_of_sale/report/pos_sales_user_today_current_user.py
new file mode 100644
index 00000000000..3ee371dcd43
--- /dev/null
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.py
@@ -0,0 +1,84 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class pos_sales_user_today_current_user(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_sales_user_today_current_user, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.qty = 0.0
+        self.localcontext.update({
+                'time': time,
+                'get_user':self._get_user,
+                'get_data_current_user':self._get_data_current_user,
+                'get_data_current_user_tot':self._get_data_current_user_tot,
+                'get_data_current_user_qty':self._get_data_current_user_qty,
+                })
+
+    def _get_user(self, user):
+        pos_user={}
+        self.cr.execute("select name from res_users where id = %s",str(self.uid))
+        pos_user=self.cr.dictfetchone()
+        return pos_user['name']
+
+    def _get_data_current_user(self, user):
+        data={}
+        self.cr.execute("select po.name,po. state,sum(pol.qty)as Qty,sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as Total " \
+                        "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt ,res_users as ru,res_company as rc  " \
+                        "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                        "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date  and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
+                        "group by po.name, po.state " \
+                        ,(str(user.company_id.id),str(self.uid)))
+
+        data = self.cr.dictfetchall()
+        for d in data:
+            self.total += d['total']
+            self.qty += d['qty']
+        return data
+
+    def _get_data_current_user_tot(self, user):
+#        res={}
+#        self.cr.execute("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) " \
+#                        "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt ,res_users as ru,res_company as rc  " \
+#                        "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
+#                        "and po.date_order = current_date and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
+#                         ,(str(self.uid),str(user.company_id.id)))
+#
+#        res=self.cr.dictfetchone()
+#        return res['sum']
+        return self.total
+
+    def _get_data_current_user_qty(self, user):
+        return self.qty
+
+report_sxw.report_sxw('report.pos.sales.user.today.current.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user_today_current_user.rml', parser=pos_sales_user_today_current_user)
+
+
+
+
+
+
+
+
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
new file mode 100644
index 00000000000..469fc5cdd33
--- /dev/null
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
@@ -0,0 +1,202 @@
+<?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="2.0" y1="57.0" width="537" 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="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="LINEAFTER" 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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <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="LINEAFTER" 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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+       <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="2,0"/>
+
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <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="6.0" spaceAfter="6.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="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_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="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+	<para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="178.0,178.0,178.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">User</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="178.0,178.0,178.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+        </td>
+        <td>
+        	<para style="terp_default_Centre_8">[[ (get_user(user)) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="338.0,52.0,72.0,72.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">State</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total</para>
+        </td>
+     </tr>
+    </blockTable>
+     <section>
+
+      <para style="terp_default_8">[[ repeatIn(get_data_current_user(user), 'line_ids')]]</para>
+      <blockTable colWidths="338.0,52.0,72.0,72.0" style="Tableau7">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ line_ids['state'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+       </section>
+       <blockTable colWidths="338.0,52.0,72.0,72.0" style="Table1">
+        <tr>
+          <td>
+            <para style="terp_default_9"></para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Total : </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_qty(user))) ]]</para>
+          </td>
+          <td>
+           <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_tot(user))) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+  </story>
+</document>
diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
new file mode 100644
index 00000000000..2fcf35988c9
--- /dev/null
+++ b/addons/point_of_sale/report/pos_users_product.py
@@ -0,0 +1,66 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class pos_user_product(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_user_product, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'get_data':self._get_data,
+                'get_user':self._get_user,
+                'get_total':self._get_total,
+
+                })
+    def _get_data(self,o):
+        data={}
+        sql1=""" SELECT distinct(o.id) from account_bank_statement s, account_bank_statement_line l,pos_order o,pos_order_line i where  i.order_id=o.id and o.state='paid' and l.statement_id=s.id and l.pos_statement_id=o.id and s.id=%d"""%(o.id)
+        self.cr.execute(sql1)
+        data = self.cr.dictfetchall()
+        a_l=[]
+        for r in data:
+            a_l.append(r['id'])
+        a = ','.join(map(str,a_l))
+        if len(a):
+            sql2="""SELECT sum(qty) as qty,l.price_unit*sum(l.qty) as amt,t.name as name from product_product p, product_template t, pos_order_line l where order_id in (%s) and p.product_tmpl_id=t.id and l.product_id=p.id group by t.name, l.price_unit"""%(a)
+            self.cr.execute(sql2)
+            data = self.cr.dictfetchall()
+        for d in data:
+            self.total += d['amt']
+        return data
+
+    def _get_user(self,object):
+        for o in object :
+            sql = """select ru.name from account_bank_statement as abs,res_users ru
+                                    where abs.user_id = ru.id
+                                    and abs.id = %d"""%(o.id)
+            self.cr.execute(sql)
+            data = self.cr.fetchone()
+            return data[0]
+    def _get_total(self):
+        return self.total
+
+report_sxw.report_sxw('report.pos.user.product', 'account.bank.statement', 'addons/statement/report/pos_users_product.rml', parser=pos_user_product)
diff --git a/addons/point_of_sale/report/pos_users_product.py.WORK b/addons/point_of_sale/report/pos_users_product.py.WORK
new file mode 100644
index 00000000000..f26be9c7172
--- /dev/null
+++ b/addons/point_of_sale/report/pos_users_product.py.WORK
@@ -0,0 +1,71 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from report import report_sxw
+
+
+class pos_user_product(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(pos_user_product, self).__init__(cr, uid, name, context)
+        self.total = 0.0
+        self.localcontext.update({
+                'time': time,
+                'get_data':self._get_data,
+                'get_user':self._get_user,
+                'get_total':self._get_total,
+
+                })
+    def _get_data(self,object):
+        data={}
+        for o in object :
+            sql1=""" SELECT distinct(o.id) from account_bank_statement s, account_bank_statement_line l,pos_order o,pos_order_line i where  i.order_id=o.id and o.state in ('paid','invoiced') and l.statement_id=s.id and l.pos_statement_id=o.id and s.id=%d"""%(o.id)
+            print sql1
+            self.cr.execute(sql1)
+            data = self.cr.dictfetchall()
+            print "DATA",data
+            a_l=[]
+            for r in data:
+                if r['id']:
+                    a_l.append(r['id'])
+            a = ','.join(map(str,a_l))
+            print a_l, a
+            if len(a_l):
+                sql2="""SELECT sum(qty) as qty,l.price_unit*sum(l.qty) as amt,t.name as name from product_product p, product_template t, pos_order_line l where order_id in (%s) and p.product_tmpl_id=t.id and l.product_id=p.id group by t.name, l.price_unit"""%(a)
+                self.cr.execute(sql2)
+                data = self.cr.dictfetchall()
+            for d in data:
+                self.total += d['amt']
+            return data
+
+    def _get_user(self,object):
+        for o in object :
+            sql = """select ru.name from account_bank_statement as abs,res_users ru
+                                    where abs.user_id = ru.id
+                                    and abs.id = %d"""%(o.id)
+            self.cr.execute(sql)
+            data = self.cr.fetchone()
+            return data[0]
+    def _get_total(self):
+        return self.total
+
+report_sxw.report_sxw('report.pos.user.product', 'account.bank.statement', 'addons/statement/report/pos_users_product.rml', parser=pos_user_product)
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
new file mode 100644
index 00000000000..cbb309ceef2
--- /dev/null
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -0,0 +1,233 @@
+<?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="2.0" y1="57.0" width="537" 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="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="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-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="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-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"/>
+      <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="LINEAFTER" 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="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="Table_total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" 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"/>
+
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <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="6.0" spaceAfter="6.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="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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_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="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+<para style="terp_default_9">[[ repeatIn(objects,'o') ]]</para><para style="terp_default_9"><font color="white"> </font></para>
+	<para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="108.0,108.0,108.0,108.0,108.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">User</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Print Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Starting Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Ending Date</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="108.0,108.0,108.0,108.0,108.0" style="Table4">
+      <tr>
+     	 <td>
+          <para style="terp_default_Centre_8">[[  get_user(objects) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(o.date,date_time = True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(o.closing_date,date_time = True) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="396.0,70.0,70.0" style="Tableau6">
+      <tr>
+
+        <td>
+         <para style="terp_tblheader_General">Product</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Qty</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Amount</para>
+        </td>
+       </tr>
+    </blockTable>
+     <section>
+      <para style="terp_default_8">[[ repeatIn(get_data(o), 'line_ids')]]</para>
+      <blockTable colWidths="396.0,70.0,70.0" style="Tableau7">
+        <tr>
+
+          <td>
+            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ formatLang(line_ids['qty']) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['amt']) ]]</para>
+          </td>
+
+
+
+        </tr>
+      </blockTable>
+       </section>
+       <blockTable colWidths="396.0,70.0,70.0" style="Table_total">
+        <tr>
+          <td>
+            <para style="terp_default_9"><font color="white"> </font>
+          </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Total</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(get_total()) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+  </story>
+</document>
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index fa9cd428691..38d754a31af 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -1,6 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_pos_config_journal","pos.config.journal","model_pos_config_journal","point_of_sale.group_pos_user",1,0,0,0
-"access_pos_config_journal_manager","pos.config.journal","model_pos_config_journal","point_of_sale.group_pos_manager",1, 1, 1, 1
 "access_pos_order","pos.order","model_pos_order","point_of_sale.group_pos_user",1,1,1,1
 "access_pos_order_line","pos.order.line","model_pos_order_line","point_of_sale.group_pos_user",1,1,1,1
 "access_pos_payment","pos.payment","model_pos_payment","point_of_sale.group_pos_user",1,1,1,1
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 29e7bfe9b96..d70fd1caa85 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-  <data noupdate="1">
+<data noupdate="1">
 
     <record id="group_pos_manager" model="res.groups">
         <field name="name">Point of Sale / Manager</field>
@@ -8,13 +8,6 @@
     <record id="group_pos_user" model="res.groups">
         <field name="name">Point of Sale / User</field>
     </record>
-  </data>
 
-  <data>
-
-    <record id="menu_point_config" model="ir.ui.menu">
-      <field eval="[(6,0,[ref('group_pos_manager')])]" name="groups_id"/>
-    </record>
-
-  </data>
+</data>
 </openerp>
diff --git a/addons/point_of_sale/singer_statement_demo.xml b/addons/point_of_sale/singer_statement_demo.xml
new file mode 100644
index 00000000000..edc8299c609
--- /dev/null
+++ b/addons/point_of_sale/singer_statement_demo.xml
@@ -0,0 +1,335 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+
+		<record id="ir_sequence_accountjournal0" model="ir.sequence">
+			<field eval="&quot;&quot;&quot;account.journal&quot;&quot;&quot;" name="code"/>
+			<field eval="&quot;&quot;&quot;Account Journal&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="number_next"/>
+			<field eval="1" name="number_increment"/>
+			<field eval="1" name="active"/>
+		</record>
+		<record id="ir_sequence_vis0" model="ir.sequence">
+			<field eval="&quot;&quot;&quot;account.journal&quot;&quot;&quot;" name="code"/>
+			<field eval="&quot;&quot;&quot;vis&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="number_next"/>
+			<field eval="3" name="padding"/>
+			<field eval="1" name="number_increment"/>
+			<field eval="&quot;&quot;&quot;vis&quot;&quot;&quot;" name="prefix"/>
+			<field eval="1" name="active"/>
+			<field eval="&quot;&quot;&quot;001&quot;&quot;&quot;" name="suffix"/>
+		</record>
+
+		<record id="ir_sequence_tra0" model="ir.sequence">
+			<field eval="&quot;&quot;&quot;account.journal&quot;&quot;&quot;" name="code"/>
+			<field eval="&quot;&quot;&quot;tra&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="number_next"/>
+			<field eval="3" name="padding"/>
+			<field eval="1" name="number_increment"/>
+			<field eval="&quot;&quot;&quot;tra&quot;&quot;&quot;" name="prefix"/>
+			<field eval="1" name="active"/>
+			<field eval="&quot;&quot;&quot;001&quot;&quot;&quot;" name="suffix"/>
+		</record>
+
+		<record id="ir_sequence_ch0" model="ir.sequence">
+			<field eval="&quot;&quot;&quot;account.journal&quot;&quot;&quot;" name="code"/>
+			<field eval="&quot;&quot;&quot;ch&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="number_next"/>
+			<field eval="3" name="padding"/>
+			<field eval="1" name="number_increment"/>
+			<field eval="&quot;&quot;&quot;ch&quot;&quot;&quot;" name="prefix"/>
+			<field eval="1" name="active"/>
+			<field eval="&quot;&quot;&quot;001&quot;&quot;&quot;" name="suffix"/>
+		</record>
+
+		<record id="account_journal_xtransfer0" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;TRA&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_tra0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;CashBox&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+
+		<record id="account_journal_xvisa0" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;Carte de crédit&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_vis0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;x Visa&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+		<record id="account_journal_xcheque0" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;CHQ&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_ch0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;x Voucher&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+  <record id="s_product_pos" model="product.product">
+  <field name="name">CashOut</field>
+  <field name="categ_id" ref="product.cat1"/>
+  <field name="type">service</field>
+  <field name="expense_pdt">True</field>
+  <field name="list_price">0.0</field>
+  <field name="standard_price">0.0</field>
+  <field name="uom_id" ref="product.product_uom_unit"/>
+  <field name="company_id" ref="base.main_company"/>
+  <field name="uom_po_id" ref="product.product_uom_unit"/>
+  </record>
+
+  <record id="e_product_pos" model="product.product">
+  <field name="name">CashIn</field>
+  <field name="categ_id" ref="product.cat1"/>
+  <field name="type">service</field>
+  <field name="income_pdt">True</field>
+  <field name="list_price">0.0</field>
+  <field name="standard_price">0.0</field>
+  <field name="uom_id" ref="product.product_uom_unit"/>
+  <field name="company_id" ref="base.main_company"/>
+  <field name="uom_po_id" ref="product.product_uom_unit"/>
+  </record>
+    
+		<record id="account_journal_xtransfer1" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;TRA&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_tra0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="res_company_tinyshop0"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;CashBox Shop2&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+
+		<record id="account_journal_xvisa1" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;Carte de crédit&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_vis0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="res_company_tinyshop0"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;Credit Card Shop2&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+		<record id="account_journal_xcheque1" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;CHQ&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_ch0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="res_company_tinyshop0"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;Voucher Shop2&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+         <record id="sales_journal_cof" model="account.journal">
+            <field name="name">Cofinoga  Shop2</field>
+            <field name="code">COF</field>
+            <field name="type">cash</field>
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="res_company_tinyshop0"/>
+        </record>
+      <record id="sales_journal_comp" model="account.journal">
+            <field name="name">Sales Journal Shop 2</field>
+            <field name="code">SAJ</field>
+            <field name="type">sale</field>
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="res_company_tinyshop0"/>
+        </record>
+
+		<record id="account_journal_xtransfer2" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;TRA&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_tra0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="res_company_shop0"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;CashBox Shop 1&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+
+		<record id="account_journal_xvisa2" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;Carte de crédit&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_vis0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="res_company_shop0"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;Credit Card Shop1&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+		<record id="account_journal_xcheque2" model="account.journal">
+			<field eval="[(6,0,[])]" name="groups_id"/>
+			<field eval="&quot;&quot;&quot;CHQ&quot;&quot;&quot;" name="code"/>
+			<field eval="[(6,0,[])]" name="account_control_ids"/>
+			<field name="statement_sequence_id" ref="ir_sequence_ch0"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field eval="0" name="centralisation"/>
+			<field eval="0" name="group_invoice_lines"/>
+			<field name="company_id" ref="res_company_shop0"/>
+			<field eval="&quot;&quot;&quot;cash&quot;&quot;&quot;" name="type"/>
+			<field name="default_credit_account_id" ref="account.a_sale"/>
+			<field name="default_debit_account_id" ref="account.a_sale"/>
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field eval="[(6,0,[])]" name="type_control_ids"/>
+			<field name="sequence_id" ref="ir_sequence_accountjournal0"/>
+			<field eval="1" name="active"/>
+			<field eval="0" name="update_posted"/>
+			<field eval="&quot;&quot;&quot;x Voucher Shop1&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="refund_journal"/>
+			<field eval="0" name="entry_posted"/>
+		</record>
+         <record id="sales_journal_cof2" model="account.journal">
+            <field name="name">Cofinoga Shop1</field>
+            <field name="code">COF</field>
+            <field name="type">cash</field>
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+      <record id="sales_journal_comp2" model="account.journal">
+            <field name="name">Sales Journal Shop1</field>
+            <field name="code">SAJ</field>
+            <field name="type">sale</field>
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="res_company_shop0"/>
+        </record>
+
+         <record id="sales_journal_cofm" model="account.journal">
+            <field name="name">Cofinoga Central</field>
+            <field name="code">COF</field>
+            <field name="type">cash</field>
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+
+        <record id="base.main_company" model="res.company">
+            <field name="account_receivable" ref="account.a_recv"/>
+        </record>
+          <record id="point_of_sale.pos_order_posadvance" model="pos.order">
+      <field name="sale_journal" ref="sales_journal_comp2"/>
+    </record>
+
+
+        <record id="base.main_company" model="res.company">
+            <field name="account_receivable" ref="account.a_recv"/>
+        </record>
+          <record id="point_of_sale.pos_order_posadvance" model="pos.order">
+      <field name="sale_journal" ref="sales_journal_comp2"/>
+    </record>
+
+	</data>
+</openerp>
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
new file mode 100644
index 00000000000..7da96075fab
--- /dev/null
+++ b/addons/point_of_sale/statement_data.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+
+		<record id="ir_model_access_statemt" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_bank_statement"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;account.bank.statement&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="point_of_sale.res_groups_posuser0"/>
+		</record>
+
+		<record id="ir_model_access_statemtline" model="ir.model.access">
+			<field name="model_id" ref="account.model_account_bank_statement_line"/>
+			<field eval="1" name="perm_read"/>
+			<field eval="&quot;&quot;&quot;account.bank.statement.line&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="perm_unlink"/>
+			<field eval="1" name="perm_write"/>
+			<field eval="1" name="perm_create"/>
+			<field name="group_id" ref="point_of_sale.res_groups_posuser0"/>
+		</record>
+		<record id="ir_rule_group_bankstatementcompany0" model="ir.rule.group">
+			<field name="model_id" ref="account.model_account_bank_statement"/>
+			<field eval="&quot;&quot;&quot;Bank Statement company&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+
+		<record id="ir_rule_group_bankstatementlinecompany0" model="ir.rule.group">
+			<field name="model_id" ref="account.model_account_bank_statement_line"/>
+			<field eval="&quot;&quot;&quot;Bank Statement line Company&quot;&quot;&quot;" name="name"/>
+			<field eval="1" name="global"/>
+		</record>
+		<record id="point_of_sale.res_groups_posuser0" model="res.groups">
+ 		<field eval="[(6,0,[ref('product.menu_config_product'),ref('product.menu_product_category_action_form'),ref('point_of_sale.menu_point_ofsale'),ref('point_of_sale.menu_point_config'),ref('point_of_sale.menu_statement_tree_all'),ref('stock.menu_stock_root'),ref('stock.menu_action_location_form'),ref('stock.menu_action_location_tree'),ref('stock.menu_picking_waiting'),ref('stock.menu_action_picking_tree3'),ref('stock.menu_action_picking_tree5'),ref('stock.menu_action_picking_form'),ref('stock.menu_action_picking_tree7'),ref('stock.menu_action_picking_tree8'),ref('stock.menu_action_picking_tree9'),ref('mrp.menu_mrp_procurement_action3'),ref('mrp.menu_mrp_procurement_new'),ref('report_mrp.next_id_77'),ref('report_mrp.menu_report_workcenter_load'),ref('report_mrp.menu_report_in_out_picking'),ref('sale.menu_sale_root'),ref('sale.menu_action_shop_form'),ref('sale.menu_sale_order'),ref('sale.menu_action_order_tree'),ref('sale.menu_action_order_tree_all'),ref('sale.menu_action_order_tree2'),ref('sale.menu_action_order_tree3'),ref('sale.menu_action_order_tree7'),ref('sale.menu_action_order_tree8'),ref('sale.menu_action_order_line_tree1'),ref('delivery.menu_action_delivery_carrier_form'),ref('delivery.menu_action_delivery_grid_form'),ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
+			<field eval="[(6,0,[ref('ir_rule_group_bankstatementcompany0'),ref('ir_rule_group_bankstatementlinecompany0'),ref('point_of_sale.ir_rule_group_point0'),ref('point_of_sale.ir_rule_group_poslinecompany0'),ref('point_of_sale.ir_rule_group_posreporting0')])]" name="rule_groups"/>
+			<field eval="&quot;&quot;&quot;POS_user&quot;&quot;&quot;" name="name"/>
+		</record>
+	</data>
+</openerp>
diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/statement_report.xml
new file mode 100644
index 00000000000..256d0644583
--- /dev/null
+++ b/addons/point_of_sale/statement_report.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<openerp>
+	<data>
+
+		<report
+			id="pos_users_product_re"
+			string="User's Product"
+			model="account.bank.statement"
+			name="pos.user.product"
+			auto="False"
+			multi="True"
+			rml="statement/report/pos_users_product.rml"
+			 />
+
+		<report
+			id="account_statement"
+			string="Statement"
+			model="account.bank.statement"
+			name="account.statement"
+			auto="False"
+			multi="True"
+			rml="statement/report/account_statement.rml"
+			 />
+
+		<report
+			id="all_closed_cashbox_of_the_day"
+			string="All Cloded CashBOx"
+			model="account.bank.statement"
+			name="all.closed.cashbox.of.the.day"
+			auto="False"
+			multi="True"
+			menu = 'False'
+			rml="statement/report/all_closed_cashbox_of_the_day.rml"
+			 />
+		<report
+			id="pos_users_product_re"
+			string="User's Product"
+			model="account.bank.statement"
+			name="pos.user.product"
+			auto="False"
+			multi="True"
+			rml="statement/report/pos_users_product.rml"
+			 />
+
+		<report
+			id="account_statement"
+			string="Statement"
+			model="account.bank.statement"
+			name="account.statement"
+			auto="False"
+			multi="True"
+			rml="statement/report/account_statement.rml"
+			 />
+
+		<report
+			id="all_closed_cashbox_of_the_day"
+			string="All Cloded CashBOx"
+			model="account.bank.statement"
+			name="all.closed.cashbox.of.the.day"
+			auto="False"
+			multi="True"
+			menu = 'False'
+			rml="statement/report/all_closed_cashbox_of_the_day.rml"
+			 />
+
+	</data>
+</openerp>
diff --git a/addons/point_of_sale/statement_rules.xml b/addons/point_of_sale/statement_rules.xml
new file mode 100644
index 00000000000..eba649f3ec5
--- /dev/null
+++ b/addons/point_of_sale/statement_rules.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+</data>
+</openerp>
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
new file mode 100644
index 00000000000..e7e7119583d
--- /dev/null
+++ b/addons/point_of_sale/statement_view.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_account_journal_form">
+            <field name="name">Journal</field>
+            <field name="model">account.journal</field>
+            <field name="type">form</field>
+            <field name="priority">10</field>
+            <field name="inherit_id" ref="account.view_account_journal_form"/>
+            <field name="arch" type="xml">
+              <field name="invoice_sequence_id" position="after">
+                    <field  name="statement_sequence_id"/>
+                    <field  name="auto_cash"/>
+                    <field  name="check_dtls"/>
+                    <field  name="special_journal"/>
+              </field>
+            </field>
+          </record>
+
+<!-- Bank Statement -->
+
+       <record id="view_bank_statement_tree" model="ir.ui.view">
+            <field name="name">account.bank.statement.tree</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end)" string="Statement">
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <field name="balance_end"/>
+                    <field name="user_id"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_bank_statement_form2" model="ir.ui.view">
+            <field name="name">account.bank.statement.form</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Statement">
+                    <field name="name" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="company_id" select="1"/>
+                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash'),('auto_cash','=',False)]" select="1" />
+                    <newline/>
+                    <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                    <field name="closing_date" select="1" attrs="{'readonly':[('state','=','confirm')]}"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <notebook colspan="4">
+                    <page string="Starting Details">
+                    	<field name="starting_details_ids" nolabel = "1" colspan="4">
+                    		<tree string = "Starting Details" editable="bottom">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub2(pieces,number, parent.balance_end)"/>
+                        		<field name="subtotal" sum="Total"/>
+                    		</tree>
+                    		<form string = "Ending Details">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub2(pieces,number, parent.balance_end)"/>
+                        		<field name="subtotal"/>
+                    		</form>
+                    	</field>
+                    </page>
+                    <page string="Ending Details">
+                    	<field name="ending_details_ids" nolabel = "1" colspan="4">
+                    		<tree string = "Ending Details" editable="bottom">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub2(pieces,number, parent.balance_end)"/>
+                        		<field name="subtotal" sum="Total"/>
+                    		</tree>
+                    		<form string = "Ending Details">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub2(pieces,number, parent.balance_end)"/>
+                        		<field name="subtotal"/>
+                    		</form>
+                    	</field>
+                    </page>
+                        <page string="Entry encoding">
+                            <field colspan="4" name="line_ids" nolabel="1">
+                                <tree editable="bottom" string="Statement lines">
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="amount"/>
+                                </tree>
+                                <form string="Statement lines">
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="amount"/>
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <separator colspan="4" string="Notes"/>
+                                    <field colspan="4" name="note" nolabel="1"/>
+                                </form>
+                            </field>
+                        </page>
+                    </notebook>
+                    <group col="7" colspan="4">
+                        <field name="state" select="2" colspan="4"/>
+                        <field name="total_entry_encoding"/>
+                        </group>
+                        <group colspan="4">
+                        <button name="button_dummy" states="draft" string="Compute"/>
+                        <button name="button_confirm" states="open" string="Close CashBox" type="object"/>
+                        <button name="button_open" states="draft" string="Open CashBox" type="object"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" groups="base.group_extended"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_bank_statement_form1" model="ir.ui.view">
+            <field name="name">account.bank.statement.form</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Statement">
+                    <field name="name" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="company_id" select="1"/>
+                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" readonly="1"/>
+                    <newline/>
+                    <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                    <field name="closing_date" select="1" attrs="{'readonly':[('state','=','confirm')]}"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <notebook colspan="4">
+                    <page string="Details">
+                    	<field name="ending_details_ids" nolabel = "1" colspan="4">
+                    		<tree string = "Ending Details" editable="bottom">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub2(pieces,number, parent.balance_end)"/>
+                        		<field name="subtotal" sum="Total"/>
+                    		</tree>
+                    		<form string = "Ending Details">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub2(pieces,number, parent.balance_end)"/>
+                        		<field name="subtotal"/>
+                    		</form>
+                    	</field>
+                    </page>
+                        <page string="Entry encoding">
+                            <field colspan="4" name="line_ids" nolabel="1">
+                                <tree editable="bottom" string="Statement lines">
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="amount"/>
+                                </tree>
+                                <form string="Statement lines">
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="amount"/>
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <separator colspan="4" string="Notes"/>
+                                    <field colspan="4" name="note" nolabel="1"/>
+                                </form>
+                            </field>
+                        </page>
+                    </notebook>
+                    <group col="7" colspan="4">
+                        <field name="state" select="2" colspan="4"/>
+                        <field name="total_entry_encoding"/>
+                        </group>
+                        <group colspan="4">
+                        <button name="button_dummy" states="draft" string="Compute"/>
+                        <button name="button_confirm" states="open" string="Close CashBox" type="object"/>
+                        <button name="button_open" states="draft" string="Open CashBox" type="object"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" groups="base.group_extended"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_bank_statement_tree_all" model="ir.actions.act_window">
+            <field name="name">My CashBoxes</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_bank_statement_tree"/>
+            <field name="domain">[('user_id','=',uid)]</field>
+        </record>
+		<record model="ir.actions.act_window.view" id="act_statement1_all">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">tree</field>
+					<field name="view_id" ref="view_bank_statement_tree"/>
+					<field name="act_window_id" ref="action_bank_statement_tree_all"/>
+		</record>
+		<record model="ir.actions.act_window.view" id="act_statement2_all">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">form</field>
+					<field name="view_id" ref="view_bank_statement_form1"/>
+					<field name="act_window_id" ref="action_bank_statement_tree_all"/>
+		</record>
+
+       <!-- <menuitem action="action_bank_statement_tree_all" id="menu_statement_tree_all" parent="point_of_sale.menu_point_root" sequence="2"/-->
+<!--        <menuitem action="action_bank_statement_tree_all" id="menu_statement_tree_all" parent="point_of_sale.menu_point_root" sequence="2"/>
+-->
+        <menuitem name="Cashboxes" parent="point_of_sale.menu_point_root" id="menu_statement_tree_all" sequence="3"/>
+
+        <record id="action_bank_statement_tree1" model="ir.actions.act_window">
+            <field name="name">My Cashboxes to Close</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_bank_statement_tree"/>
+            <field name="domain">[('state','=','open'), ('user_id','=',uid)]</field>
+
+
+        </record>
+		<record model="ir.actions.act_window.view" id="act_statement1">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">tree</field>
+					<field name="view_id" ref="view_bank_statement_tree"/>
+					<field name="act_window_id" ref="action_bank_statement_tree1"/>
+		</record>
+		<record model="ir.actions.act_window.view" id="act_statement2">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">form</field>
+					<field name="view_id" ref="view_bank_statement_form1"/>
+					<field name="act_window_id" ref="action_bank_statement_tree1"/>
+		</record>
+
+<!--        <menuitem action="action_bank_statement_tree1" id="menu_statement_tree1" parent="menu_statement_tree_all" sequence="2"/>-->
+
+        <record id="view_bank_statement_form3" model="ir.ui.view">
+            <field name="name">account.bank.statement.form</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Statement">
+                    <field name="name" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="company_id" select="1"/>
+                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" readonly="1"/>
+                    <newline/>
+                    <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                    <field name="closing_date" select="1" attrs="{'readonly':[('state','=','confirm')]}"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <notebook colspan="4">
+                        <page string="Entry encoding">
+                            <field colspan="4" name="line_ids" nolabel="1">
+                                <tree editable="bottom" string="Statement lines">
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="amount" />
+                                </tree>
+                                <form string="Statement lines">
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="amount"/>
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <separator colspan="4" string="Notes"/>
+                                    <field colspan="4" name="note" nolabel="1"/>
+                                </form>
+                            </field>
+                        </page>
+                    <page string="Starting Details">
+                        <field name="balance_end" colspan="4" nolabel="1"/>
+                        <newline/>
+                    	<field name="starting_details_ids" nolabel = "1" colspan="4">
+                    		<tree string = "Starting Details" editable="bottom">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub(pieces,number)"/>
+                        		<field name="subtotal" sum="Total"/>
+                    		</tree>
+                    		<form string = "Starting Details">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub(pieces,number)"/>
+                        		<field name="subtotal"/>
+                    		</form>
+                    	</field>
+                    </page>
+                    <page string="Ending Details">
+                    	<field name="ending_details_ids" nolabel = "1" colspan="4">
+                    		<tree string = "Ending Details" editable="bottom">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub(pieces,number)"/>
+                        		<field name="subtotal" sum="Total"/>
+                    		</tree>
+                    		<form string = "Ending Details">
+                    			<field name="pieces"/>
+                        		<field name="number" on_change="on_change_sub(pieces,number)"/>
+                        		<field name="subtotal"/>
+                    		</form>
+                    	</field>
+                    </page>
+                    </notebook>
+                    <group col="7" colspan="4">
+                        <field name="state" select="2" colspan="4"/>
+                        <field name="total_entry_encoding"/>
+                      </group>
+                      <group colspan="4">
+                        <button name="button_dummy" states="draft" string="Compute"/>
+                        <button name="button_open" states="draft" string="Open CashBox" type="object" />
+                        <button name="button_confirm" states="open" string="Confirm" type="object" />
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" groups="base.group_extended"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+       <record id="view_bank_statement_tree2" model="ir.ui.view">
+            <field name="name">account.bank.statement.tree</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end)" string="Statement">
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <field name="balance_end"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+        <record id="action_bank_statement_treenew" model="ir.actions.act_window">
+            <field name="name">Open a CashBox</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_bank_statement_form2"/>
+            <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
+
+        </record>
+		<record model="ir.actions.act_window.view" id="act_statement12">
+					<field name="sequence" eval="2"/>
+					<field name="view_mode">tree</field>
+					<field name="view_id" ref="view_bank_statement_tree2"/>
+					<field name="act_window_id" ref="action_bank_statement_treenew"/>
+		</record>
+		<record model="ir.actions.act_window.view" id="act_statement22">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">form</field>
+					<field name="view_id" ref="view_bank_statement_form2"/>
+					<field name="act_window_id" ref="action_bank_statement_treenew"/>
+		</record>
+       <!-- <menuitem action="action_bank_statement_treenew" id="menu_statement_tree2" parent="menu_statement_tree_all" sequence="1"/>-->
+
+
+        <menuitem action="action_bank_statement_treenew" id="menu_statement_tree2" parent="menu_statement_tree_all" sequence="1"/>
+
+		<record model="ir.actions.act_window" id="action_pos_account_bank_statment">
+            <field name="name">All Cashboxes</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+        </record>
+		<record model="ir.actions.act_window.view" id="act_statement_a1">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">tree</field>
+					<field name="view_id" ref="view_bank_statement_tree"/>
+					<field name="act_window_id" ref="action_pos_account_bank_statment"/>
+		</record>
+		<record model="ir.actions.act_window.view" id="act_statement_a2">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">form</field>
+					<field name="view_id" ref="view_bank_statement_form3"/>
+					<field name="act_window_id" ref="action_pos_account_bank_statment"/>
+		</record>
+		<menuitem name="All Cashboxes" parent="menu_point_report_register"
+		 		action="action_pos_account_bank_statment" id="menu_pos_bank_statment_tree" groups="base.group_extended" sequence="4"/>
+
+		<record model="ir.actions.act_window" id="action_my_all_pos_account_bank_statment">
+            <field name="name">All My Cashboxes</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('user_id','=',uid)]</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="act_my_all_statement_a1">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">tree</field>
+					<field name="view_id" ref="view_bank_statement_tree"/>
+					<field name="act_window_id" ref="action_my_all_pos_account_bank_statment"/>
+		</record>
+
+		<record model="ir.actions.act_window.view" id="act_my_all_statement_a2">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">form</field>
+					<field name="view_id" ref="view_bank_statement_form1"/>
+					<field name="act_window_id" ref="action_my_all_pos_account_bank_statment"/>
+		</record>
+<!--		 <menuitem name="All My Cashboxes" parent="menu_statement_tree_all"-->
+<!--		 		action="action_my_all_pos_account_bank_statment" id="menu_my_pos_bank_statment_tree" sequence="3"/>-->
+
+		<record model="ir.actions.act_window" id="action_cashboxes_to_close">
+            <field name="name">Cashboxes to Close</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft')]</field>
+        </record>
+		<record model="ir.actions.act_window.view" id="act_statement_a5">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">tree</field>
+					<field name="view_id" ref="view_bank_statement_tree"/>
+					<field name="act_window_id" ref="action_cashboxes_to_close"/>
+		</record>
+		<record model="ir.actions.act_window.view" id="act_statement_a6">
+					<field name="sequence" eval="1"/>
+					<field name="view_mode">form</field>
+					<field name="view_id" ref="view_bank_statement_form1"/>
+					<field name="act_window_id" ref="action_cashboxes_to_close"/>
+		</record>
+
+		<menuitem name="Cashboxes to Close" parent="menu_pos_bank_statment_tree"
+		 		action="action_cashboxes_to_close" id="menu_cashboxes_to_close_tree" groups="base.group_extended"/>
+
+		<menuitem
+            name="Open Statements" parent="point_of_sale.menu_point_config"
+            string="Open Statements"
+            action="open_statement"
+            type="wizard"
+            id="menu_open_statement" sequence="3" />
+       <menuitem icon="STOCK_PRINT"
+       			 action="wizard_all_closed_cashbox_of_the_day"
+				 id="menu_all_closed_cashbox_of_the_day"
+				 parent="menu_statement_tree_all"
+				 type="wizard"/>
+
+		<menuitem
+            name="Close Statements" parent="point_of_sale.menu_point_config"
+            string="Close Statements"
+            action="close_statement"
+            type="wizard"
+            id="menu_close_statement" sequence="3" />
+	</data>
+</openerp>
diff --git a/addons/point_of_sale/statement_wizard.xml b/addons/point_of_sale/statement_wizard.xml
new file mode 100644
index 00000000000..f3bffb15ce1
--- /dev/null
+++ b/addons/point_of_sale/statement_wizard.xml
@@ -0,0 +1,42 @@
+<openerp>
+	<data>
+  		<wizard
+        	id="close_statement"
+        	model="account.bank.statement"
+        	menu="False"
+        	name="statement.close"
+        	string="Close Statements"/>
+		<menuitem
+            name="Close Register" parent="point_of_sale.menu_point_config"
+            string="Close Register"
+            action="close_statement"
+            type="wizard"
+            id="menu_close_statement" sequence="4" />
+  		<wizard
+        	id="open_statement"
+        	model="account.bank.statement"
+        	menu="False"
+        	name="statement.open"
+        	string="Open Register"/>
+
+		<menuitem
+            name="Open Register" parent="point_of_sale.menu_point_config"
+            string="Open Register"
+            action="open_statement"
+            type="wizard"
+            id="menu_open_statement" sequence="1" />
+
+       <wizard
+        	id="wizard_all_closed_cashbox_of_the_day"
+        	model="account.bank.statement"
+        	menu="False"
+        	name="all.closed.cashbox.of.the.day"
+        	string="All Cashboxes Of the day"/>
+
+       <menuitem icon="STOCK_PRINT"
+       			 action="wizard_all_closed_cashbox_of_the_day"
+				 id="menu_all_closed_cashbox_of_the_day"
+				 parent="menu_point_report_register"
+				 type="wizard"/>
+    </data>
+</openerp>
diff --git a/addons/point_of_sale/stock.py b/addons/point_of_sale/stock.py
index fac72107014..95630569a7c 100644
--- a/addons/point_of_sale/stock.py
+++ b/addons/point_of_sale/stock.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,31 +24,14 @@ from osv import osv, fields
 import time
 import netsvc
 
-class stock_move(osv.osv):
-    _inherit = 'stock.move'
-    
-    _columns = {
-        'pos_line_id': fields.many2one('pos.order.line',
-            'Pos Order Line', ondelete='set null', select=True,
-            readonly=True),
-    }
-    
-stock_move()
-
 
 class stock_picking(osv.osv):
 
     _inherit = 'stock.picking'
     _columns = {
         'pos_order': fields.many2one('pos.order', 'Pos order'),
+     #   'company_id':fields.many2one('res.company', 'Company', required=True),
     }
-    
-    def _get_discount_invoice(self, cursor, user, move_line):
-        if move_line.pos_line_id:
-           return move_line.pos_line_id.discount
-        return super(stock_picking, self)._get_discount_invoice(cursor, user,
-               move_line)
-
 stock_picking()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index e81e6d773f2..1ff9c124861 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,6 +28,16 @@ import wizard_confirm
 import wizard_discount
 import wizard_get_sale
 import wizard_scan_product
-
-from wizard import except_wizard
+import wizard_receipt
+import wizard_return
+import wizard_pos_payment_report
+import wizard_pos_sales_user
+import wizard_pos_sales_user_today
+import wizard_pos_payment_report_date
+import wizard_pos_payment_report_user
+import wizard_pos_sales_user_current_user
+import wizard_pos_details
+import wizard_open_statement
+import wizard_all_closed_cashbox_of_the_day
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/wizard_add_product.py b/addons/point_of_sale/wizard/wizard_add_product.py
index c6adb072df2..0daa0bdf0db 100644
--- a/addons/point_of_sale/wizard/wizard_add_product.py
+++ b/addons/point_of_sale/wizard/wizard_add_product.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/point_of_sale/wizard/wizard_all_closed_cashbox_of_the_day.py b/addons/point_of_sale/wizard/wizard_all_closed_cashbox_of_the_day.py
new file mode 100644
index 00000000000..bdb7f72cb93
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_all_closed_cashbox_of_the_day.py
@@ -0,0 +1,40 @@
+# -*- 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 pooler
+import netsvc
+import wizard
+import time
+
+
+class wizard_all_closed_cashbox_of_the_day(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'print', 'report':'all.closed.cashbox.of.the.day', 'state':'end'}
+             },
+    }
+
+wizard_all_closed_cashbox_of_the_day('all.closed.cashbox.of.the.day')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_confirm.py b/addons/point_of_sale/wizard/wizard_confirm.py
index 2e6bcaba42a..b819c840ae5 100644
--- a/addons/point_of_sale/wizard/wizard_confirm.py
+++ b/addons/point_of_sale/wizard/wizard_confirm.py
@@ -1,45 +1,75 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    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 netsvc
+import pooler
+import time
 
+_form = """<?xml version="1.0"?>
+<form string="Open Statements">
+     <label string="Are you sure you want to close your sales ?" colspan="2"/>
+</form>
+"""
+_fields = {}
 
 def _confirm(self, cr, uid, data, context):
-    wf_service = netsvc.LocalService("workflow")
+    pool = pooler.get_pool(cr.dbname)
+    company_id=pool.get('res.users').browse(cr,uid,uid).company_id
+    order_obj = pool.get('pos.order')
+    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
+        if  order_id.state =='paid':
+            order_obj.write(cr,uid,[order_id.id],{'journal_entry':True})
+            order_obj.create_account_move(cr, uid, [order_id.id], context=context)
 
+    wf_service = netsvc.LocalService("workflow")
     for i in data['ids']:
         wf_service.trg_validate(uid, 'pos.order', i, 'done', cr)
     return {}
 
-
+def _get_state(self, cr, uid, data, context):
+    action = 'invoice'
+    return action
 class pos_confirm(wizard.interface):
-    states = {
-        'init': {'actions' : [_confirm],
+
+ states = {
+        'init': {
+            'actions': [],
             'result': {
-                'type': 'state',
-                'state': 'end',
+                'type': 'form',
+                'arch': _form,
+                'fields': _fields,
+                'state': (('end', 'No','gtk-cancel'),
+                          ('open', 'Yes', 'gtk-ok', True)
+                         )
             }
         },
+        'open': {
+            'actions': [_confirm],
+            'result': {
+                       'type': 'state',
+                       'state':'end'}
+        },
     }
 
 pos_confirm('pos.confirm')
diff --git a/addons/point_of_sale/wizard/wizard_default_journal.py b/addons/point_of_sale/wizard/wizard_default_journal.py
index 337bbc734c8..bfe59251f45 100644
--- a/addons/point_of_sale/wizard/wizard_default_journal.py
+++ b/addons/point_of_sale/wizard/wizard_default_journal.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/point_of_sale/wizard/wizard_discount.py b/addons/point_of_sale/wizard/wizard_discount.py
index 05adca3a42b..035c387793c 100644
--- a/addons/point_of_sale/wizard/wizard_discount.py
+++ b/addons/point_of_sale/wizard/wizard_discount.py
@@ -1,35 +1,42 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    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 pooler
-
 import wizard
 
-
 _form = """<?xml version="1.0"?>
 <form string="Discount :">
     <field name="discount"/>
 </form>
 """
+disc_form = """<?xml version="1.0"?>
+
+<form string="Discount Notes :">
+    <label colspan="2" string="Reason For Giving Discount" align="0.0"/>
+    <newline/>
+    <field name="note" nolabel="1"/>
+</form>
+"""
+
 
 _fields = {
     'discount': {
@@ -40,19 +47,59 @@ _fields = {
     },
 }
 
-
-def apply_discount(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_ref = pool.get('pos.order')
-    order_line_ref = pool.get('pos.order.line')
-    for order in order_ref.browse(cr, uid, data['ids'], context=context):
-        order_line_ref.write(cr, uid, [line.id for line in order.lines],
-                            {'discount': data['form']['discount']},
-                            context=context,)
-    return {}
-
+disc_fields = {
+    'note': {
+        'string': 'Discount Notes',
+        'type': 'char',
+        'size': 128,
+        'required': True
+    },
+}
 
 class discount_wizard(wizard.interface):
+
+    def apply_discount(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        order_ref = pool.get('pos.order')
+        order_line_ref = pool.get('pos.order.line')
+        for order in order_ref.browse(cr, uid, data['ids'], context=context):
+            for line in order.lines :
+                company_discount = order.company_id.company_discount
+                applied_discount =data['form']['discount']
+                if applied_discount == 0.00:
+                    notice = 'No Discount'
+                elif company_discount >=  applied_discount:
+                    notice = 'Minimum Discount'
+                else:
+                    notice = data['form']['note']
+                if self.check_discount(cr, uid, data, context) == 'apply_discount':
+                    order_line_ref.write(cr, uid, [line.id],
+                            {'discount': data['form']['discount'],
+                            'price_ded':line.price_unit*line.qty*(data['form']['discount'] or 0)*0.01 or 0.0,
+                            'notice':notice
+                            },
+                            context=context,)
+                else :
+                    order_line_ref.write(cr, uid, [line.id],
+                            {'discount': data['form']['discount'],
+                            'notice': notice,
+                            'price_ded':line.price_unit*line.qty*(data['form']['discount'] or 0)*0.01 or 0.0 
+                            },
+                            context=context,)
+        return {}
+
+    def check_discount(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        order_ref = pool.get('pos.order')
+        for order in order_ref.browse(cr, uid, data['ids'], context=context):
+            company_disc = order.company_id.company_discount
+            for line in order.lines :
+                prod_disc = data['form']['discount']
+                if prod_disc <= company_disc :
+                   return 'apply_discount'
+                else :
+                    return 'disc_discount'
+
     states = {
         'init': {
             'actions': [],
@@ -60,6 +107,23 @@ class discount_wizard(wizard.interface):
                 'type': 'form',
                 'arch': _form,
                 'fields': _fields,
+                'state': (('end', 'Cancel'),
+                          ('check_disc', 'Apply Discount', 'gtk-ok', True)
+                         )
+            }
+        },
+
+        'check_disc': {
+            'actions': [],
+            'result': {'type':'choice','next_state':check_discount}
+        },
+
+        'disc_discount': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': disc_form,
+                'fields':disc_fields,
                 'state': (('end', 'Cancel'),
                           ('apply_discount', 'Apply Discount', 'gtk-ok', True)
                          )
diff --git a/addons/point_of_sale/wizard/wizard_get_sale.py b/addons/point_of_sale/wizard/wizard_get_sale.py
index ebade869d29..de686c11d49 100644
--- a/addons/point_of_sale/wizard/wizard_get_sale.py
+++ b/addons/point_of_sale/wizard/wizard_get_sale.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/point_of_sale/wizard/wizard_open_statement.py b/addons/point_of_sale/wizard/wizard_open_statement.py
new file mode 100644
index 00000000000..09205a97b08
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_open_statement.py
@@ -0,0 +1,147 @@
+# -*- 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 pooler
+import wizard
+from tools.translate import _
+import time
+
+statement_form = """<?xml version="1.0"?>
+<form string="Open Statements">
+     <label string="Are you sure you want to open the statements ?" colspan="2"/>
+</form>
+"""
+statement_form_close = """<?xml version="1.0"?>
+<form string="Close Statements">
+     <label string="Are you sure you want to close the statements ?" colspan="2"/>
+</form>
+"""
+
+statement_fields = {}
+
+def _close_statement(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    company_id=pool.get('res.users').browse(cr,uid,uid).company_id.id
+    statement_obj = pool.get('account.bank.statement')
+    singer_obj = pool.get('singer.statement')
+    journal_obj=pool.get('account.journal')
+    journal_lst=journal_obj.search(cr,uid,[('company_id','=',company_id),('auto_cash','=',True),('check_dtls','=',False)])
+    journal_ids=journal_obj.browse(cr,uid, journal_lst)
+    for journal in journal_ids:
+        ids = statement_obj.search(cr, uid, [('state','!=','confirm'),('user_id','=',uid),('journal_id','=',journal.id)])
+        statement_obj.button_confirm(cr,uid,ids)
+    return {}
+def _open_statement(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    company_id=pool.get('res.users').browse(cr,uid,uid).company_id.id
+    statement_obj = pool.get('account.bank.statement')
+    singer_obj = pool.get('singer.statement')
+    journal_obj=pool.get('account.journal')
+    journal_lst=journal_obj.search(cr,uid,[('company_id','=',company_id),('auto_cash','=',True)])
+    journal_ids=journal_obj.browse(cr,uid, journal_lst)
+    for journal in journal_ids:
+        ids = statement_obj.search(cr, uid, [('state','!=','confirm'),('user_id','=',uid),('journal_id','=',journal.id)])
+        if len(ids):
+            raise wizard.except_wizard(_('Message'),_('You can not open a Cashbox for "%s". \n Please close the cashbox related to. '%(journal.name) ))
+        sql = """ Select id from account_bank_statement
+                                where journal_id=%d
+                                and company_id =%d
+                                order by id desc limit 1"""%(journal.id,company_id)
+        singer_ids=None
+        cr.execute(sql)
+        st_id = cr.fetchone()
+        number=''
+        if journal.statement_sequence_id:
+            number = pool.get('ir.sequence').get_id(cr, uid, journal.id)
+        else:
+            number = pool.get('ir.sequence').get(cr, uid,
+                            'account.bank.statement')
+
+#        statement_id=statement_obj.create(cr,uid,{'journal_id':journal.id,
+#                                                  'company_id':company_id,
+#                                                  'user_id':uid,
+#                                                  'state':'open',
+#                                                  'name':number
+#                                                  })
+        period=statement_obj._get_period(cr,uid,context) or None
+        cr.execute("INSERT INTO account_bank_statement(journal_id,company_id,user_id,state,name, period_id,date) VALUES(%d,%d,%d,'open','%s',%d,'%s')"%(journal.id,company_id,uid,number, period, time.strftime('%Y-%m-%d %H:%M:%S')))
+        cr.commit()
+        cr.execute("select id from account_bank_statement where journal_id=%d and company_id=%d and user_id=%d and state='open' and name='%s'"%(journal.id,company_id,uid,number))
+        statement_id=cr.fetchone()[0]
+        if st_id:
+            statemt_id=statement_obj.browse(cr,uid,st_id[0])
+            if statemt_id and statemt_id.ending_details_ids:
+                statement_obj.write(cr, uid,[statement_id], {'balance_start':statemt_id.balance_end,
+                                                            'state':'open'})
+                if statemt_id.ending_details_ids:
+                    for i in statemt_id.ending_details_ids:
+                        c=singer_obj.create(cr,uid, { 'pieces':i.pieces,
+                                                    'number':i.number,
+                                                    'starting_id':statement_id,
+                            })
+        cr.commit()
+    return {}
+
+class statement_open(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': statement_form,
+                'fields': statement_fields,
+                'state': (('end', 'No','gtk-cancel'),
+                          ('open', 'Yes', 'gtk-ok', True)
+                         )
+            }
+        },
+        'open': {
+            'actions': [_open_statement],
+            'result': {
+                       'type': 'state',
+#                       'action' :_open_statement,
+                       'state':'end'}
+        },
+    }
+statement_open('statement.open')
+class statement_close(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': statement_form_close,
+                'fields': statement_fields,
+                'state': (('end', 'No','gtk-cancel'),
+                          ('open', 'Yes', 'gtk-ok', True)
+                         )
+            }
+        },
+        'open': {
+            'actions': [_close_statement],
+            'result': {
+                       'type': 'state',
+                       'state':'end'}
+        },
+    }
+statement_close('statement.close')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/wizard_pos_details.py b/addons/point_of_sale/wizard/wizard_pos_details.py
new file mode 100644
index 00000000000..80a0593c08e
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_details.py
@@ -0,0 +1,67 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+import time
+import ir
+from mx import DateTime
+import datetime
+import pooler
+from tools import config
+import wizard
+import netsvc
+
+
+pos_details_res_form= """<?xml version="1.0"?>
+<form string="Sale by User">
+     <field name="date_start" />
+     <field name="date_end" />
+</form>
+"""
+
+pos_details_res_field= {
+    'date_start': {'string':'Start Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
+    'date_end': {'string':'End Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
+
+
+}
+
+
+class wizard_pos_details(wizard.interface):
+
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'form',
+                    'arch' : pos_details_res_form,
+                    'fields' : pos_details_res_field,
+                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
+        },
+        'print_report' : {
+            'actions' : [],
+            'result' : {'type' : 'print',
+                   'report':'pos.details',
+                    'state' : 'end'}
+        },
+    }
+wizard_pos_details('pos.details')
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment.py b/addons/point_of_sale/wizard/wizard_pos_payment.py
index 30644a54d00..b184d1184be 100644
--- a/addons/point_of_sale/wizard/wizard_pos_payment.py
+++ b/addons/point_of_sale/wizard/wizard_pos_payment.py
@@ -1,21 +1,22 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,12 +24,14 @@ import pooler
 import netsvc
 import wizard
 import time
+from decimal import Decimal
 
 
 def _get_journal(self, cr, uid, context):
     pool = pooler.get_pool(cr.dbname)
     obj = pool.get('account.journal')
-    ids = obj.search(cr, uid, [('type', '=', 'cash')])
+    c=pool.get('res.users').browse(cr,uid,uid).company_id.id
+    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', c)])
     res = obj.read(cr, uid, ids, ['id', 'name'], context)
     res = [(r['id'], r['name']) for r in res]
     return res
@@ -36,67 +39,64 @@ def _get_journal(self, cr, uid, context):
 
 payment_form = """<?xml version="1.0"?>
 <form string="Add payment :">
+<group colspan="4" label="Payment">
     <field name="amount" />
     <field name="journal"/>
-    <field name="payment_id" />
     <field name="payment_date" />
-    <field name="payment_nb" />
     <field name="payment_name" />
     <field name="invoice_wanted" />
+    <field name="num_sale" />
+    <field name="is_acc" />
+    <group attrs="{'readonly':[('is_acc','=',False)]}" colspan="4" cols="2">
+    <field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]"/>
+    </group>
+    </group>
 </form>
 """
 
 payment_fields = {
     'amount': {'string': 'Amount', 'type': 'float', 'required': True},
+    'is_acc': {'string': 'Accompte', 'type': 'boolean'},
     'invoice_wanted': {'string': 'Invoice', 'type': 'boolean'},
     'journal': {'string': 'Journal',
-            'type': 'selection',
-            'selection': _get_journal,
-            'required': True,
-        },
-    'payment_id': {'string': 'Payment Term', 'type': 'many2one', 'relation': 'account.payment.term', 'required': True},
+                'type': 'selection',
+                'selection': _get_journal,
+                'required': True,
+               },
     'payment_date': {'string': 'Payment date', 'type': 'date', 'required': True},
-    'payment_name': {'string': 'Payment name', 'type': 'char', 'size': '32'},
-    'payment_nb': {'string': 'Piece number', 'type': 'char', 'size': '32'},
+    'payment_name': {'string': 'Payment name', 'type': 'char', 'size': '32', 'required':True, 'default':'Payment'},
+    'num_sale': {'string': 'Num.File', 'type': 'char', 'size': '32'},
+    'product_id': {'string':'Acompte','type': 'many2one', 'relation': 'product.product'},
     }
 
 
 def _pre_init(self, cr, uid, data, context):
-
     def _get_journal(pool, order):
         j_obj = pool.get('account.journal')
-
-        journal_to_fetch = 'DEFAULT'
-        if order.amount_total < 0:
-            journal_to_fetch = 'GIFT'
+        c = pool.get('res.users').browse(cr,uid,uid).company_id.id
+        journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', c)])
+        if journal:
+            journal = journal[0]
         else:
-            if order.amount_paid > 0:
-                journal_to_fetch = 'REBATE'
-
-        pos_config_journal = pool.get('pos.config.journal')
-        ids = pos_config_journal.search(cr, uid, [('code', '=', journal_to_fetch)])
-        objs = pos_config_journal.browse(cr, uid, ids)
-        journal = None
-        if objs:
-            journal = objs[0].journal_id.id
-        else:
-            existing = [payment.journal_id.id for payment in order.payments]
-            ids = j_obj.search(cr, uid, [('type', '=', 'cash')])
-            for i in ids:
-                if i not in existing:
-                    journal = i
-                    break
-            if not journal:
-                journal = ids[0]
-
+            journal = None
         return journal
 
+    wf_service = netsvc.LocalService("workflow")
+   # wf_service.trg_validate(uid, 'pos.order', data['id'], 'start_payment', cr)
+
     pool = pooler.get_pool(cr.dbname)
     order = pool.get('pos.order').browse(cr, uid, data['id'], context)
-
-    # get amount to pay:
+    #get amount to pay
+    #amount = Decimal(str(order.amount_total)) - Decimal(str(order.amount_paid))
     amount = order.amount_total - order.amount_paid
 
+    if amount<=0:
+        context.update({'flag':True})
+        pool.get('pos.order').action_paid(cr,uid,data['ids'],context)
+    elif order.amount_paid > 0:
+        pool.get('pos.order').write(cr, uid, data['id'],{'state':'advance'})
+
+
     # get journal:
     journal = _get_journal(pool, order)
 
@@ -113,8 +113,13 @@ def _pre_init(self, cr, uid, data, context):
 def _add_pay(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     order_obj = pool.get('pos.order')
+    jrnl_obj = pool.get('account.journal')
     result = data['form']
     invoice_wanted = data['form']['invoice_wanted']
+    jrnl_used=False
+    if data['form'] and data['form'].get('journal',False):
+        jrnl_used=jrnl_obj.browse(cr,uid,data['form']['journal'])
+
     # add 'invoice_wanted' in 'pos.order'
     order_obj.write(cr, uid, [data['id']], {'invoice_wanted': invoice_wanted})
 
@@ -122,16 +127,6 @@ def _add_pay(self, cr, uid, data, context):
     return {}
 
 
-def _validate(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    order = order_obj.browse(cr, uid, data['id'], context)
-#    if not order.amount_total:
-#       return 'receipt'
-    order_obj.test_order_lines(cr, uid, order, context=context)
-    return {}
-
-
 def _check(self, cr, uid, data, context):
     """Check the order:
     if the order is not paid: continue payment,
@@ -140,61 +135,42 @@ def _check(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     order_obj = pool.get('pos.order')
     order = order_obj.browse(cr, uid, data['id'], context)
+    amount = order.amount_total - order.amount_paid
+    if amount<=0:
+        context.update({'flag':True})
+        pool.get('pos.order').action_paid(cr,uid,data['ids'],context)
+
     action = 'ask_pay'
-    if order.state == 'paid':
+    if order_obj.test_paid(cr, uid, [data['id']]):
         if order.partner_id:
             if order.invoice_wanted:
                 action = 'invoice'
             else:
                 action = 'paid'
-        else:
+        elif order.date_payment:
             action = 'receipt'
+        else:
+            action = 'paid'
     return action
 
 
-def _test_no_line(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order = pool.get('pos.order').browse(cr, uid, data['id'], context)
-
-    if not order.lines:
-        raise wizard.except_wizard(_('Error'), _('No order lines defined for this sale.'))
-
-    if not order.lines:
-        raise wizard.except_wizard(_('Error'), _('No order lines defined for this sale.'))
-
-    return {}
-
-
 def create_invoice(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    order = order_obj.browse(cr, uid, data['id'], context)
-    if not order.invoice_id:
-        inv_id = order_obj.action_invoice(cr, uid, [data['id']])
-        #raise wizard.except_wizard(_('Error !'), _('Please create an invoice for this sale.'))
-#    wf_service = netsvc.LocalService("workflow")
-#    for i in data['ids']:
-#        wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
+    wf_service = netsvc.LocalService("workflow")
+    for i in data['ids']:
+        wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
     return {}
 
-
-def create_invoice(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    order = order_obj.browse(cr, uid, data['id'], context)
-    if not order.invoice_id:
-        inv_id = order_obj.action_invoice(cr, uid, [data['id']])
-        #raise wizard.except_wizard(_('Error !'), _('Please create an invoice for this sale.'))
-#    wf_service = netsvc.LocalService("workflow")
-#    for i in data['ids']:
-#        wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
+def _trigger_wkf(self, cr, uid, data, context):
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'pos.order', data['id'], 'payment', cr)
     return {}
 
 
+
 class pos_payment(wizard.interface):
     states = {
         'init': {
-            'actions': [_validate],
+            'actions': [],
             'result': {
                 'type': 'choice',
                 'next_state': _check,
@@ -206,8 +182,7 @@ class pos_payment(wizard.interface):
                 'type': 'form',
                 'arch': payment_form,
                 'fields': payment_fields,
-                'state': (('end', 'Cancel'), ('add_pay', 'Ma_ke payment', 'gtk-ok', True)
-                         )
+                'state': (('end', 'Cancel'), ('finish', 'Finish'), ('add_pay', 'Ma_ke payment', 'gtk-ok', True))
             }
         },
         'add_pay': {
@@ -222,7 +197,7 @@ class pos_payment(wizard.interface):
             'result': {
                 'type': 'print',
                 'report': 'pos.invoice',
-                'state': 'end'
+                'state': 'finish'
             }
         },
         'receipt': {
@@ -230,11 +205,19 @@ class pos_payment(wizard.interface):
             'result': {
                 'type': 'print',
                 'report': 'pos.receipt',
-                'state': 'end'
+                'state': 'finish'
             }
         },
         'paid': {
             'actions': [],
+            'result': {
+                'type': 'print',
+                'report': 'pos.receipt',
+                'state': 'finish'
+            }
+        },
+        'finish': {
+            'actions': [_trigger_wkf],
             'result': {
                 'type': 'state',
                 'state': 'end'
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment_report.py b/addons/point_of_sale/wizard/wizard_pos_payment_report.py
new file mode 100644
index 00000000000..1f6ed1afda5
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_payment_report.py
@@ -0,0 +1,40 @@
+# -*- 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 pooler
+import netsvc
+import wizard
+import time
+
+
+class wizard_pos_payment_report(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'print', 'report':'pos.payment.report', 'state':'end'}
+             },
+    }
+
+wizard_pos_payment_report('pos.payment.report')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment_report_date.py b/addons/point_of_sale/wizard/wizard_pos_payment_report_date.py
new file mode 100644
index 00000000000..570b6de9ad7
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_payment_report_date.py
@@ -0,0 +1,64 @@
+# -*- 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 pooler
+import netsvc
+import wizard
+import time
+
+pos_payment_report_date_form= """<?xml version="1.0"?>
+<form string="Sale by User">
+     <field name="date_start" />
+     <field name="date_end"/>
+     <field name="user_id"/>
+</form>
+"""
+
+pos_payment_report_date_field= {
+
+    'date_start': {'string':'Start Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
+    'date_end': {'string':'End Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
+    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
+}
+
+
+class wizard_pos_payment_report_date(wizard.interface):
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'form',
+                    'arch' : pos_payment_report_date_form,
+                    'fields' : pos_payment_report_date_field,
+                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
+        },
+        'print_report' : {
+            'actions' : [],
+            'result' : {'type' : 'print',
+                   'report':'pos.payment.report.date',
+                    'state' : 'end'}
+        },
+    }
+
+wizard_pos_payment_report_date('pos.payment.report.date')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_pos_payment_report_user.py b/addons/point_of_sale/wizard/wizard_pos_payment_report_user.py
new file mode 100644
index 00000000000..aaad1d328c5
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_payment_report_user.py
@@ -0,0 +1,66 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+import time
+import ir
+from mx import DateTime
+import datetime
+import pooler
+from tools import config
+import wizard
+import netsvc
+
+
+pos_payment_report_user_form= """<?xml version="1.0"?>
+<form string="Sale by User">
+     <field name="user_id" />
+
+</form>
+"""
+
+pos_payment_report_user_field= {
+
+    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
+
+}
+
+
+class wizard_pos_payment_report_user(wizard.interface):
+
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'form',
+                    'arch' : pos_payment_report_user_form,
+                    'fields' : pos_payment_report_user_field,
+                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
+        },
+        'print_report' : {
+            'actions' : [],
+            'result' : {'type' : 'print',
+                   'report':'pos.payment.report.user',
+                    'state' : 'end'}
+        },
+    }
+wizard_pos_payment_report_user('pos.payment.report.user')
diff --git a/addons/point_of_sale/wizard/wizard_pos_sales_user.py b/addons/point_of_sale/wizard/wizard_pos_sales_user.py
new file mode 100644
index 00000000000..35b83148bbd
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_sales_user.py
@@ -0,0 +1,69 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+import time
+import ir
+from mx import DateTime
+import datetime
+import pooler
+from tools import config
+import wizard
+import netsvc
+
+
+sale_forecast_res_form= """<?xml version="1.0"?>
+<form string="Sale by User">
+     <field name="date_start" />
+     <field name="date_end" />
+     <field name="user_id" />
+
+</form>
+"""
+
+sale_forecast_res_field= {
+    'date_start': {'string':'Start Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
+    'date_end': {'string':'End Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
+    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
+
+}
+
+
+class wizard_pos_sales_user(wizard.interface):
+
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'form',
+                    'arch' : sale_forecast_res_form,
+                    'fields' : sale_forecast_res_field,
+                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
+        },
+        'print_report' : {
+            'actions' : [],
+            'result' : {'type' : 'print',
+                   'report':'pos.sales.user',
+                    'state' : 'end'}
+        },
+    }
+wizard_pos_sales_user('pos.sales.user')
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/wizard_pos_sales_user_current_user.py b/addons/point_of_sale/wizard/wizard_pos_sales_user_current_user.py
new file mode 100644
index 00000000000..a76c0c97b59
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_sales_user_current_user.py
@@ -0,0 +1,40 @@
+# -*- 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 pooler
+import netsvc
+import wizard
+import time
+
+
+class wizard_pos_sales_user_today_current_user(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'print', 'report':'pos.sales.user.today.current.user', 'state':'end'}
+             },
+    }
+
+wizard_pos_sales_user_today_current_user('pos.sales.user.today.current.user')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/wizard_pos_sales_user_today.py b/addons/point_of_sale/wizard/wizard_pos_sales_user_today.py
new file mode 100644
index 00000000000..58d990ef4bc
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_pos_sales_user_today.py
@@ -0,0 +1,66 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+import time
+import ir
+from mx import DateTime
+import datetime
+import pooler
+from tools import config
+import wizard
+import netsvc
+
+
+sale_pos_res_form= """<?xml version="1.0"?>
+<form string="Sale by User">
+     <field name="user_id" />
+
+</form>
+"""
+
+sale_pos_res_field= {
+   
+    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
+
+}
+
+
+class wizard_pos_sales_user_today(wizard.interface):
+
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'form',
+                    'arch' : sale_pos_res_form,
+                    'fields' : sale_pos_res_field,
+                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
+        },
+        'print_report' : {
+            'actions' : [],
+            'result' : {'type' : 'print',
+                   'report':'pos.sales.user.today',
+                    'state' : 'end'}
+        },
+    }
+wizard_pos_sales_user_today('pos.sales.user.today')
diff --git a/addons/point_of_sale/wizard/wizard_receipt.py b/addons/point_of_sale/wizard/wizard_receipt.py
new file mode 100644
index 00000000000..64e8a2e5685
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_receipt.py
@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+#import time
+#import netsvc
+#from tools.misc import UpdateableStr
+#import pooler
+import wizard
+import pooler
+from tools.translate import _
+
+def _check(self,cr,uid,data,*a):
+    pool = pooler.get_pool(cr.dbname)
+    order_lst = pool.get('pos.order').browse(cr,uid,data['ids'])
+    for order in order_lst:
+        if order.state_2 in ('to_verify'):
+            raise wizard.except_wizard('Error!', 'Can not print the receipt because of discount and/or payment ')
+    return data
+
+class print_order_receipt(wizard.interface):
+        states = {
+          'init': {
+              'actions': [_check],
+              'result': {'type':'print', 'report':'pos.receipt', 'state':'end'}
+          }
+      }
+
+print_order_receipt('ord.receipt')
+
diff --git a/addons/point_of_sale/wizard/wizard_refund_order.py b/addons/point_of_sale/wizard/wizard_refund_order.py
index e4b9aeb5a7a..188e7b47690 100644
--- a/addons/point_of_sale/wizard/wizard_refund_order.py
+++ b/addons/point_of_sale/wizard/wizard_refund_order.py
@@ -1,93 +1,232 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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 Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU 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.
+#    GNU 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/>.     
+#    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 tools.misc import UpdateableStr
-#import pooler
+import time
+import netsvc
+from tools.misc import UpdateableStr
 import wizard
 import pooler
+from mx import DateTime
+from tools.translate import _
 
 
-warning_form = '''<?xml version="1.0"?>
-<form string="Refund ">
-<separator string="Refund order :" colspan="4"/>
+entry_form = '''<?xml version="1.0"?>
+<form string="%s">
+<separator string="Please fill these fields for entries to the box:" colspan="4"/>
 <newline/>
-<field name="date_validity"/>
+<field name="name"/>
+<field name="ref"/>
+<field name="journal_id"/>
+<field name="amount"/>
+<field name="product_id"/>
 </form>
 '''
 
-warning_fields = {
-    'date_validity': {'string': 'Validity Date', 'type': 'date'}
+def _get_journal(self,cr,uid,context):
+    pool = pooler.get_pool(cr.dbname)
+    obj = pool.get('account.journal')
+    user = pool.get('res.users').browse(cr, uid, uid)
+    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', user.company_id.id)])
+    res = obj.read(cr, uid, ids, ['id', 'name'], context)
+    res = [(r['id'], r['name']) for r in res]
+    res.insert(0, ('', ''))
+    return res
+
+def _get_pdt(self,cr,uid,context):
+    pool = pooler.get_pool(cr.dbname)
+    obj = pool.get('product.product')
+    ids = obj.search(cr, uid, [('income_pdt', '=', True)])
+    res = obj.read(cr, uid, ids, ['id', 'name'], context)
+    res = [(r['id'], r['name']) for r in res]
+    res.insert(0, ('', ''))
+    return res
+
+def _get_pdt_exp(self,cr,uid,context):
+    pool = pooler.get_pool(cr.dbname)
+    obj = pool.get('product.product')
+    company_id = pool.get('res.users').browse(cr, uid, uid).company_id.id
+    ids = obj.search(cr, uid, ['&', ('expense_pdt', '=', True), '|', ('company_id', '=', company_id), ('company_id', '=', None)])
+    res = obj.read(cr, uid, ids, ['id', 'name'], context)
+    res = [(r['id'], r['name']) for r in res]
+    res.insert(0, ('', ''))
+    return res
+
+entry_fields = {
+    'journal_id': {'string': 'Journal', 'type': 'selection', 'selection': _get_journal, 'required':True},
+    'product_id': {'string': 'Operation', 'type': 'selection', 'selection':_get_pdt , 'required':True},
+    'amount': {'string': 'Amount', 'type': 'float'},
+    'name': {'string': 'Name', 'type': 'char', 'size': '32', 'required':True},
+    'ref': {'string': 'Ref.', 'type': 'char', 'size': '32'},
+
 }
 
+out_fields = {
+    'journal_id': {'string': 'Journal', 'type': 'selection', 'selection': _get_journal, 'required':True},
+    'product_id': {'string': 'Operation', 'type': 'selection', 'selection':_get_pdt_exp , 'required':True},
+    'amount': {'string': 'Amount', 'type': 'float'},
+    'name': {'string': 'Name', 'type': 'char', 'size': '32', 'required':True},
+    'ref': {'string': 'Ref.', 'type': 'char', 'size': '32'},
+}
 
-def _get_date(self, cr, uid, data, context):
-    order_ref = pooler.get_pool(cr.dbname).get('pos.order')
-    order = order_ref.browse(cr, uid, data['id'], context)
-    return {'date_validity': order.date_validity}
+def _get_out(self, cr, uid, data, context):
+    args = {}
+    pool = pooler.get_pool(cr.dbname)
+    statement_obj= pool.get('account.bank.statement')
+    product_obj= pool.get('product.template')
+    productp_obj= pool.get('product.product')
+    res_obj = pool.get('res.users')
+    curr_company = res_obj.browse(cr,uid,uid).company_id.id
+    statement_id = statement_obj.search(cr,uid, [('journal_id','=',data['form']['journal_id']),('company_id','=',curr_company),('user_id','=',uid),('state','=','open')])
+    monday = (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Monday,0))).strftime('%Y-%m-%d')
+    sunday = (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Sunday,0))).strftime('%Y-%m-%d')
+    done_statmt = statement_obj.search(cr,uid, [('date','>=',monday+' 00:00:00'),('date','<=',sunday+' 23:59:59'),('journal_id','=',data['form']['journal_id']),('company_id','=',curr_company),('user_id','=',uid)])
+    stat_done = statement_obj.browse(cr,uid, done_statmt)
+    address_u = pool.get('res.users').browse(cr,uid,uid).address_id
+    am = 0.0
+    amount_check = productp_obj.browse(cr,uid,data['form']['product_id']).am_out or False
+    for st in stat_done:
+        for s in st.line_ids:
+            if address_u and s.partner_id==address_u.partner_id and s.am_out:
+                am+=s.amount
+    if (-data['form']['amount'] or 0.0)+ am <-(res_obj.browse(cr,uid,uid).company_id.max_diff or 0.0) and amount_check:
+        val = (res_obj.browse(cr,uid,uid).company_id.max_diff or 0.0)+ am
+        raise wizard.except_wizard(_('Error !'), _('The maximum value you can still withdraw is exceeded. \n Remaining value is equal to %d ')%(val))
 
+    acc_id = product_obj.browse(cr,uid,data['form']['product_id']).property_account_income
+    if not acc_id:
+        raise wizard.except_wizard(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr,uid,data['form']['product_id']).name))
+    if not statement_id:
+        raise wizard.except_wizard(_('Error !'), _('You have to open at least one cashbox'))
+    if statement_id:
+        statement_id = statement_id[0]
+    if not statement_id:
+        statement_id = statement_obj.create(cr,uid,{'date':time.strftime('%Y-%m-%d 00:00:00'),
+                                        'journal_id':data['form']['journal_id'],
+                                        'company_id':curr_company,
+                                        'user_id':uid,
+                                        })
+    args['statement_id']= statement_id
+    args['journal_id']= data['form']['journal_id']
+    if acc_id:
+        args['account_id']= acc_id.id
+    amount= data['form']['amount'] or 0.0
+    if data['form']['amount'] > 0:
+        amount= -data['form']['amount']
+    args['amount'] = amount
+    if productp_obj.browse(cr,uid,data['form']['product_id']).am_out:
+        args['am_out'] = True
+    args['ref'] = data['form']['ref'] or ''
+    args['name'] = "%s: %s "%(product_obj.browse(cr,uid,data['form']['product_id']).name, data['form']['name'].decode('utf8'))
+    address_u = pool.get('res.users').browse(cr,uid,uid).address_id
+    if address_u:
+        partner_id = address_u.partner_id and address_u.partner_id.id or None
+        args['partner_id'] = partner_id
+    statement_line_id = pool.get('account.bank.statement.line').create(cr, uid, args)
+    return {}
 
-def _refunding(self, cr, uid, data, context):
-    order_ref = pooler.get_pool(cr.dbname).get('pos.order')
-    clone_list = order_ref.refund(cr, uid, data['ids'], context)
+def _get_in(self, cr, uid, data, context):
+    args = {}
+    pool = pooler.get_pool(cr.dbname)
+    statement_obj = pool.get('account.bank.statement')
+    product_obj = pool.get('product.template')
+    res_obj = pool.get('res.users')
+    curr_company = res_obj.browse(cr,uid,uid).company_id.id
+    statement_id = statement_obj.search(cr,uid, [('journal_id','=',data['form']['journal_id']),('company_id','=',curr_company),('user_id','=',uid),('state','=','open')])
+    if not statement_id:
+        raise wizard.except_wizard(_('Error !'), _('You have to open at least one cashbox'))
 
-    if data['form']['date_validity']:
-        order_ref.write(cr, uid, clone_list, {
-            'date_validity': data['form']['date_validity']
-            })
+    product = pool.get('product.product').browse(cr, uid, data['form']['product_id'])
+    acc_id = product_obj.browse(cr,uid,data['form']['product_id']).property_account_income
+    if not acc_id:
+        raise wizard.except_wizard(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr,uid,data['form']['product_id']).name))
+    if statement_id:
+        statement_id = statement_id[0]
+    if not statement_id:
+        statement_id = statement_obj.create(cr,uid,{'date':time.strftime('%Y-%m-%d 00:00:00'),
+                                                    'journal_id':data['form']['journal_id'],
+                                                    'company_id':curr_company,
+                                                    'user_id':uid,
+                                                   })
 
-    return {
-        'domain': "[('id','in',["+','.join(map(str, clone_list))+"])]",
-        'name': 'Refunded Orders',
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'pos.order',
-        'view_id': False,
-        #'context': "{'journal_id':%d}" % (form['journal_id'],),
-        'type': 'ir.actions.act_window'
-    }
+    args['statement_id'] = statement_id
+    args['journal_id'] =  data['form']['journal_id']
+    if acc_id:
+        args['account_id'] =  acc_id.id
+    args['amount'] = data['form']['amount'] or 0.0
+    args['ref'] = "%s" %(data['form']['ref'] or '')
+    args['name'] = "%s: %s "% (product_obj.browse(cr,uid,data['form']['product_id']).name, data['form']['name'].decode('utf8'))
+    address_u = pool.get('res.users').browse(cr,uid,uid).address_id
+    if address_u:
+        partner_id = address_u.partner_id and address_u.partner_id.id or None
+        args['partner_id'] = partner_id
+    statement_line_id = pool.get('account.bank.statement.line').create(cr, uid, args)
 
+    return {}
 
-class refund_order(wizard.interface):
+class box_entries(wizard.interface):
     states = {
         'init': {
-            'actions': [_get_date],
+            'actions': [],
             'result': {
                 'type': 'form',
-                'arch': warning_form,
-                'fields': warning_fields,
-                'state': [('end', 'Cancel', 'gtk-no'), ('refund_n_quit', 'Ok', 'gtk-yes')]
+                'arch': entry_form % u'Entrée de caisse',
+                'fields': entry_fields,
+                'state': [('end', 'Cancel', 'gtk-cancel'), ('next', 'Make entries in the Cashbox', 'gtk-ok')]
             }
         },
-        'refund_n_quit': {
+        'next': {
             'actions': [],
             'result': {
                 'type': 'action',
-                'action': _refunding,
+                'action': _get_in,
                 'state': 'end'
             }
         },
     }
 
-refund_order('pos.refund_order')
+box_entries('pos.entry')
+
+class box_out(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {
+                'type': 'form',
+                'arch': entry_form % u'Sortie de caisse',
+                'fields': out_fields,
+                'state': [('end', 'Cancel', 'gtk-cancel'), ('next', 'Make Entries in the CashBox', 'gtk-ok')]
+            }
+        },
+        'next': {
+            'actions': [],
+            'result': {
+                'type': 'action',
+                'action': _get_out,
+                'state': 'end'
+            }
+        },
+    }
+
+box_out('pos.out')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/wizard_return.py b/addons/point_of_sale/wizard/wizard_return.py
new file mode 100644
index 00000000000..591fd00b18a
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_return.py
@@ -0,0 +1,546 @@
+# -*- 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 pooler
+from tools.misc import UpdateableStr
+
+import netsvc
+import time
+
+from tools.translate import _
+from decimal import Decimal
+
+
+arch=UpdateableStr()
+fields={}
+
+
+def _get_journal(self, cr, uid, context):
+    pool = pooler.get_pool(cr.dbname)
+    obj = pool.get('account.journal')
+    c=pool.get('res.users').browse(cr,uid,uid).company_id.id
+    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id','=',c)])
+    res = obj.read(cr, uid, ids, ['id', 'name'], context)
+    res = [(r['id'], r['name']) for r in res]
+    return res
+
+
+payment_form = """<?xml version="1.0"?>
+<form string="Add payment :">
+    <field name="amount" />
+    <field name="journal"/>
+    <field name="payment_date" />
+    <field name="payment_name" />
+    <field name="invoice_wanted" />
+    <field name="num_sale" />
+</form>
+"""
+
+payment_fields = {
+    'amount': {'string': 'Amount', 'type': 'float', 'required': True},
+    'invoice_wanted': {'string': 'Invoice', 'type': 'boolean'},
+    'journal': {'string': 'Journal',
+            'type': 'selection',
+            'selection': _get_journal,
+            'required': True,
+        },
+    'payment_date': {'string': 'Payment date', 'type': 'date', 'required': True},
+    'payment_name': {'string': 'Payment name', 'type': 'char', 'size': '32', 'required':True, 'default':'Payment'},
+    'num_sale': {'string': 'Num.Cof', 'type': 'char', 'size': '32'},
+    }
+
+
+def _pre_init(self, cr, uid, data, context):
+    def _get_journal(pool, order):
+        j_obj = pool.get('account.journal')
+
+        journal_to_fetch = 'DEFAULT'
+        if order.amount_total < 0:
+            journal_to_fetch = 'GIFT'
+        else:
+            if order.amount_paid > 0:
+                journal_to_fetch = 'REBATE'
+
+        pos_config_journal = pool.get('pos.config.journal')
+        ids = pos_config_journal.search(cr, uid, [('code', '=', journal_to_fetch)])
+        objs = pos_config_journal.browse(cr, uid, ids)
+        journal=''
+        if objs:
+            journal = objs[0].journal_id.id
+        else:
+            existing = [payment.journal_id.id for payment in order.payments]
+            ids = j_obj.search(cr, uid, [('type', '=', 'cash')])
+            for i in ids:
+                if i not in existing:
+                    journal = i
+                    break
+            if not journal:
+                journal = ids and ids[0]
+        return journal
+    pool = pooler.get_pool(cr.dbname)
+    order = pool.get('pos.order').browse(cr, uid, data['id'], context)
+    # get amount to pay:
+#    amount = Decimal(str(order.amount_total)) - Decimal(str(order.amount_paid))
+    amount = order.amount_total - order.amount_paid
+    if amount <= 0:
+        pool.get('pos.order').action_paid(cr, uid, data['ids'], context)
+
+    # get journal:
+    journal = _get_journal(pool, order)
+
+    # check if an invoice is wanted:
+    #invoice_wanted_checked = not not order.partner_id # not not -> boolean
+    invoice_wanted_checked = False
+
+    # select the current date
+    current_date = time.strftime('%Y-%m-%d')
+
+    return {'journal': journal, 'amount': amount, 'invoice_wanted': invoice_wanted_checked, 'payment_date': current_date}
+
+
+def _add_pay(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    jrnl_obj = pool.get('account.journal')
+    result = data['form']
+    invoice_wanted = data['form']['invoice_wanted']
+    jrnl_used=False
+    if data['form'] and data['form'].get('journal',False):
+        jrnl_used=jrnl_obj.browse(cr,uid,data['form']['journal'])
+
+    # add 'invoice_wanted' in 'pos.order'
+    order_obj.write(cr, uid, [data['id']], {'invoice_wanted': invoice_wanted})
+
+    order_obj.add_payment(cr, uid, data['id'], result, context=context)
+    return {}
+
+
+def _check(self, cr, uid, data, context):
+    """Check the order:
+    if the order is not paid: continue payment,
+    if the order is paid print invoice (if wanted) or ticket.
+    """
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    order = order_obj.browse(cr, uid, data['id'], context)
+    order_obj.test_order_lines(cr, uid, order, context=context)
+
+    action = 'ask_pay'
+    if order.state == 'paid':
+        if order.partner_id:
+            if order.invoice_wanted:
+                action = 'invoice'
+            else:
+                action = 'paid'
+        elif order.date_payment:
+            action = 'receipt'
+        else:
+            action='paid'
+
+    if order.amount_total == order.amount_paid:
+        order_obj.write(cr,uid,data['ids'],{'state':'done'})
+        action = 'receipt'
+
+    return action
+
+
+def create_invoice(self, cr, uid, data, context):
+    wf_service = netsvc.LocalService("workflow")
+    for i in data['ids']:
+        wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
+    return {}
+
+
+
+_form = """<?xml version="1.0"?>
+<form string="Add product :">
+<field name="product"/>
+<field name="quantity"/>
+</form>
+"""
+_fields = {
+    'product': {
+        'string': 'Product',
+        'type': 'many2one',
+        'relation': 'product.product',
+        'required': True,
+        'default': False
+    },
+
+    'quantity': {
+        'string': 'Quantity',
+        'type': 'integer',
+        'required': True,
+        'default': 1},
+    }
+
+def make_default(val):
+    def fct(obj, cr, uid):
+        return val
+    return fct
+
+def _get_returns(self, cr, uid, data, context):
+
+    pool = pooler.get_pool(cr.dbname)
+    order_obj=pool.get('pos.order')
+    order=order_obj.browse(cr, uid, [data['id']])[0]
+    res={}
+    fields.clear()
+    arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Quantities you enter, match to products that will return to the stock.')]
+    for m in [line for line in order.lines]:
+        quantity=m.qty
+        arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
+        fields['return%s' % m.id]={'string':m.product_id.name, 'type':'float', 'required':True, 'default':quantity}
+        res.setdefault('returns', []).append(m.id)
+    arch_lst.append('</form>')
+    arch.string='\n'.join(arch_lst)
+    return res
+
+def _create_returns(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    lines_obj = pool.get('pos.order.line')
+    picking_obj = pool.get('stock.picking')
+    stock_move_obj = pool.get('stock.move')
+    move_obj = pool.get('stock.move')
+    picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', data['ids']), ('state', '=', 'done')])
+    clone_list = []
+    date_cur=time.strftime('%Y-%m-%d')
+    uom_obj = pool.get('product.uom')
+    wf_service = netsvc.LocalService("workflow")
+    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
+        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
+        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
+        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+        res=cr.fetchone()
+        location_id=res and res[0] or None
+        stock_dest_id = int(val.split(',')[1])
+
+        order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
+        if order_id.invoice_id:
+            pool.get('account.invoice').refund(cr, uid, [order_id.invoice_id.id],time.strftime('%Y-%m-%d'), False, order_id.name)
+        new_picking=picking_obj.create(cr,uid,{
+                                'name':'%s (return)' %order_id.name,
+                                'move_lines':[], 'state':'draft',
+                                'type':'in',
+                                'date':date_cur,   })
+        for line in order_id.lines:
+            for r in data['form'].get('returns',[]):
+                if line.id==r and (data['form']['return%s' %r]!=0.0):
+                    new_move=stock_move_obj.create(cr, uid,{
+                        'product_qty': data['form']['return%s' %r],
+                        'product_uos_qty': uom_obj._compute_qty(cr, uid,data['form']['return%s' %r] ,line.product_id.uom_id.id),
+                        'picking_id':new_picking,
+                        'product_uom':line.product_id.uom_id.id,
+                        'location_id':location_id,
+                        'product_id':line.product_id.id,
+                        'location_dest_id':stock_dest_id,
+                        'name':'%s (return)' %order_id.name,
+                        'date':date_cur,
+                        'date_planned':date_cur,})
+                    lines_obj.write(cr,uid,[line.id],{'qty_rfd':(line.qty or 0.0) + data['form']['return%s' %r],
+                                                    'qty':line.qty-(data['form']['return%s' %r] or 0.0)
+                    })
+        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+        picking_obj.force_assign(cr, uid, [new_picking], context)
+    return res
+
+def _create_returns2(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    line_obj = pool.get('pos.order.line')
+    picking_obj = pool.get('stock.picking')
+    stock_move_obj = pool.get('stock.move')
+    picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', data['ids']), ('state', '=', 'done')])
+    clone_list = []
+    date_cur=time.strftime('%Y-%m-%d')
+    uom_obj = pool.get('product.uom')
+    wf_service = netsvc.LocalService("workflow")
+    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
+        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
+        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
+        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+        res=cr.fetchone()
+        location_id=res and res[0] or None
+        stock_dest_id = int(val.split(',')[1])
+
+        new_picking=picking_obj.copy(cr, uid, order_id.last_out_picking.id, {'name':'%s (return)' % order_id.name,
+                                                                            'move_lines':[], 'state':'draft', 'type':'in',
+                                                                            'type':'in',
+                                                                            'date':date_cur,   })
+        new_order=order_obj.copy(cr,uid,order_id.id, {'name': 'Refund %s'%order_id.name,
+                                                      'lines':[],
+                                                      'statement_ids':[],
+                                                      'last_out_picking':[]})
+        for line in order_id.lines:
+            for r in data['form'].get('returns',[]):
+                if line.id==r and (data['form']['return%s' %r]!=0.0):
+                    new_move=stock_move_obj.create(cr, uid,{
+                        'product_qty': data['form']['return%s' %r],
+                        'product_uos_qty': uom_obj._compute_qty(cr, uid,data['form']['return%s' %r] ,line.product_id.uom_id.id),
+                        'picking_id':new_picking,
+                        'product_uom':line.product_id.uom_id.id,
+                        'location_id':location_id,
+                        'product_id':line.product_id.id,
+                        'location_dest_id':stock_dest_id,
+                        'name':'%s (return)' %order_id.name,
+                        'date':date_cur,
+                        'date_planned':date_cur,})
+                    line_obj.copy(cr,uid,line.id,{'qty':-data['form']['return%s' %r],
+                                                'order_id': new_order,
+                    })
+        order_obj.write(cr,uid, new_order, {'state':'done'})
+        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+        picking_obj.force_assign(cr, uid, [new_picking], context)
+    act = {
+        'domain': "[('id', 'in', ["+str(new_order)+"])]",
+        'name': 'Refunded Orders',
+        'view_type': 'form',
+        'view_mode': 'form,tree',
+        'res_model': 'pos.order',
+        'auto_refresh':0,
+        'res_id':new_order,
+        'view_id': False,
+        'type': 'ir.actions.act_window'
+    }
+    return act
+def test(self,cr,uid,data,context={}):
+  #  import pdb; pdb.set_trace()
+    data['id']=data['res_id']
+    return {'id':data['res_id']}
+
+#def _raise(self,cr,uid,data,context={}):
+#    return datas
+#    raise wizard.except_wizard(_('Message'),_('You can not exchange products more than total paid amount.'))
+
+
+#def _test_exist1(self,cr,uid,data,context={}):
+#    return 'choice'
+
+def _test_exist(self,cr,uid,data,context={}):
+#    order_obj= pooler.get_pool(cr.dbname).get('pos.order')
+#    order_line_obj= pooler.get_pool(cr.dbname).get('pos.order.line')
+#    obj=order_obj.browse(cr,uid, data['ids'])[0]
+#    am_tot=obj._amount_total(cr, uid, data['ids'])
+#    order_obj.write(cr,uid,data['ids'],{'state':'done'})
+#    if obj.amount_total == obj.amount_paid:
+#        return 'receipt'
+#    elif obj.amount_total > obj.amount_paid:
+#        sql = """select max(id) from pos_order_line where order_id = %d """%(obj.id)
+#        cr.execute(sql)
+#        res = cr.fetchone()
+#        cr.execute("delete from pos_order_line where id = %d"%(res[0]))
+#        cr.commit()
+#        return 'choice_raise'
+#    else:
+    return 'add_p'
+
+def _close(self,cr,uid,data,context={}):
+    order_obj= pooler.get_pool(cr.dbname).get('pos.order')
+    order_line_obj= pooler.get_pool(cr.dbname).get('pos.order.line')
+    obj=order_obj.browse(cr,uid, data['ids'])[0]
+    order_obj.write(cr,uid,data['ids'],{'state':'done'})
+    if obj.amount_total != obj.amount_paid:
+        return 'ask_pay'
+    else :
+        return 'receipt'
+
+
+
+
+def _add_pdct(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    line_obj = pool.get('pos.order.line')
+    picking_obj = pool.get('stock.picking')
+    wf_service = netsvc.LocalService("workflow")
+    prod_obj = pool.get('product.product')
+    stock_move_obj = pool.get('stock.move')
+    uom_obj = pool.get('product.uom')
+    date_cur=time.strftime('%Y-%m-%d')
+    order_obj.add_product(cr, uid, data['id'], data['form']['product'],
+                            data['form']['quantity'], context=context)
+    cr.commit()
+    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
+        prod=data['form']['product']
+        qty=data['form']['quantity']
+        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
+        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
+        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+        res=cr.fetchone()
+        location_id=res and res[0] or None
+        stock_dest_id = int(val.split(',')[1])
+
+        prod_id=prod_obj.browse(cr,uid,prod)
+        new_picking=picking_obj.create(cr,uid,{
+                                'name':'%s (Added)' %order_id.name,
+                                'move_lines':[],
+                                'state':'draft',
+                                'type':'out',
+                                'date':date_cur,   })
+        new_move=stock_move_obj.create(cr, uid,{
+                        'product_qty': qty,
+                        'product_uos_qty': uom_obj._compute_qty(cr, uid,prod_id.uom_id.id, qty, prod_id.uom_id.id),
+                        'picking_id':new_picking,
+                        'product_uom':prod_id.uom_id.id,
+                        'location_id':location_id,
+                        'product_id':prod_id.id,
+                        'location_dest_id':stock_dest_id,
+                        'name':'%s (return)' %order_id.name,
+                        'date':date_cur,
+                        'date_planned':date_cur,})
+
+        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+        picking_obj.force_assign(cr, uid, [new_picking], context)
+       # order_obj.write(cr,uid,data['id'],{'state':'done','last_out_picking':new_picking})
+        order_obj.write(cr,uid,data['id'],{'last_out_picking':new_picking})
+    return {}
+
+
+
+
+class wizard_return_picking(wizard.interface):
+    states={
+        'init':{
+            'actions':[_get_returns],
+            'result':{'type':'form',
+                    'arch':arch,
+                    'fields':fields,
+                    'state':[('end','Cancel', 'gtk-cancel'),('return','Return goods and Exchange', 'gtk-ok'),('return_w','Return without Refund','gtk-ok')]
+                    }
+        },
+        'return':{
+            'actions':[],
+            'result':{ 'type': 'action',
+                       'action' : _create_returns,
+                       'state':'prod'}
+        },
+        'prod':{
+            'actions':[],
+            'result': {
+                'type': 'form',
+                'arch': _form,
+                'fields':_fields,
+                'state': [('close','Close'),('choice','Continue')]
+            }
+        },
+#        'choice1' : {
+#            'actions' : [_add_pdct],
+#            'result' : {'type' : 'choice', 'next_state': _test_exist1 }
+#        },
+        'choice' : {
+            'actions' : [],
+            'result' : {'type' : 'choice', 'next_state': _test_exist }
+        },
+#        'choice_raise':{
+#                        'actions':[],
+#            'result':{ 'type': 'action',
+#                       'action' : _raise,
+#                       'state':'end'}
+#        },
+        'add_p' :{
+            'actions':[],
+            'result':{
+            'type':'action',
+            'action': _add_pdct,
+            'state': 'prod'}
+        },
+#        'add_pp' :{
+#            'actions':[],
+#            'result':{
+#            'type':'action',
+#            'action': _add_pdct,
+#            'state': 'end'}
+#        },
+        'receipt':{
+            'result': {
+                'type': 'print',
+                'report': 'pos.receipt',
+                'state': 'end'
+            }
+        },
+        'return_w':{
+            'actions':[],
+            'result':{'type':'action', 'action':_create_returns2, 'state':'end'}
+        },
+
+        'close':{
+            'actions' : [],
+            'result' : {'type' : 'choice', 'next_state': _close }
+        },
+
+       'check': {
+            'actions': [],
+            'result': {
+                'type': 'choice',
+                'next_state': _check,
+            }
+        },
+
+        'ask_pay': {
+            'actions': [_pre_init],
+            'result': {
+                'type': 'form',
+                'arch': payment_form,
+                'fields': payment_fields,
+                'state': (('end', 'Cancel'), ('add_pay', 'Ma_ke payment', 'gtk-ok', True)
+                         )
+            }
+        },
+        'add_pay': {
+            'actions': [_add_pay],
+            'result': {
+                'type': 'state',
+                'state': "check",
+            }
+        },
+
+
+        'invoice': {
+            'actions': [create_invoice],
+            'result': {
+                'type': 'print',
+                'report': 'pos.invoice',
+                'state': 'end'
+            }
+        },
+        'receipt': {
+            'actions': [],
+            'result': {
+                'type': 'print',
+                'report': 'pos.receipt',
+                'state': 'end'
+            }
+        },
+        'paid': {
+            'actions': [],
+            'result': {
+                'type': 'state',
+                'state': 'end'
+            }
+        },
+
+    }
+wizard_return_picking('pos.return.picking')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/process/__init__.py b/addons/process/__init__.py
index 71d5660db4a..d2169ef4a36 100644
--- a/addons/process/__init__.py
+++ b/addons/process/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py
index a5caea5e0d5..88c15e59059 100644
--- a/addons/process/__terp__.py
+++ b/addons/process/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/process/process.py b/addons/process/process.py
index 23f54e54168..94f3a46d779 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product/__init__.py b/addons/product/__init__.py
index 3f95fcb1900..e5f930e8c2f 100644
--- a/addons/product/__init__.py
+++ b/addons/product/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py
index 3069a901577..7b508d7440f 100644
--- a/addons/product/__terp__.py
+++ b/addons/product/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product/_common.py b/addons/product/_common.py
index 74a6ce943cf..f5f53fe8689 100644
--- a/addons/product/_common.py
+++ b/addons/product/_common.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index aaa1dcef76f..4803a5a1d7e 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\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 11:11+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-23 16:46+0000\n"
+"Last-Translator: Sebastien LANGE - http://www.Syleam.fr <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: 2009-12-16 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-01-24 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -105,11 +105,11 @@ msgstr "Intervention senior sur site"
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid ""
-"The minimal quantity to purchase for this supplier, expressed in the purchase "
+"The minimal quantity to purchase for this supplier, expressed in the default "
 "unit of measure."
 msgstr ""
 "La quantité minimum d'achat pour ce fournisseur, exprimée dans l'unité de "
-"mesure d'achat"
+"mesure par défaut"
 
 #. module: product
 #: field:product.template,weight_net:0
@@ -213,7 +213,7 @@ msgstr "Société"
 #. module: product
 #: field:product.template,rental:0
 msgid "Rentable Product"
-msgstr "Produit Rentable"
+msgstr "Peut être loué"
 
 #. module: product
 #: field:product.product,lst_price:0
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index 1f17de3d8c0..00d25a8f20d 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/i18n/hu.po
@@ -7,24 +7,24 @@ 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-09-16 16:32+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-23 00:08+0000\n"
+"Last-Translator: Balint (eSolve) <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: 2009-12-16 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-01-24 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Max. Margin"
-msgstr "Maximum margó"
+msgstr "Max. árrés"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Base Price"
-msgstr ""
+msgstr "Alapár"
 
 #. module: product
 #: help:product.template,standard_price:0
@@ -36,7 +36,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,type:0
 msgid "Service"
-msgstr ""
+msgstr "Szolgáltatás"
 
 #. module: product
 #: help:product.template,purchase_ok:0
@@ -44,11 +44,12 @@ msgid ""
 "Determine if the product is visible in the list of products within a "
 "selection from a purchase order line."
 msgstr ""
+"Meghatározza, hogy a termék választható-e beszerzési rendelések készítésénél."
 
 #. module: product
 #: help:product.supplierinfo,name:0
 msgid "Supplier of this product"
-msgstr ""
+msgstr "Termék szállítója"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -65,12 +66,12 @@ msgstr ""
 msgid ""
 "The minimal quantity to purchase for this supplier, expressed in the default "
 "unit of measure."
-msgstr ""
+msgstr "Minimális beszerzési mennyiség, alap mértékegységben kifejezve"
 
 #. module: product
 #: field:product.template,weight_net:0
 msgid "Net weight"
-msgstr ""
+msgstr "Nettó súly"
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -90,7 +91,7 @@ msgstr ""
 #. module: product
 #: field:product.packaging,width:0
 msgid "Width"
-msgstr ""
+msgstr "Szélesség"
 
 #. module: product
 #: help:product.pricelist.item,product_tmpl_id:0
@@ -98,11 +99,13 @@ msgid ""
 "Set a template if this rule only apply to a template of product. Keep empty "
 "for all products"
 msgstr ""
+"Ha kiválaszt egy sablont, a szabály csak arra fog vonatkozni. Hagyja üresen "
+"ha nem kívánja korlátozni."
 
 #. module: product
 #: field:product.template,procure_method:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Ellátás módja"
 
 #. module: product
 #: constraint:ir.actions.act_window:0
@@ -127,7 +130,7 @@ msgstr ""
 #. module: product
 #: help:product.packaging,height:0
 msgid "The height of the package"
-msgstr ""
+msgstr "Csomag magassága"
 
 #. module: product
 #: view:product.pricelist:0
@@ -137,7 +140,7 @@ msgstr ""
 #. module: product
 #: model:product.category,name:product.cat1
 msgid "Sellable"
-msgstr ""
+msgstr "Értékesíthető"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -147,7 +150,7 @@ msgstr ""
 #. module: product
 #: field:product.price.type,name:0
 msgid "Price Name"
-msgstr ""
+msgstr "Ár neve"
 
 #. module: product
 #: field:product.product,price:0
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index 834f6089932..3f35a75ca5c 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/i18n/pt.po
@@ -7,19 +7,19 @@ 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-08 00:53+0000\n"
+"PO-Revision-Date: 2010-01-22 00:10+0000\n"
 "Last-Translator: Paulino <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: 2009-12-16 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-01-23 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Max. Margin"
-msgstr "Margem Máxima"
+msgstr "Margem máxima"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -32,6 +32,8 @@ msgid ""
 "The cost of the product for accounting stock valuation. It can serves as a "
 "base price for supplier price."
 msgstr ""
+"O custo do artigo para valorização contabilística do stock. Pode servir como "
+"base do preço de fornecedor."
 
 #. module: product
 #: selection:product.template,type:0
@@ -44,13 +46,13 @@ msgid ""
 "Determine if the product is visible in the list of products within a "
 "selection from a purchase order line."
 msgstr ""
-"Determina se o produto é visível na lista de produtos dentro da selecção da "
-"linha de ordem de compra."
+"Determina se o artigo é visível na lista de artigos dentro duma selecção a "
+"partir de uma linha de ordem de compra."
 
 #. module: product
 #: help:product.supplierinfo,name:0
 msgid "Supplier of this product"
-msgstr "Fornecedor do produto"
+msgstr "Fornecedor do artigo"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -60,7 +62,7 @@ msgstr "DDR 512MB PC400"
 #. module: product
 #: model:product.template,name:product.product_product_0_product_template
 msgid "Onsite Senior Intervention"
-msgstr "Intervenção Senior no Sítio"
+msgstr "Intervenção sénior no local"
 
 #. module: product
 #: help:product.supplierinfo,qty:0
@@ -69,7 +71,7 @@ msgid ""
 "unit of measure."
 msgstr ""
 "A quantidade mínima de encomenda para esse fornecedor expressa na unidade de "
-"medida por defeito"
+"medida pré-definida"
 
 #. module: product
 #: field:product.template,weight_net:0
@@ -82,8 +84,8 @@ msgid ""
 "Quantities of products that are planned to arrive in selected locations or "
 "all internal if none have been selected."
 msgstr ""
-"Quantidades dos produtos que está planeado chegarem aos locais seleccionados "
-"(ou todos, se nenhum tiver sido escolhido)"
+"Quantidades de artigos planeada para chegar aos locais seleccionados ou "
+"todos, se nenhum foi indicado."
 
 #. module: product
 #: help:product.product,virtual_available:0
@@ -92,6 +94,9 @@ msgid ""
 "internal if none have been selected. Computed as: Real Stock - Outgoing + "
 "Incoming."
 msgstr ""
+"Saldo futuro para este artigo de acordo com a localização seleccionada ou "
+"todas se nenhuma for seleccionada. Calculado como: Saldo Real  - Saídas + "
+"entradas."
 
 #. module: product
 #: field:product.packaging,width:0
@@ -104,11 +109,13 @@ msgid ""
 "Set a template if this rule only apply to a template of product. Keep empty "
 "for all products"
 msgstr ""
+"Especifique um modelo de artigos se esta regra aplica-se apenas a um modelo. "
+"Deixe vazio para aplicar a todos os artigos."
 
 #. module: product
 #: field:product.template,procure_method:0
 msgid "Procure Method"
-msgstr "Método de Aquisição"
+msgstr "Método de aprovisionamento."
 
 #. module: product
 #: constraint:ir.actions.act_window:0
@@ -118,17 +125,17 @@ msgstr "Nome de modelo inválido na definição da acção"
 #. module: product
 #: model:process.process,name:product.process_process_productprocess0
 msgid "Product Process"
-msgstr "Processo do produto"
+msgstr "Processo de artigos"
 
 #. module: product
 #: help:product.price.type,field:0
 msgid "Associated field in the product form."
-msgstr "Campo associado no formulário do produto"
+msgstr "Campo associado no formulário do artigo"
 
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Standard Price"
-msgstr "Preço Standard"
+msgstr "Preço padrão"
 
 #. module: product
 #: help:product.packaging,height:0
@@ -138,7 +145,7 @@ msgstr "Altura da embalagem"
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price List"
-msgstr "Lista de preços de produtos"
+msgstr "Lista de preços dos artigos"
 
 #. module: product
 #: model:product.category,name:product.cat1
@@ -168,7 +175,7 @@ msgstr "Empresa"
 #. module: product
 #: field:product.template,rental:0
 msgid "Rentable Product"
-msgstr ""
+msgstr "Artigo alugável"
 
 #. module: product
 #: field:product.product,lst_price:0
@@ -184,7 +191,7 @@ msgstr "Tipos de preços"
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr "Produto estocável"
+msgstr "Artigo armazenável"
 
 #. module: product
 #: model:product.category,name:product.product_category_services
@@ -218,7 +225,7 @@ msgstr "Nome desse tipo de preço"
 #. module: product
 #: help:product.pricelist.version,date_start:0
 msgid "Starting date for this pricelist version to be valid."
-msgstr ""
+msgstr "Data de início da validade desta versão da lista de preços."
 
 #. module: product
 #: field:product.product,incoming_qty:0
@@ -248,17 +255,17 @@ msgid ""
 "type. Purchase will trigger purchase orders when requested."
 msgstr ""
 "Produzir gerará a ordem de produção ou tarefas, de acordo com o tipo de "
-"produto. A compra activará ordens de compra quando pedida."
+"artigo. A compra activará ordens de compra quando solicitado."
 
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
 msgid "You can see the list of suppliers for that product."
-msgstr ""
+msgstr "Pode ver a lista de fornecedores para esse artigo."
 
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layer on a palet or box"
-msgstr ""
+msgstr "Número de camadas numa palete ou caixa"
 
 #. module: product
 #: model:product.pricelist.type,name:product.pricelist_type_sale
@@ -278,7 +285,7 @@ msgstr "Se outra lista de preços"
 #: model:ir.ui.menu,name:product.menu_products
 #: view:product.product:0
 msgid "Products"
-msgstr "Produtos"
+msgstr "Artigos"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -315,8 +322,8 @@ msgid ""
 "Set a product if this rule only apply to one product. Keep empty for all "
 "products"
 msgstr ""
-"Selecionar um produto se essa regra se aplica apenas a um produto. Deixar "
-"vazio para todos os produtos."
+"Indicar um artigo se essa regra se aplica apenas a um artigo. Deixar vazio "
+"para todos os artigos."
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_type
@@ -349,7 +356,7 @@ msgstr "Configuração"
 #. module: product
 #: field:product.packaging,rows:0
 msgid "Number of Layer"
-msgstr ""
+msgstr "Número de camadas"
 
 #. module: product
 #: constraint:product.category:0
@@ -375,7 +382,7 @@ msgstr "Lista de preços de fornecedores"
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Pallet Dimension"
-msgstr ""
+msgstr "Dimensão da palete"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -409,6 +416,9 @@ msgid ""
 "at the end of the year), Average Price: the cost price is recomputed at each "
 "reception of products."
 msgstr ""
+"Preço Padrão: o preço de custo é fixado e recalculado periodicamente "
+"(geralmente no final do ano); Preço Médio: o preço de custo é recalculado a "
+"cada recepção de artigos."
 
 #. module: product
 #: field:product.pricelist,name:0
@@ -428,7 +438,7 @@ msgstr "Preço Médio"
 #. module: product
 #: model:process.node,note:product.process_node_product0
 msgid "Create new Product"
-msgstr "Criar um novo Produto"
+msgstr "Cria um novo artigo"
 
 #. module: product
 #: help:product.pricelist.item,name:0
@@ -458,7 +468,7 @@ msgstr "Em produção"
 #. module: product
 #: field:product.category,child_id:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Categorias dependentes"
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
@@ -510,7 +520,7 @@ msgstr "UdM"
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
 msgid "PCE"
-msgstr ""
+msgstr "PCE"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action2
@@ -522,7 +532,7 @@ msgstr "Listas de preços"
 #. module: product
 #: field:product.supplierinfo,product_name:0
 msgid "Partner Product Name"
-msgstr "Designação do produto do parceiro"
+msgstr "Nome do artigo no parceiro"
 
 #. module: product
 #: view:product.product:0
@@ -533,7 +543,7 @@ msgstr "Miscelânea"
 #. module: product
 #: help:product.pricelist.item,base:0
 msgid "The mode for computing the price for this rule."
-msgstr ""
+msgstr "O modo de cálculo do preço para esta regra."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -566,8 +576,8 @@ msgid ""
 "is used by the scheduler to order requests based on reordering delays."
 msgstr ""
 "Este é o atraso médio nos dias entre a confirmação do pedido de compra e a "
-"recepção dos bens deste produto e para o fornecedor por defeito. É usado "
-"pelo agendador para requisitar os pedidos baseados em pedidos em atrasos."
+"recepção dos bens deste artigo e para o fornecedor pré-definido. É usado "
+"pelo agendador para emitir pedidos baseado em reordenar atrasos."
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -577,7 +587,7 @@ msgstr "Tempo de produção no fornecedor"
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
 msgid "Default Public Pricelist Version"
-msgstr ""
+msgstr "Versão pública pré-definida da lista de preços"
 
 #. module: product
 #: field:product.pricelist.type,key:0
@@ -622,7 +632,7 @@ msgstr "A moeda do campo está em"
 #. module: product
 #: help:product.template,weight:0
 msgid "The gross weight in Kg."
-msgstr ""
+msgstr "Peso bruto em Kg."
 
 #. module: product
 #: selection:product.ul,type:0
@@ -640,8 +650,8 @@ msgid ""
 "Determine if the product can be visible in the list of product within a "
 "selection from a sale order line."
 msgstr ""
-"Determina se um produto pode ser visível na lista de produção dentro de uma "
-"selecção da linha de ordem de venda."
+"Determina se um artigo pode ser visível na lista de artigos numa selecção a "
+"partir de uma linha de ordem de venda."
 
 #. module: product
 #: constraint:product.template:0
@@ -673,11 +683,13 @@ msgid ""
 "Quantities of products that are planned to leave in selected locations or "
 "all internal if none have been selected."
 msgstr ""
+"As quantidades de artigos que estão programadas para sair em locais "
+"seleccionados ou todos se nenhum  for seleccionado."
 
 #. module: product
 #: field:product.packaging,weight:0
 msgid "Total Package Weight"
-msgstr ""
+msgstr "Peso total da embalagem"
 
 #. module: product
 #: help:product.template,procure_method:0
@@ -697,7 +709,7 @@ msgstr "Aquisição"
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_product_category_action
 msgid "Products by Category"
-msgstr "Produtos por categoria"
+msgstr "Artigos por categoria"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
@@ -720,7 +732,7 @@ msgstr "HDD Seagate 7200.8 160GB"
 #. module: product
 #: view:product.product:0
 msgid "Product Variant"
-msgstr "Variante de produto"
+msgstr "Artigo variante"
 
 #. module: product
 #: field:product.packaging,ul:0
@@ -767,7 +779,7 @@ msgstr "Tipo de medida"
 #. module: product
 #: model:product.uom.categ,name:product.product_uom_categ_kgm
 msgid "Weight"
-msgstr ""
+msgstr "Peso"
 
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
@@ -780,6 +792,8 @@ msgid ""
 "Name of the product for this partner, will be used when printing a request "
 "for quotation. Keep empty to use the internal one."
 msgstr ""
+"Nome do artigo para este parceiro, será utilizado na impressão de um pedido "
+"de cotação. Mantenha vazio para utilizar o nome interno."
 
 #. module: product
 #: field:product.template,supply_method:0
@@ -789,7 +803,7 @@ msgstr "Método de fornecimento"
 #. module: product
 #: model:product.category,name:product.product_category_11
 msgid "IT components kits"
-msgstr ""
+msgstr "Kits de componentes de TI"
 
 #. module: product
 #: view:product.uom.categ:0
@@ -838,7 +852,7 @@ msgstr "Descrições"
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Suppliers of Product"
-msgstr ""
+msgstr "Fornecedores do artigo"
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -856,7 +870,8 @@ msgid ""
 "Current quantities of products in selected locations or all internal if none "
 "have been selected."
 msgstr ""
-"Quantidades de produtos actuais selecionadas ou todos se nenhuma selecionada"
+"Quantidades actuais de artigos nos locais seleccionados ou todos se nenhuma "
+"for indicada."
 
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
@@ -878,6 +893,7 @@ msgstr "Categoria"
 msgid ""
 "The rule only applies if the partner buys/sells more than this quantity."
 msgstr ""
+"A regra aplica-se apenas se o parceiro compra/vende mais que esta quantidade."
 
 #. module: product
 #: model:product.template,name:product.product_product_ram_product_template
@@ -892,7 +908,7 @@ msgstr "Stock Real"
 #. module: product
 #: view:product.category:0
 msgid "Product Categories"
-msgstr "Categorias de produto"
+msgstr "Categorias de artigos"
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -900,11 +916,13 @@ msgid ""
 "Unit of Measure of a category can be converted between each others in the "
 "same category."
 msgstr ""
+"A unidade de medida de uma categoria pode ser convertida em qualquer outra "
+"da mesma categoria."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom
 msgid "Product Unit of Measure"
-msgstr "Unidade de medida do produto"
+msgstr "Unidade de medida do artigo"
 
 #. module: product
 #: field:product.template,sale_ok:0
@@ -936,7 +954,7 @@ msgstr "Taxa"
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Products Listprices Items"
-msgstr "Itens de lista de preço dos produtos"
+msgstr "Itens da lista de preços dos artigos"
 
 #. module: product
 #: field:product.uom,rounding:0
@@ -1004,7 +1022,7 @@ msgstr "Preço público"
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
 msgid "Max. Price Margin"
-msgstr ""
+msgstr "Margem de preço máxima"
 
 #. module: product
 #: view:res.partner:0
@@ -1034,12 +1052,12 @@ msgstr "UdM da Encomenda"
 #. module: product
 #: view:product.price.type:0
 msgid "Products Price Type"
-msgstr "Tipo de preço do produto"
+msgstr "Tipo de preço dos artigos"
 
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
-msgstr "Gestor de produto"
+msgstr "Gestor do artigo"
 
 #. module: product
 #: field:product.product,price_extra:0
@@ -1054,7 +1072,7 @@ msgstr "Ventoinha de caixa regular 80mm"
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
 msgid "Information about a product supplier"
-msgstr "Informação sobre o fornecedor do produto"
+msgstr "Informação sobre o fornecedor de um artigo"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1107,7 +1125,7 @@ msgstr "Segundo UdM"
 #. module: product
 #: model:product.category,name:product.product_category_4
 msgid "Dello Computer"
-msgstr ""
+msgstr "Computador Dello"
 
 #. module: product
 #: view:product.product:0
@@ -1123,7 +1141,7 @@ msgstr "O tamanho da embalagem"
 #. module: product
 #: field:product.pricelist.item,price_min_margin:0
 msgid "Min. Price Margin"
-msgstr ""
+msgstr "Margem de preço mínima"
 
 #. module: product
 #: help:product.packaging,ean:0
@@ -1141,7 +1159,7 @@ msgid ""
 "Gives the different ways to package the same product. This has no impact on "
 "the packing order and is mainly used if you use the EDI module."
 msgstr ""
-"Mostra as maneiras diferentes de empacotar o mesmo produto. Isto não tem "
+"Mostra as maneiras diferentes de empacotar o mesmo artigo. Isto não tem "
 "nenhum impacto na ordem da empacotamento e é utilizado principalmente se "
 "você usa o módulo do EDI."
 
@@ -1149,12 +1167,12 @@ msgstr ""
 #: model:ir.model,name:product.model_product_category
 #: field:product.pricelist.item,categ_id:0
 msgid "Product Category"
-msgstr "Categoria de produto"
+msgstr "Categoria do artigo"
 
 #. module: product
 #: field:product.price.type,field:0
 msgid "Product Field"
-msgstr "Campo produto"
+msgstr "Campo artigo"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_type_action
@@ -1165,17 +1183,17 @@ msgstr "Tipos de listas de preço"
 #. module: product
 #: help:product.template,state:0
 msgid "Tells the user if he can use the product or not."
-msgstr "Diz ao utilizador se ele pode ou não utilizar o produto"
+msgstr "Diz ao utilizador se ele pode ou não utilizar o artigo"
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Partner Product Code"
-msgstr "Código do produto do parceiro"
+msgstr "Código do artigo no parceiro"
 
 #. module: product
 #: model:product.category,name:product.product_category_3
 msgid "Computer Stuff"
-msgstr ""
+msgstr "Material informático"
 
 #. module: product
 #: field:product.packaging,code:0
@@ -1218,7 +1236,7 @@ msgstr ""
 #: field:product.product,product_tmpl_id:0
 #: view:product.template:0
 msgid "Product Template"
-msgstr "Produto modelo"
+msgstr "Artigo modelo"
 
 #. module: product
 #: model:ir.model,name:product.model_product_ul
@@ -1231,6 +1249,8 @@ msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for products "
 "that can not be split."
 msgstr ""
+"A quantidade calculada será um múltiplo deste valor. Use 1 para artigos que "
+"não podem ser divididos"
 
 #. module: product
 #: field:product.packaging,height:0
@@ -1245,7 +1265,7 @@ msgstr "PC Personalizado"
 #. module: product
 #: help:product.pricelist.version,date_end:0
 msgid "Ending date for this pricelist version to be valid."
-msgstr ""
+msgstr "Data de fim da validade desta versão da lista de preços"
 
 #. module: product
 #: field:pricelist.partnerinfo,suppinfo_id:0
@@ -1257,7 +1277,7 @@ msgstr "Informação de parceiro"
 #: view:product.template:0
 #: field:product.template,type:0
 msgid "Product Type"
-msgstr "Tipo de produto"
+msgstr "Tipo de artigo"
 
 #. module: product
 #: model:product.category,name:product.product_category_7
@@ -1268,7 +1288,7 @@ msgstr "Intervenção no sítio"
 #. module: product
 #: model:product.category,name:product.cat0
 msgid "All products"
-msgstr "Todos os produtos"
+msgstr "Todos os artigos"
 
 #. module: product
 #: wizard_button:product.price_list,init,end:0
@@ -1278,7 +1298,7 @@ msgstr "Cancelar"
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by palet or box."
-msgstr "Número total de produtos que se pode pôr numa paleta ou caixa"
+msgstr "Número total de artigos que se pode pôr por palete ou caixa"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
@@ -1326,7 +1346,7 @@ msgstr "Informação"
 #. module: product
 #: view:product.product:0
 msgid "Codes"
-msgstr ""
+msgstr "Códigos"
 
 #. module: product
 #: constraint:ir.model:0
@@ -1368,6 +1388,8 @@ msgid ""
 "Code of the product for this partner, will be used when printing a request "
 "for quotation. Keep empty to use the internal one."
 msgstr ""
+"Código do artigo para este parceiro, será usado na impressão de um pedido de "
+"cotação. Deixe vazio para utilizar o interno."
 
 #. module: product
 #: selection:product.template,state:0
@@ -1377,7 +1399,7 @@ msgstr "Obsoleto"
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pallet"
-msgstr ""
+msgstr "Palete"
 
 #. module: product
 #: field:pricelist.partnerinfo,price:0
@@ -1392,7 +1414,7 @@ msgstr "Garantia (meses)"
 #. module: product
 #: field:product.packaging,ul_qty:0
 msgid "Package by layer"
-msgstr ""
+msgstr "Embalagem por camadas"
 
 #. module: product
 #: help:product.template,type:0
@@ -1405,7 +1427,7 @@ msgstr ""
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Product suppliers, with their product name, price, etc."
-msgstr ""
+msgstr "Fornecedores do artigo, com a sua designação, preço, etc"
 
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
@@ -1421,7 +1443,7 @@ msgstr "Tipo de preço"
 #: field:product.supplierinfo,product_id:0
 #: model:res.request.link,name:product.req_link_product
 msgid "Product"
-msgstr "Produto"
+msgstr "Artigo"
 
 #. module: product
 #: field:product.template,volume:0
@@ -1446,7 +1468,7 @@ msgstr "EAN"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Product Description"
-msgstr "Descrição do produto"
+msgstr "Descrição do artigo"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1464,7 +1486,7 @@ msgstr ""
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
 msgid "Product uom categ"
-msgstr "udm da categoria do produto"
+msgstr "Categoria da UdM de artigos"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty3:0
@@ -1474,7 +1496,7 @@ msgstr "Quantidade-3"
 #. module: product
 #: model:product.ul,name:product.product_ul_box
 msgid "Box 20x20x40"
-msgstr ""
+msgstr "Caixa 20x20x40"
 
 #. module: product
 #: selection:product.template,supply_method:0
@@ -1494,7 +1516,7 @@ msgstr "Acréscimo de preço"
 #. module: product
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
+msgstr "Não pode ter duas versões de listas de preços sobrepostas"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1530,7 +1552,7 @@ msgstr "Data Final"
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
 msgid "Products Categories"
-msgstr "Categorias de produtos"
+msgstr "Categorias de artigos"
 
 #. module: product
 #: field:product.product,packaging:0
@@ -1587,7 +1609,7 @@ msgstr "Método de custo"
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Palletization"
-msgstr ""
+msgstr "Pelatização"
 
 #. module: product
 #: view:product.product:0
@@ -1598,7 +1620,7 @@ msgstr "Preços e Fornecedores"
 #. module: product
 #: help:product.packaging,weight:0
 msgid "The weight of a full of products palet or box."
-msgstr "O peso de uma palete ou caixa completa de produtos"
+msgstr "O peso de uma palete ou caixa cheia de artigos"
 
 #. module: product
 #: selection:product.template,state:0
@@ -1608,7 +1630,7 @@ msgstr "Fim de ciclo de vida"
 #. module: product
 #: model:ir.module.module,shortdesc:product.module_meta_information
 msgid "Products & Pricelists"
-msgstr ""
+msgstr "Artigos e listas de preços"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -1620,7 +1642,7 @@ msgstr ""
 #. module: product
 #: help:product.template,weight_net:0
 msgid "The net weight in Kg."
-msgstr ""
+msgstr "Peso líquido em kg."
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
@@ -1657,10 +1679,9 @@ msgid ""
 "this product. Different delays will be summed for all levels and purchase "
 "orders."
 msgstr ""
-"Tempo médio a produzir este produto. Isto é somente para o pedido de "
-"produção e, se é uma conta de material multi-nível, é somente para o nível "
-"deste produto. Os atrasos diferentes serão somados para todos os níveis e "
-"pedidos de compra."
+"Tempo médio a produzir este artigo. Isto é somente para ordem de produção e, "
+"se é uma lista de materiais multi-nível, é apenas para o nível deste artigo. "
+"Os diferentes atrasos serão somados para todos os níveis e ordens de compra."
 
 #. module: product
 #: wizard_field:product.price_list,init,qty1:0
@@ -1684,6 +1705,9 @@ msgid ""
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
 msgstr ""
+"Intervalo (em dias) entre a confirmação da ordem de compra e a recepção dos "
+"artigos no seu armazém. Usado pelo planificador para calendarização "
+"automática das ordens de compra."
 
 #. module: product
 #: help:product.template,uom_po_id:0
@@ -1710,28 +1734,28 @@ msgid ""
 "Set a category of product if this rule only apply to products of a category "
 "and his childs. Keep empty for all products"
 msgstr ""
-"Selecionar uma categoria de produto se essa regra se aplica apenas a "
-"produtos dessa categoria. Deixar vazio para todos os produtos."
+"Defina a categoria se esta regra aplica-se apenas a artigos dessa categoria "
+"e dependentes. Deixe vazio para todos os artigos."
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
 msgid "Products Labels"
-msgstr "Rótulos de produtos"
+msgstr "Rótulos de artigos"
 
 #. module: product
 #: help:product.template,volume:0
 msgid "The volume in m3."
-msgstr ""
+msgstr "Volume em m3"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
 msgid "Box 30x40x60"
-msgstr ""
+msgstr "Caixa 30x40x60"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "KGM"
-msgstr ""
+msgstr "KGM"
 
 #. module: product
 #: field:product.pricelist.item,price_discount:0
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index d1a61d86d15..4dd6b2e4348 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -7,13 +7,13 @@ 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-11-17 11:09+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-14 00:43+0000\n"
+"Last-Translator: Carlos Paiva <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: 2009-12-16 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-01-15 04:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -620,7 +620,7 @@ msgstr "Lista de preço"
 #. module: product
 #: selection:product.template,type:0
 msgid "Consumable"
-msgstr "Comsumível"
+msgstr "Consumível"
 
 #. module: product
 #: help:product.price.type,currency_id:0
@@ -1396,7 +1396,7 @@ msgstr ""
 #. module: product
 #: field:pricelist.partnerinfo,price:0
 msgid "Unit Price"
-msgstr "Unidade de Preço"
+msgstr "Preço unitário"
 
 #. module: product
 #: field:product.template,warranty:0
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index 8435ddf9c9c..d2169806eec 100644
--- a/addons/product/i18n/sk.po
+++ b/addons/product/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-30 15:44+0000\n"
+"PO-Revision-Date: 2010-01-16 21:41+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-01-17 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -47,6 +47,8 @@ msgid ""
 "Determine if the product is visible in the list of products within a "
 "selection from a purchase order line."
 msgstr ""
+"Zistite, či výrobok je vidieť v zozname produktov vo výbere z línie "
+"objednávok."
 
 #. module: product
 #: help:product.supplierinfo,name:0
@@ -107,17 +109,17 @@ msgstr ""
 #. module: product
 #: field:product.template,procure_method:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Metóda obstarania"
 
 #. module: product
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Neplatný názov modelu v akcii definície."
 
 #. module: product
 #: model:process.process,name:product.process_process_productprocess0
 msgid "Product Process"
-msgstr ""
+msgstr "Procesy produktu"
 
 #. module: product
 #: help:product.price.type,field:0
@@ -167,7 +169,7 @@ msgstr "Firma"
 #. module: product
 #: field:product.template,rental:0
 msgid "Rentable Product"
-msgstr ""
+msgstr "Produkt na prenájom"
 
 #. module: product
 #: field:product.product,lst_price:0
@@ -231,7 +233,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Weigths"
-msgstr ""
+msgstr "Miery"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
@@ -253,7 +255,7 @@ msgstr ""
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layer on a palet or box"
-msgstr ""
+msgstr "Počet vrstiev na palete alebo boxe"
 
 #. module: product
 #: model:product.pricelist.type,name:product.pricelist_type_sale
@@ -291,7 +293,7 @@ msgstr "Nová cena ="
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Virtual Stock"
-msgstr "Virtuálny sklad"
+msgstr "Virtuálne na sklade"
 
 #. module: product
 #: selection:product.template,mes_type:0
@@ -302,7 +304,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "Units of Measure Categories"
-msgstr ""
+msgstr "Kategórie merných jednotiek"
 
 #. module: product
 #: help:product.pricelist.item,product_id:0
@@ -316,23 +318,23 @@ msgstr ""
 #: field:product.pricelist,type:0
 #: view:product.pricelist.type:0
 msgid "Pricelist Type"
-msgstr ""
+msgstr "Typ cenníka"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Base Prices"
-msgstr ""
+msgstr "Základné ceny"
 
 #. module: product
 #: model:ir.ui.menu,name:product.menu_price
 msgid "Prices Computations"
-msgstr ""
+msgstr "Vypočítané ceny"
 
 #. module: product
 #: field:product.pricelist.item,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Názov pravidla"
 
 #. module: product
 #: model:ir.ui.menu,name:product.menu_config_product
@@ -352,12 +354,12 @@ msgstr ""
 #. module: product
 #: field:product.template,uom_id:0
 msgid "Default UoM"
-msgstr ""
+msgstr "Prednastavená MJ"
 
 #. module: product
 #: field:product.template,produce_delay:0
 msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "Výrobná dodacia lehota"
 
 #. module: product
 #: field:product.supplierinfo,pricelist_ids:0
@@ -388,7 +390,7 @@ msgstr "Partner"
 #. module: product
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr ""
+msgstr "Zákaznícka dodacia lehota"
 
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
@@ -451,7 +453,7 @@ msgstr "Vo výrobe"
 #. module: product
 #: field:product.category,child_id:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Podkategórie"
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
@@ -498,7 +500,7 @@ msgstr "Cenník"
 #: view:product.product:0
 #: view:product.template:0
 msgid "UOM"
-msgstr "UOM"
+msgstr "MJ"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
@@ -549,7 +551,7 @@ msgstr "Minimálne množstvo"
 #. module: product
 #: model:product.category,name:product.product_category_pc
 msgid "PC"
-msgstr ""
+msgstr "PC"
 
 #. module: product
 #: help:product.template,seller_delay:0
@@ -562,7 +564,7 @@ msgstr ""
 #. module: product
 #: field:product.template,seller_delay:0
 msgid "Supplier Lead Time"
-msgstr ""
+msgstr "Dodacia lehota dodávateľa"
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
@@ -572,7 +574,7 @@ msgstr ""
 #. module: product
 #: field:product.pricelist.type,key:0
 msgid "Key"
-msgstr ""
+msgstr "Kľúč"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
@@ -595,7 +597,7 @@ msgstr ""
 #: model:ir.model,name:product.model_product_pricelist
 #: view:product.supplierinfo:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Cenník"
 
 #. module: product
 #: selection:product.template,type:0
@@ -610,17 +612,17 @@ msgstr ""
 #. module: product
 #: help:product.template,weight:0
 msgid "The gross weight in Kg."
-msgstr ""
+msgstr "Hrubá hmotnosť v kg."
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Box"
-msgstr ""
+msgstr "Krabica"
 
 #. module: product
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neplatný súbor XML pre zobrazenie architektúry!"
 
 #. module: product
 #: help:product.template,sale_ok:0
@@ -632,12 +634,12 @@ msgstr ""
 #. module: product
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Chyba: UOS musia byť v inej kategórii, ako UOM"
 
 #. module: product
 #: field:product.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Rodičovská kategória"
 
 #. module: product
 #: selection:product.template,state:0
@@ -661,7 +663,7 @@ msgstr ""
 #. module: product
 #: field:product.packaging,weight:0
 msgid "Total Package Weight"
-msgstr ""
+msgstr "Celková hmotnosť balenia"
 
 #. module: product
 #: help:product.template,procure_method:0
@@ -675,18 +677,18 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement"
-msgstr ""
+msgstr "Obstaranie"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_product_category_action
 msgid "Products by Category"
-msgstr ""
+msgstr "Produkty podľa kategórie"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
 msgid "HDD Seagate 7200.8 80GB"
-msgstr ""
+msgstr "HDD Seagate 7200.8 80GB"
 
 #. module: product
 #: help:product.pricelist.version,active:0
@@ -699,7 +701,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
 msgid "HDD Seagate 7200.8 160GB"
-msgstr ""
+msgstr "HDD Seagate 7200.8 160GB"
 
 #. module: product
 #: view:product.product:0
@@ -709,39 +711,39 @@ msgstr ""
 #. module: product
 #: field:product.packaging,ul:0
 msgid "Type of Package"
-msgstr ""
+msgstr "Typ balenia"
 
 #. module: product
 #: field:product.template,loc_rack:0
 msgid "Rack"
-msgstr ""
+msgstr "Polica"
 
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr ""
+msgstr "Kategória MJ"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pack"
-msgstr ""
+msgstr "Balenie"
 
 #. module: product
 #: field:product.product,ean13:0
 msgid "EAN13"
-msgstr ""
+msgstr "EAN13"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,description_sale:0
 msgid "Sale Description"
-msgstr ""
+msgstr "Vlastnosť predaja"
 
 #. module: product
 #: field:product.template,uos_id:0
 msgid "Unit of Sale"
-msgstr ""
+msgstr "Predajná jednotka"
 
 #. module: product
 #: field:product.template,mes_type:0
@@ -751,7 +753,7 @@ msgstr ""
 #. module: product
 #: model:product.uom.categ,name:product.product_uom_categ_kgm
 msgid "Weight"
-msgstr ""
+msgstr "Hmotnosť"
 
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
@@ -768,7 +770,7 @@ msgstr ""
 #. module: product
 #: field:product.template,supply_method:0
 msgid "Supply method"
-msgstr ""
+msgstr "Spôsob dodania"
 
 #. module: product
 #: model:product.category,name:product.product_category_11
@@ -785,7 +787,7 @@ msgstr ""
 #: field:product.packaging,sequence:0
 #: field:product.pricelist.item,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Poradie"
 
 #. module: product
 #: view:product.supplierinfo:0
@@ -800,13 +802,13 @@ msgstr ""
 #: view:product.product:0
 #: view:product.ul:0
 msgid "Packaging"
-msgstr ""
+msgstr "Balenie"
 
 #. module: product
 #: field:product.price.type,currency_id:0
 #: field:product.pricelist,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Mena"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
@@ -817,7 +819,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Descriptions"
-msgstr ""
+msgstr "Popisy"
 
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
@@ -827,12 +829,12 @@ msgstr ""
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Počiatočný dátum"
 
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
-msgstr ""
+msgstr "Vlastnosti predaja"
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -849,12 +851,12 @@ msgstr ""
 #. module: product
 #: field:product.template,loc_row:0
 msgid "Row"
-msgstr ""
+msgstr "Rad"
 
 #. module: product
 #: field:product.template,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategória"
 
 #. module: product
 #: help:product.pricelist.item,min_quantity:0
@@ -870,12 +872,12 @@ msgstr ""
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Real Stock"
-msgstr ""
+msgstr "Reálne na sklade"
 
 #. module: product
 #: view:product.category:0
 msgid "Product Categories"
-msgstr ""
+msgstr "Kategórie produktu"
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -887,12 +889,12 @@ msgstr ""
 #. module: product
 #: model:ir.model,name:product.model_product_uom
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Merná jednotka produktu"
 
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be sold"
-msgstr ""
+msgstr "Môže byť predávaný"
 
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
@@ -928,12 +930,12 @@ msgstr ""
 #. module: product
 #: help:product.packaging,width:0
 msgid "The width of the package"
-msgstr ""
+msgstr "Šírka balíka"
 
 #. module: product
 #: field:product.packaging,qty:0
 msgid "Quantity by Package"
-msgstr ""
+msgstr "Monožstvo balenia"
 
 #. module: product
 #: help:product.template,uos_id:0
@@ -942,61 +944,65 @@ msgid ""
 "management. For example, in food industries, you will manage a stock of ham "
 "but invoice in Kg. Keep empty to use the default UOM."
 msgstr ""
+"Používajú spoločnosti, ktoré spravujú dve merné jednotky: fakturáciu a "
+"riadenie zásob. Napríklad, v potravinárskom priemysle, budete riadiť "
+"populácie šunky, ale fakturovať za Kg. Ponechajte prázdne pre predvolené "
+"použiie  UOM."
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement & Locations"
-msgstr ""
+msgstr "Obstaranie a lokality"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Odchádzajúce"
 
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Buy"
-msgstr ""
+msgstr "Kúpiť"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
 #: view:product.pricelist:0
 #: view:product.pricelist.version:0
 msgid "Pricelist Version"
-msgstr ""
+msgstr "Verzia cenníka"
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
 msgid "Price Rounding"
-msgstr ""
+msgstr "Zaokrúhlená cena"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
 msgid "Public Price"
-msgstr ""
+msgstr "Verejná cena"
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
 msgid "Max. Price Margin"
-msgstr ""
+msgstr "Max. marža ceny"
 
 #. module: product
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Predaj a nákup"
 
 #. module: product
 #: model:product.category,name:product.product_category_10
 msgid "IT components"
-msgstr ""
+msgstr "IT components"
 
 #. module: product
 #: help:product.packaging,weight_ul:0
@@ -1011,7 +1017,7 @@ msgstr ""
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase UoM"
-msgstr ""
+msgstr "Nákupná MJ"
 
 #. module: product
 #: view:product.price.type:0
@@ -1021,7 +1027,7 @@ msgstr ""
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
-msgstr ""
+msgstr "Produktový manažér"
 
 #. module: product
 #: field:product.product,price_extra:0
@@ -1078,13 +1084,13 @@ msgstr ""
 #: view:product.template:0
 #: field:product.template,description_purchase:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "Vlastnosti nákupu"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Second UoM"
-msgstr ""
+msgstr "Druhá MJ"
 
 #. module: product
 #: model:product.category,name:product.product_category_4
@@ -1095,7 +1101,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Localisation"
-msgstr ""
+msgstr "Lokálne úložisko"
 
 #. module: product
 #: help:product.packaging,length:0
@@ -1110,12 +1116,12 @@ msgstr ""
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
-msgstr ""
+msgstr "EAN kód balenia jednotky."
 
 #. module: product
 #: field:product.template,weight:0
 msgid "Gross weight"
-msgstr ""
+msgstr "Hrubá hmotnosť"
 
 #. module: product
 #: help:product.product,packaging:0
@@ -1235,7 +1241,7 @@ msgstr ""
 #: view:product.template:0
 #: field:product.template,type:0
 msgid "Product Type"
-msgstr ""
+msgstr "Typ produktu"
 
 #. module: product
 #: model:product.category,name:product.product_category_7
@@ -1293,18 +1299,18 @@ msgstr ""
 #. module: product
 #: wizard_field:product.price_list,init,qty2:0
 msgid "Quantity-2"
-msgstr ""
+msgstr "Množstvo-2"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Information"
-msgstr ""
+msgstr "Informácie"
 
 #. module: product
 #: view:product.product:0
 msgid "Codes"
-msgstr ""
+msgstr "Kódy"
 
 #. module: product
 #: constraint:ir.model:0
@@ -1315,12 +1321,12 @@ msgstr ""
 #. module: product
 #: wizard_field:product.price_list,init,qty4:0
 msgid "Quantity-4"
-msgstr ""
+msgstr "Množstvo-4"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty5:0
 msgid "Quantity-5"
-msgstr ""
+msgstr "Množstvo-5"
 
 #. module: product
 #: view:product.packaging:0
@@ -1332,7 +1338,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Delays"
-msgstr ""
+msgstr "Oneskorenia"
 
 #. module: product
 #: field:product.pricelist.version,items_id:0
@@ -1364,7 +1370,7 @@ msgstr ""
 #. module: product
 #: field:product.template,warranty:0
 msgid "Warranty (months)"
-msgstr ""
+msgstr "Záruka (mesiace)"
 
 #. module: product
 #: field:product.packaging,ul_qty:0
@@ -1403,7 +1409,7 @@ msgstr ""
 #. module: product
 #: field:product.template,volume:0
 msgid "Volume"
-msgstr ""
+msgstr "Objem"
 
 #. module: product
 #: field:pricelist.partnerinfo,name:0
@@ -1417,13 +1423,13 @@ msgstr ""
 #. module: product
 #: field:product.packaging,ean:0
 msgid "EAN"
-msgstr ""
+msgstr "EAN"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Product Description"
-msgstr ""
+msgstr "Popis produktu"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1446,7 +1452,7 @@ msgstr ""
 #. module: product
 #: wizard_field:product.price_list,init,qty3:0
 msgid "Quantity-3"
-msgstr ""
+msgstr "Množstvo-3"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
@@ -1481,7 +1487,7 @@ msgstr ""
 #. module: product
 #: field:product.product,variants:0
 msgid "Variants"
-msgstr ""
+msgstr "Varianty"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1496,7 +1502,7 @@ msgstr ""
 #. module: product
 #: field:product.template,loc_case:0
 msgid "Case"
-msgstr ""
+msgstr "Krabica"
 
 #. module: product
 #: field:product.pricelist.version,date_end:0
@@ -1536,7 +1542,7 @@ msgstr ""
 #. module: product
 #: field:product.template,purchase_ok:0
 msgid "Can be Purchased"
-msgstr ""
+msgstr "Možnosť zakúpiť"
 
 #. module: product
 #: field:product.template,uos_coeff:0
@@ -1595,7 +1601,7 @@ msgstr ""
 #. module: product
 #: help:product.template,weight_net:0
 msgid "The net weight in Kg."
-msgstr ""
+msgstr "Čistá hmotnosť v Kg."
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
@@ -1636,7 +1642,7 @@ msgstr ""
 #. module: product
 #: wizard_field:product.price_list,init,qty1:0
 msgid "Quantity-1"
-msgstr ""
+msgstr "Množstvo-1"
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1666,12 +1672,12 @@ msgstr ""
 #. module: product
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Chyba: Neplatný ean kód"
 
 #. module: product
 #: field:product.pricelist.item,min_quantity:0
 msgid "Min. Quantity"
-msgstr ""
+msgstr "Min. množstvo"
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
@@ -1688,7 +1694,7 @@ msgstr ""
 #. module: product
 #: help:product.template,volume:0
 msgid "The volume in m3."
-msgstr ""
+msgstr "Objem v m3."
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
diff --git a/addons/product/partner.py b/addons/product/partner.py
index 4efdd2b0430..7aa9b3bc426 100644
--- a/addons/product/partner.py
+++ b/addons/product/partner.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 1a136b875ac..213cc55d953 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index df83c9253cf..f1ef28aa81a 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="product.menu_config_product" sequence="2"/>
+        <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="base.menu_base_config" sequence="50"/>
 
         <record id="product_pricelist_version_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.version.form</field>
@@ -165,8 +165,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name="Prices Computations" id="menu_price" parent="product.menu_config_product"/>
-        <menuitem action="product_price_type_action" groups="base.group_extended" id="menu_product_price_type_action" parent="menu_price"/>
+<!--        <menuitem name="Prices Computations" id="menu_price" parent="product.menu_config_product"/>-->
+<!--        <menuitem action="product_price_type_action" groups="base.group_extended" id="menu_product_price_type_action" parent="menu_price"/>-->
 
         <record id="product_pricelist_type_view" model="ir.ui.view">
             <field name="name">product.pricelist.type.form</field>
@@ -186,7 +186,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="product_pricelist_type_action" groups="base.group_extended" id="menu_product_pricelist_type_action" parent="menu_price"/>
+<!--        <menuitem action="product_pricelist_type_action" groups="base.group_extended" id="menu_product_pricelist_type_action" parent="menu_price"/>-->
 
     </data>
 </openerp>
diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml
index da527c7efc9..a63fdb41a1d 100755
--- a/addons/product/process/product_process.xml
+++ b/addons/product/process/product_process.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-        
+
     <!--
-        Process    
+        Process
     -->
-        
+
         <record id="process_process_productprocess0" model="process.process">
             <field eval="1" name="active"/>
             <field name="model_id" ref="product.model_product_product"/>
             <field eval="&quot;&quot;&quot;Product&quot;&quot;&quot;" name="name"/>
         </record>
-        
+
     <!--
         Process Node
     -->
-        
+
         <record id="process_node_product0" model="process.node">
-            <field name="menu_id" ref="product.menu_products"/>
+<!--            <field name="menu_id" ref="product.menu_products"/>-->
             <field name="model_id" ref="product.model_product_product"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product&quot;&quot;&quot;" name="name"/>
@@ -26,9 +26,9 @@
             <field eval="&quot;&quot;&quot;object.state in ('', 'sellable', 'draft', 'obsolete', 'end') &quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_supplier0" model="process.node">
-            <field name="menu_id" ref="product.menu_products"/>
+<!--            <field name="menu_id" ref="product.menu_products"/>-->
             <field name="model_id" ref="product.model_product_supplierinfo"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Supplier Information&quot;&quot;&quot;" name="name"/>
@@ -36,11 +36,11 @@
             <field name="process_id" ref="process_process_productprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
-    
+
     <!--
-        Process Transition  
+        Process Transition
     -->
-    
+
         <record id="process_transition_supplierofproduct0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -49,6 +49,6 @@
             <field model="process.node" name="target_node_id" ref="process_node_supplier0"/>
             <field model="process.node" name="source_node_id" ref="process_node_product0"/>
         </record>
-    
+
     </data>
 </openerp>
diff --git a/addons/product/product.py b/addons/product/product.py
index 1b57f561775..b2e70cab81d 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index f472e40fe36..e0b2cc714f6 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-product" id="menu_main_product" name="Products"/>
-        <menuitem
-            id="menu_config_product"
-            name="Configuration"
-            parent="product.menu_main_product"
-            sequence="1"
-            groups="group_product_manager"/>
+<!--        <menuitem icon="terp-product" id="menu_main_product" name="Products"/>-->
+<!--        <menuitem-->
+<!--            id="menu_config_product"-->
+<!--            name="Configuration"-->
+<!--            parent="product.menu_main_product"-->
+<!--            sequence="1"-->
+<!--            groups="group_product_manager"/>-->
 
         <record id="product_search_form_view" model="ir.ui.view">
             <field name="name">product.search.form</field>
@@ -188,7 +188,17 @@
             <field name="search_view_id" ref="product_search_form_view"/>
         </record>
 
-        <menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product" sequence="1"/>
+<!--        <menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product" sequence="1"/>-->
+
+        <record id="product_normal_action_puchased" model="ir.actions.act_window">
+            <field name="name">Products</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('purchase_ok','=',1)]</field>
+            <field name="view_id" ref="product_product_tree_view"/>
+            <field name="search_view_id" ref="product_search_form_view"/>
+        </record>
 
         <record id="product_category_form_view" model="ir.ui.view">
             <field name="name">product.category.form</field>
@@ -233,7 +243,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="product_category_tree_view"/>
         </record>
-        <menuitem action="product_category_action" id="menu_product_category_action" parent="product.menu_main_product" sequence="3"/>
+<!--        <menuitem action="product_category_action" id="menu_product_category_action" parent="product.menu_main_product" sequence="3"/>-->
 
         <record id="product_category_action_form" model="ir.actions.act_window">
             <field name="name">Products Categories</field>
@@ -242,7 +252,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="product_category_list_view"/>
         </record>
-        <menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="product.menu_config_product" sequence="1"/>
+<!--        <menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="product.menu_config_product" sequence="1"/>-->
 
 
         <record id="product_normal_action_tree" model="ir.actions.act_window">
@@ -302,7 +312,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="product_uom_tree_view"/>
         </record>
-        <menuitem id="next_id_16" name="Units of Measure" parent="product.menu_config_product"/><menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>
+<!--        <menuitem id="next_id_16" name="Units of Measure" parent="product.menu_config_product"/><menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>-->
 
         <record id="product_uom_categ_form_view" model="ir.ui.view">
             <field name="name">product.uom.categ.form</field>
@@ -321,7 +331,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="product.next_id_16" sequence="5"/>
+<!--        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="product.next_id_16" sequence="5"/>-->
 
         <record id="product_ul_form_view" model="ir.ui.view">
             <field name="name">product.ul.form.view</field>
@@ -352,7 +362,7 @@
             <field name="view_type">form</field>
             <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="product.menu_config_product" sequence="4"/>
+<!--        <menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="product.menu_config_product" sequence="4"/>-->
 
         <record id="product_packaging_tree_view" model="ir.ui.view">
             <field name="name">product.packaging.tree.view</field>
diff --git a/addons/product/report/__init__.py b/addons/product/report/__init__.py
index 2be8eb95414..579d47493c1 100644
--- a/addons/product/report/__init__.py
+++ b/addons/product/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product/report/pricelist.py b/addons/product/report/pricelist.py
index 7f9a4536d2c..c3f57024cf3 100644
--- a/addons/product/report/pricelist.py
+++ b/addons/product/report/pricelist.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 461e95e3d9d..3910e6c161a 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product/wizard/__init__.py b/addons/product/wizard/__init__.py
index 511c9b115e7..fed1bcf3783 100644
--- a/addons/product/wizard/__init__.py
+++ b/addons/product/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product/wizard/wizard_price.py b/addons/product/wizard/wizard_price.py
index 8f17fc6225d..12c810b802d 100644
--- a/addons/product/wizard/wizard_price.py
+++ b/addons/product/wizard/wizard_price.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product_margin/__init__.py b/addons/product_margin/__init__.py
index 9e234bab026..4edd4f91e3e 100644
--- a/addons/product_margin/__init__.py
+++ b/addons/product_margin/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product_margin/__terp__.py b/addons/product_margin/__terp__.py
index 7b23518c6a4..b0e81f341a7 100644
--- a/addons/product_margin/__terp__.py
+++ b/addons/product_margin/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index d35a60773c5..89479095493 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 7195392a114..03dfbdf2280 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -4,11 +4,11 @@
 
     <wizard id="action_open_margin" menu="False" model="product.product" name="product.margins" string="Product Margins"/>
 
-    <menuitem id="menu_product_reporting"
-        name="Reporting" parent ="product.menu_main_product"
-        groups="product.group_product_manager"/>
-
-    <menuitem icon="STOCK_JUSTIFY_FILL" action="action_open_margin" id="menu_action_product_margin" type="wizard" sequence="5" parent="menu_product_reporting" />
+<!--    <menuitem id="menu_product_reporting"-->
+<!--        name="Reporting" parent ="product.menu_main_product"-->
+<!--        groups="product.group_product_manager"/>-->
+<!---->
+<!--    <menuitem icon="STOCK_JUSTIFY_FILL" action="action_open_margin" id="menu_action_product_margin" type="wizard" sequence="5" parent="menu_product_reporting" />-->
 
     <record model="ir.ui.view" id="view_product_margin_graph">
             <field name="name">product.margin.graph</field>
diff --git a/addons/product_margin/wizard/__init__.py b/addons/product_margin/wizard/__init__.py
index fe5ea2e4158..4e2ecc2e39a 100644
--- a/addons/product_margin/wizard/__init__.py
+++ b/addons/product_margin/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/product_margin/wizard/wizard_product_margin.py b/addons/product_margin/wizard/wizard_product_margin.py
index 5be03cb613d..625cfd4c1df 100644
--- a/addons/product_margin/wizard/wizard_product_margin.py
+++ b/addons/product_margin/wizard/wizard_product_margin.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/profile_accounting/__init__.py b/addons/profile_accounting/__init__.py
index 2985abd6853..f653bffec7b 100644
--- a/addons/profile_accounting/__init__.py
+++ b/addons/profile_accounting/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/profile_accounting/__terp__.py b/addons/profile_accounting/__terp__.py
index 2042e5f4dc1..4e3e2e10481 100644
--- a/addons/profile_accounting/__terp__.py
+++ b/addons/profile_accounting/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/profile_accounting/i18n/pt_BR.po b/addons/profile_accounting/i18n/pt_BR.po
index c239ff94706..6803245141b 100644
--- a/addons/profile_accounting/i18n/pt_BR.po
+++ b/addons/profile_accounting/i18n/pt_BR.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:19+0000\n"
-"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
+"PO-Revision-Date: 2010-01-19 23:15+0000\n"
+"Last-Translator: pedrobom <pedrobomlimeira@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: 2009-12-16 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-01-22 04:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
@@ -104,7 +104,7 @@ msgstr ""
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_budget:0
 msgid "Budgets"
-msgstr ""
+msgstr "Orçamentos"
 
 #. module: profile_accounting
 #: view:profile.accounting.config.install_modules_wizard:0
@@ -119,7 +119,7 @@ msgstr ""
 #. module: profile_accounting
 #: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
 msgid "Accounting only profile"
-msgstr ""
+msgstr "Perfil apenas contábil"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
@@ -129,7 +129,7 @@ msgstr ""
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,board_document:0
 msgid "Document Management"
-msgstr ""
+msgstr "Gestão de Documentos"
 
 #. module: profile_accounting
 #: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
diff --git a/addons/profile_accounting/profile_accounting.py b/addons/profile_accounting/profile_accounting.py
index 6d2eafc66b9..b067beea049 100644
--- a/addons/profile_accounting/profile_accounting.py
+++ b/addons/profile_accounting/profile_accounting.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -24,6 +24,8 @@ import pooler
 
 class profile_accounting_config_install_modules_wizard(osv.osv_memory):
     _name='profile.accounting.config.install_modules_wizard'
+    _inherit = 'res.config'
+
     _columns = {
         'name':fields.char('Name', size=64),
         'account_analytic_analysis':fields.boolean('Analytic Accounting'),
@@ -33,38 +35,18 @@ class profile_accounting_config_install_modules_wizard(osv.osv_memory):
         'hr_timesheet_invoice':fields.boolean('Invoice on Analytic Entries'),
         'account_budget':fields.boolean('Budgets', help="Helps you to manage financial and analytic budgets."),
         'board_document':fields.boolean('Document Management',help= "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."),
-
-
     }
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
 
-
-    def action_install(self, cr, uid, ids, context=None):
-        result=self.read(cr,uid,ids)
+    def execute(self, cr, uid, ids, context=None):
+        result = self.read(cr, uid, ids)
         mod_obj = self.pool.get('ir.module.module')
         for res in result:
             for r in res:
-                if r<>'id' and res[r]:
+                if r != 'id' and res[r]:
                     ids += mod_obj.search(cr, uid, [('name', '=', r)])
                     mod_obj.button_install(cr, uid, ids, context=context)
         cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname,update_module=True)
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-            }
-
-
+        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
 profile_accounting_config_install_modules_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_accounting/profile_accounting.xml b/addons/profile_accounting/profile_accounting.xml
index ab82f8a69c6..e3d3c973405 100644
--- a/addons/profile_accounting/profile_accounting.xml
+++ b/addons/profile_accounting/profile_accounting.xml
@@ -5,25 +5,29 @@
             <field name="name">Accounting Profile : Install extra modules</field>
             <field name="model">profile.accounting.config.install_modules_wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Install Extra Module">
-					<separator string="Accounting Management" colspan="4"/>
-                    <field name="account_analytic_analysis"/>
-                    <field name="account_analytic_plans"/>
-                    <field name="account_payment"/>
-                    <separator string="Resources Management" colspan="4"/>
-					<field name="account_budget"/>
-                    <field name="account_asset"/>
-                    <separator string="Services Management" colspan="4"/>
-                    <field name="hr_timesheet_invoice"/>
-                    <field name="board_document"/>
-					<separator string="" colspan="4"/>
-					<label string="" colspan="2"/>
-                    <group col="4" colspan="2">
-                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                        <button name="action_install" string="Install" icon='gtk-ok' type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Install Extra Modules
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    Install more modules. A few modules are proposed according
+                    to the Account Profile you selected. You will be able to
+                    install them based on our requirements."/>
+                  <separator string="Accounting Management" colspan="4"/>
+                  <field name="account_analytic_analysis"/>
+                  <field name="account_analytic_plans"/>
+                  <field name="account_payment"/>
+                  <separator string="Resources Management" colspan="4"/>
+                  <field name="account_budget"/>
+                  <field name="account_asset"/>
+                  <separator string="Services Management" colspan="4"/>
+                  <field name="hr_timesheet_invoice"/>
+                  <field name="board_document"/>
+                </group>
+              </data>
             </field>
         </record>
 
@@ -31,16 +35,15 @@
             <field name="name">Accounting Profile : Install Extra Modules</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">profile.accounting.config.install_modules_wizard</field>
+            <field name="view_id" ref="view_confirm_install_module_form"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
 
-      <record model="ir.actions.todo"
-            id="profile_accounting.config_install_wizard">
-            <field name="name">Accounting Profile : Install Extra modules</field>
-            <field name="note">Install more modules. A few modules are proposed according to the Account Profile you selected. You will be able to install them based on our requirements.</field>
-            <field name="action_id" ref="action_config_install_module"/>
+        <record model="ir.actions.todo"
+                id="profile_accounting.config_install_wizard">
+          <field name="action_id" ref="action_config_install_module"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/profile_association/__init__.py b/addons/profile_association/__init__.py
index d882822b976..5b34f17fec9 100644
--- a/addons/profile_association/__init__.py
+++ b/addons/profile_association/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/profile_association/__terp__.py b/addons/profile_association/__terp__.py
index 25d2fc490d9..29eeb474d9c 100644
--- a/addons/profile_association/__terp__.py
+++ b/addons/profile_association/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/profile_association/profile_association.py b/addons/profile_association/profile_association.py
index 1b0af4705d9..013052222e7 100644
--- a/addons/profile_association/profile_association.py
+++ b/addons/profile_association/profile_association.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -25,6 +25,8 @@ import pooler
 
 class profile_association_config_install_modules_wizard(osv.osv_memory):
     _name='profile.association.config.install_modules_wizard'
+    _inherit = 'res.config'
+
     _columns = {
         'hr_expense':fields.boolean('Expenses Tracking', help="Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."),
         'project':fields.boolean('Project Management'),
@@ -36,30 +38,15 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
         'wiki': fields.boolean('Wiki', 
             help="An integrated wiki content management system. This is really usefull to manage FAQ, quality manuals, etc.")
     }
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
-    def action_install(self, cr, uid, ids, context=None):
-        result=self.read(cr,uid,ids)
+    def execute(self, cr, uid, ids, context=None):
+        result = self.read(cr,uid,ids)
         mod_obj = self.pool.get('ir.module.module')
         for res in result:
             for r in res:
-                if r<>'id' and res[r]:
+                if r != 'id' and res[r]:
                     ids = mod_obj.search(cr, uid, [('name', '=', r)])
                     mod_obj.button_install(cr, uid, ids, context=context)
         cr.commit()
         db, pool = pooler.restart_pool(cr.dbname, update_module=True)
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-            }
 profile_association_config_install_modules_wizard()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_association/profile_association.xml b/addons/profile_association/profile_association.xml
index 6640f2a9f14..e23af3fdbe5 100644
--- a/addons/profile_association/profile_association.xml
+++ b/addons/profile_association/profile_association.xml
@@ -5,24 +5,27 @@
             <field name="name">Association Profile : Install extra modules</field>
             <field name="model">profile.association.config.install_modules_wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Install Extra Module">
-                    <separator string="Project Management" colspan="4"/>
-                    <field name="project"/>
-                    <field name="project_gtd"/>
-                    <field name="wiki"/>
-                    <separator string="Resources Management" colspan="4"/>
-                    <field name="hr_expense"/>
-                    <separator string="Relationship Management" colspan="4"/>
-                    <field name="crm_configuration"/>
-                    <separator string="" colspan="4"/>
-                    <field name="board_document"/>
-                    <label string="" colspan="2"/>
-                    <group col="4" colspan="2">
-                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                        <button name="action_install" string="Install" icon='gtk-ok' type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Install Extra Modules
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    Install more modules. A few modules are proposed according
+                    to the Account Profile you selected. You will be able to
+                    install them based on our requirements."/>
+                  <separator string="Project Management" colspan="4"/>
+                  <field name="project"/>
+                  <field name="project_gtd"/>
+                  <field name="wiki"/>
+                  <separator string="Resources Management" colspan="4"/>
+                  <field name="hr_expense"/>
+                  <separator string="Relationship Management" colspan="4"/>
+                  <field name="crm_configuration"/>
+                </group>
+              </data>
             </field>
         </record>
 
@@ -30,6 +33,7 @@
             <field name="name">Association Profile : Install Extra Modules</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">profile.association.config.install_modules_wizard</field>
+            <field name="view_id" ref="view_confirm_install_module_form"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -37,8 +41,6 @@
 
       <record model="ir.actions.todo"
             id="config_install_module">
-            <field name="name">Association Profile : Install Extra modules</field>
-            <field name="note">Install more modules. A few modules are proposed according to the association profile you selected. You will be able to install them based on our requirements.</field>
             <field name="action_id" ref="action_config_install_module"/>
         </record>
     </data>
diff --git a/addons/profile_auction/__init__.py b/addons/profile_auction/__init__.py
index 0d29405d526..2aefd8b3c11 100644
--- a/addons/profile_auction/__init__.py
+++ b/addons/profile_auction/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/profile_auction/__terp__.py b/addons/profile_auction/__terp__.py
index 2122e4ebe50..c82f42b9b87 100644
--- a/addons/profile_auction/__terp__.py
+++ b/addons/profile_auction/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/profile_crm/__init__.py b/addons/profile_crm/__init__.py
index 0d29405d526..2aefd8b3c11 100644
--- a/addons/profile_crm/__init__.py
+++ b/addons/profile_crm/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/profile_crm/__terp__.py b/addons/profile_crm/__terp__.py
index 17aa2c29a4f..b4bb07d2ec9 100644
--- a/addons/profile_crm/__terp__.py
+++ b/addons/profile_crm/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/profile_manufacturing/__init__.py b/addons/profile_manufacturing/__init__.py
index 1d68d9319ca..d9a31f5fb06 100644
--- a/addons/profile_manufacturing/__init__.py
+++ b/addons/profile_manufacturing/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/profile_manufacturing/__terp__.py b/addons/profile_manufacturing/__terp__.py
index 4a14e02dd5b..f9c45b7260e 100644
--- a/addons/profile_manufacturing/__terp__.py
+++ b/addons/profile_manufacturing/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/profile_manufacturing/profile_manufacturing.py b/addons/profile_manufacturing/profile_manufacturing.py
index 2905cee8ac4..11276af8c96 100644
--- a/addons/profile_manufacturing/profile_manufacturing.py
+++ b/addons/profile_manufacturing/profile_manufacturing.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -25,6 +25,8 @@ import pooler
 
 class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
     _name='profile.manufacturing.config.install_modules_wizard'
+    _inherit = 'res.config'
+
     _columns = {
         'mrp_jit':fields.boolean('Just in Time Scheduling',
             help="The JIT module allows you to not run the scheduler "\
@@ -76,31 +78,16 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
             help="Allows to manage product repairs. Handle the guarantee limit date and the invoicing of products and services."),
 
     }
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
-    def action_install(self, cr, uid, ids, context=None):
-        result=self.read(cr,uid,ids)
+    def execute(self, cr, uid, ids, context=None):
+        result = self.read(cr,uid,ids)
         mod_obj = self.pool.get('ir.module.module')
         for res in result:
             for r in res:
-                if r<>'id' and res[r]:
+                if r != 'id' and res[r]:
                     ids = mod_obj.search(cr, uid, [('name', '=', r)])
                     mod_obj.button_install(cr, uid, ids, context=context)
         cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname,update_module=True)
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-            }
+        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
 profile_manufacturing_config_install_modules_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml
index b20d9fdfe96..b0bb0301773 100644
--- a/addons/profile_manufacturing/profile_manufacturing.xml
+++ b/addons/profile_manufacturing/profile_manufacturing.xml
@@ -5,46 +5,45 @@
             <field name="name">Manufacturing Profile: Install Extra Modules</field>
             <field name="model">profile.manufacturing.config.install_modules_wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Manufacturing Profile: Install Extra Modules">
-                    <separator string="Stock &amp; Manufacturing" colspan="4"/>
-                    <field name="stock_location"/>
-                    <field name="mrp_jit"/>
-                    <field name="mrp_operation"/>
-					<field name="mrp_subproduct"/>
-					<field name="mrp_repair"/>
-                    <separator string="Sales Management" colspan="4"/>
-                    <field name="point_of_sale"/>
-                    <field name="sale_journal"/>
-                    <field name="sale_margin"/>
-                    <separator string="Relationship Management" colspan="4"/>
-                    <field name="sale_crm"/>
-                    <field name="board_document"/>
-                    <field name="warning"/>
-                    <field name="portal"/>
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="2"/>
-                    <group col="4" colspan="2">
-                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                        <button name="action_install" string="Install" icon='gtk-ok' type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Manufacturing Profile: Install Extra Modules
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="Here are a few modules which might be useful along with the rest of the Manufacturing profile. You can also install them the normal way later on, but if you think you'll need them to fit your requirements, you can select them now and they'll be installed immediately."/>
+                  <separator string="Stock &amp; Manufacturing" colspan="4"/>
+                  <field name="stock_location"/>
+                  <field name="mrp_jit"/>
+                  <field name="mrp_operation"/>
+                  <field name="mrp_subproduct"/>
+                  <field name="mrp_repair"/>
+                  <separator string="Sales Management" colspan="4"/>
+                  <field name="point_of_sale"/>
+                  <field name="sale_journal"/>
+                  <field name="sale_margin"/>
+                  <separator string="Relationship Management" colspan="4"/>
+                  <field name="sale_crm"/>
+                  <field name="board_document"/>
+                  <field name="warning"/>
+                  <field name="portal"/>
+                </group>
+                <xpath expr='//button[@name="action_skip"]' position='replace'/>
+              </data>
             </field>
         </record>
-
         <record id="action_config_install_module" model="ir.actions.act_window">
             <field name="name">Manufacturing Profile: Install Extra Modules</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">profile.manufacturing.config.install_modules_wizard</field>
+            <field name="view_id" ref="view_confirm_install_module_form"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-
       <record model="ir.actions.todo"
             id="config_install_module">
-            <field name="name">Manufacturing Profile: Install Extra modules</field>
-            <field name="note">Install more modules. A few modules are proposed according to the manufacturing profile you selected. You will be able to install them based on our requirements.</field>
             <field name="action_id" ref="action_config_install_module"/>
         </record>
     </data>
diff --git a/addons/profile_service/__init__.py b/addons/profile_service/__init__.py
index 910d10028e8..b276c4b4ee3 100644
--- a/addons/profile_service/__init__.py
+++ b/addons/profile_service/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/profile_service/__terp__.py b/addons/profile_service/__terp__.py
index 4225893ebea..72d1602a255 100644
--- a/addons/profile_service/__terp__.py
+++ b/addons/profile_service/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/profile_service/i18n/fi.po b/addons/profile_service/i18n/fi.po
new file mode 100644
index 00000000000..4ed1c11bd9e
--- /dev/null
+++ b/addons/profile_service/i18n/fi.po
@@ -0,0 +1,250 @@
+# Finnish 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-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-01-25 08:54+0000\n"
+"Last-Translator: pmjt <Unknown>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-01-26 04:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: profile_service
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: profile_service
+#: view:profile.service.config.install_modules_wizard:0
+msgid "Services Management"
+msgstr ""
+
+#. module: profile_service
+#: view:profile.service.config.install_modules_wizard:0
+msgid "Relationship Management"
+msgstr ""
+
+#. module: profile_service
+#: help:profile.service.config.install_modules_wizard,project_mrp:0
+msgid ""
+"Manages quotation and sales orders. It allows you to automatically create "
+"and invoice tasks on fixes prices from quotations."
+msgstr ""
+
+#. module: profile_service
+#: help:profile.service.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+
+#. module: profile_service
+#: help:profile.service.config.install_modules_wizard,board_document:0
+msgid ""
+"The Document Management System of Open ERP allows you to store, browse, "
+"automatically index, search and preview all kind of documents (internal "
+"documents, printed reports, calendar system). It opens an FTP access for the "
+"users to easily browse association's document."
+msgstr ""
+
+#. module: profile_service
+#: help:profile.service.config.install_modules_wizard,account_budget_crossover:0
+msgid ""
+"Allows you to manage analytic budgets by journals. This module is used to "
+"manage budgets of your projects."
+msgstr ""
+
+#. module: profile_service
+#: field:profile.service.config.install_modules_wizard,project_timesheet:0
+msgid "Timesheets"
+msgstr "Tuntilistat"
+
+#. module: profile_service
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+
+#. module: profile_service
+#: view:profile.service.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr ""
+
+#. module: profile_service
+#: model:ir.actions.act_window,name:profile_service.action_config_install_module
+msgid "Service Profile : Install Extra Modules"
+msgstr ""
+
+#. module: profile_service
+#: field:profile.service.config.install_modules_wizard,account_budget_crossover:0
+msgid "Analytic Budgets"
+msgstr ""
+
+#. module: profile_service
+#: model:ir.module.module,shortdesc:profile_service.module_meta_information
+msgid "Service company profile"
+msgstr ""
+
+#. module: profile_service
+#: help:profile.service.config.install_modules_wizard,hr_timesheet_invoice:0
+msgid ""
+"There are different invoicing methods in OpenERP: from sale orders, from "
+"shipping, ... Install this module if you plan to invoice your customers "
+"based on time spent on projects."
+msgstr ""
+
+#. module: profile_service
+#: field:profile.service.config.install_modules_wizard,crm_configuration:0
+msgid "CRM & Calendars"
+msgstr ""
+
+#. module: profile_service
+#: field:profile.service.config.install_modules_wizard,board_document:0
+msgid "Document Management"
+msgstr ""
+
+#. module: profile_service
+#: field:profile.service.config.install_modules_wizard,portal:0
+msgid "Portal"
+msgstr ""
+
+#. module: profile_service
+#: help:profile.service.config.install_modules_wizard,hr_holidays:0
+msgid ""
+"Tracks the full holidays management process, from the employee's request to "
+"the global planning."
+msgstr ""
+
+#. module: profile_service
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: profile_service
+#: help:profile.service.config.install_modules_wizard,scrum:0
+msgid ""
+"Scrum is an 'agile development methodology', mainly used in IT projects. It "
+"helps you to manage teams, long term roadmaps, sprints, and so on."
+msgstr ""
+
+#. module: profile_service
+#: help:profile.service.config.install_modules_wizard,portal:0
+msgid "This module allows you to manage a Portal system."
+msgstr ""
+
+#. module: profile_service
+#: view:profile.service.config.install_modules_wizard:0
+msgid "Portal Management"
+msgstr ""
+
+#. module: profile_service
+#: field:profile.service.config.install_modules_wizard,hr_holidays:0
+msgid "Holidays Management"
+msgstr ""
+
+#. module: profile_service
+#: help:profile.service.config.install_modules_wizard,crm_configuration:0
+msgid ""
+"This installs the customer relationship features like: leads and "
+"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
+"on."
+msgstr ""
+
+#. module: profile_service
+#: view:profile.service.config.install_modules_wizard:0
+msgid "Install"
+msgstr ""
+
+#. module: profile_service
+#: field:profile.service.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr ""
+
+#. module: profile_service
+#: model:ir.model,name:profile_service.model_profile_service_config_install_modules_wizard
+msgid "profile.service.config.install_modules_wizard"
+msgstr ""
+
+#. module: profile_service
+#: view:profile.service.config.install_modules_wizard:0
+msgid "Install Extra Module"
+msgstr ""
+
+#. module: profile_service
+#: help:profile.service.config.install_modules_wizard,project_timesheet:0
+msgid ""
+"Timesheets allows you to track time and costs spent on different projects, "
+"represented by analytic accounts."
+msgstr ""
+
+#. module: profile_service
+#: field:profile.service.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: profile_service
+#: field:profile.service.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: profile_service
+#: field:profile.service.config.install_modules_wizard,hr_timesheet_invoice:0
+msgid "Invoice on Timesheets"
+msgstr ""
+
+#. module: profile_service
+#: field:profile.service.config.install_modules_wizard,base_contact:0
+msgid "Advanced Contacts Management"
+msgstr ""
+
+#. module: profile_service
+#: help:profile.service.config.install_modules_wizard,wiki:0
+msgid ""
+"An integrated wiki content management system. This is really usefull to "
+"manage FAQ, quality manuals, etc."
+msgstr ""
+
+#. module: profile_service
+#: help:profile.service.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks the personal expenses process, from the employee expense encoding, to "
+"the reimbursement of the employee up to the reinvoicing to the final "
+"customer."
+msgstr ""
+
+#. module: profile_service
+#: field:profile.service.config.install_modules_wizard,scrum:0
+msgid "Scrum Methodology"
+msgstr ""
+
+#. module: profile_service
+#: field:profile.service.config.install_modules_wizard,project_mrp:0
+msgid "Sales Management"
+msgstr ""
+
+#. module: profile_service
+#: model:ir.module.module,description:profile_service.module_meta_information
+msgid "Profile for service companies"
+msgstr ""
+
+#. module: profile_service
+#: view:profile.service.config.install_modules_wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: profile_service
+#: help:profile.service.config.install_modules_wizard,base_contact:0
+msgid ""
+"Allows you to manage partners (enterprises), addresses of partners and "
+"contacts of these partners (employee/people). Install this if you plan to "
+"manage your relationships with partners and contacts, with contacts having "
+"different jobs in different companies."
+msgstr ""
diff --git a/addons/profile_service/profile_service.py b/addons/profile_service/profile_service.py
index a3c1a981d62..5aee039bc09 100644
--- a/addons/profile_service/profile_service.py
+++ b/addons/profile_service/profile_service.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -24,6 +24,7 @@ import pooler
 
 class profile_service_config_install_modules_wizard(osv.osv_memory):
     _name='profile.service.config.install_modules_wizard'
+    _inherit = 'res.config'
     _rec_name = 'crm_configuration'
     _columns = {
         'crm_configuration':fields.boolean('CRM & Calendars', help="This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."),
@@ -46,31 +47,16 @@ class profile_service_config_install_modules_wizard(osv.osv_memory):
             help="An integrated wiki content management system. This is really "\
                 "useful to manage FAQ, quality manuals, etc.")
     }
-    def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
-    def action_install(self, cr, uid, ids, context=None):
-        result=self.read(cr,uid,ids)
+    def execute(self, cr, uid, ids, context=None):
+        result = self.read(cr, uid, ids)
         mod_obj = self.pool.get('ir.module.module')
         for res in result:
             for r in res:
-                if r<>'id' and res[r]:
+                if r != 'id' and res[r]:
                     ids = mod_obj.search(cr, uid, [('name', '=', r)])
-                    mod_obj.button_install(cr,uid,ids,context=context)
+                    mod_obj.button_install(cr, uid, ids, context=context)
         cr.commit()
         db, pool = pooler.restart_pool(cr.dbname, update_module=True)
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-            }
 profile_service_config_install_modules_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml
index e1533ead011..94a967d1840 100644
--- a/addons/profile_service/profile_service.xml
+++ b/addons/profile_service/profile_service.xml
@@ -5,32 +5,37 @@
             <field name="name">Service Profile : Install extra modules</field>
             <field name="model">profile.service.config.install_modules_wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Install Extra Module">
-                    <separator string="Services Management" colspan="4"/>
-                    <field name="project_timesheet"/>
-                    <field name="hr_timesheet_invoice"/>
-                    <field name="project_gtd"/>
-                    <field name="scrum"/>
-                    <field name="project_mrp"/>
-                    <separator string="Resources Management" colspan="4"/>
-                    <field name="hr_holidays"/>
-                    <field name="hr_expense"/>
-                    <field name="account_budget_crossover"/>
-                    <separator string="Relationship Management" colspan="4"/>
-                    <field name="crm_configuration"/>
-                    <field name="base_contact"/>
-                    <field name="board_document"/>
-                    <separator string="Portal Management" colspan="4"/>
-                    <field name="portal"/>
-                    <field name="wiki"/>
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="2"/>
-                    <group col="4" colspan="2">
-                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                        <button name="action_install" string="Install" icon='gtk-ok' type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Install Extra Modules
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    A few modules are proposed according to the
+                    'service profile' you selected. You will be able to
+                    install them or more modules later through the
+                    Administration menu."/>
+                  <separator string="Services Management" colspan="4"/>
+                  <field name="project_timesheet"/>
+                  <field name="hr_timesheet_invoice"/>
+                  <field name="project_gtd"/>
+                  <field name="scrum"/>
+                  <field name="project_mrp"/>
+                  <separator string="Resources Management" colspan="4"/>
+                  <field name="hr_holidays"/>
+                  <field name="hr_expense"/>
+                  <field name="account_budget_crossover"/>
+                  <separator string="Relationship Management" colspan="4"/>
+                  <field name="crm_configuration"/>
+                  <field name="base_contact"/>
+                  <field name="board_document"/>
+                  <separator string="Portal Management" colspan="4"/>
+                  <field name="portal"/>
+                  <field name="wiki"/>
+                </group>
+              </data>
             </field>
         </record>
 
@@ -38,6 +43,7 @@
             <field name="name">Service Profile : Install Extra Modules</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">profile.service.config.install_modules_wizard</field>
+            <field name="view_id" ref="view_confirm_install_module_form"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -45,8 +51,6 @@
 
       <record model="ir.actions.todo"
             id="config_install_module">
-            <field name="name">Service Profile : Install Extra modules</field>
-            <field name="note">A few modules are proposed according to the 'service profile' you selected. You will be able to install them or more modules later through the Administration menu.</field>
             <field name="action_id" ref="action_config_install_module"/>
         </record>
 
diff --git a/addons/project/__init__.py b/addons/project/__init__.py
index 9fc558dcfde..6347cd9dd29 100644
--- a/addons/project/__init__.py
+++ b/addons/project/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -15,16 +15,16 @@
 #    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 project
 import company
+import installer
 import project_mailgate
 import report
 import wizard
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py
index 1a11e64f134..5c7030a8acb 100644
--- a/addons/project/__terp__.py
+++ b/addons/project/__terp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,23 +26,23 @@
     "author" : "Tiny",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Projects & Services",
-    "depends" : ["product", "account", "hr", "process", "mail_gateway"],
+    "depends" : ["product", "account", "hr", "process", "mail_gateway","hr_timesheet_sheet","report_timesheet","account_budget"],
     "description": """Project management module that track multi-level projects, tasks,
 works done on tasks, eso. It is able to render planning, order tasks, eso.
     """,
     "init_xml" : [],
-    "demo_xml" : ["project_demo.xml"],
     "update_xml": [
         "security/project_security.xml",
         "security/ir.model.access.csv",
-        "project_data.xml", 
-        "project_wizard.xml", 
-        "project_view.xml", 
-        "project_report.xml", 
-        "process/task_process.xml"
+        "project_data.xml",
+        "project_wizard.xml",
+        "project_view.xml",
+        "project_report.xml",
+        "process/task_process.xml",
+        "project_installer.xml",
     ],
-    'demo_xml': [#'project_demo.xml'
-    
+    'demo_xml': [
+        'project_demo.xml'
     ],
     'installable': True,
     'active': False,
diff --git a/addons/project/company.py b/addons/project/company.py
index 1a39acf8c77..52b037b5890 100644
--- a/addons/project/company.py
+++ b/addons/project/company.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index a646632dd5d..bbb6c2d0be9 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/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-11-17 10:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-25 21:17+0000\n"
+"Last-Translator: marath <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: 2009-12-16 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-01-26 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -84,7 +84,7 @@ msgstr "Подпроект"
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr ""
+msgstr "Участники проекта"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
@@ -117,7 +117,7 @@ msgstr "Важность"
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Update"
-msgstr ""
+msgstr "Обновить"
 
 #. module: project
 #: help:project.task.delegate,init,user_id:0
@@ -148,7 +148,7 @@ msgstr "Типы заданий"
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr ""
+msgstr "Новый проект на основе шаблона"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
@@ -187,7 +187,7 @@ msgstr ""
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr ""
+msgstr "Черновик задания"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -210,17 +210,17 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
-msgstr "Примечания"
+msgstr "Записи"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Days"
-msgstr ""
+msgstr "Дней"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_analysis
 msgid "Analysis"
-msgstr ""
+msgstr "Анализ"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -233,7 +233,7 @@ msgstr "Проект"
 #. module: project
 #: view:project.task:0
 msgid "Start Task"
-msgstr ""
+msgstr "Запуск задания"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_draft
@@ -292,7 +292,7 @@ msgstr ""
 #. module: project
 #: help:project.task.delegate,init,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user."
-msgstr ""
+msgstr "Повторно включать описание задания в задание пользователя."
 
 #. module: project
 #: field:project.project,category_id:0
@@ -314,7 +314,7 @@ msgstr "Все задания"
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Планирование"
 
 #. module: project
 #: view:project.task:0
@@ -325,7 +325,7 @@ msgstr "Доп. информация"
 #: field:project.project,partner_id:0
 #: field:project.task,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Партнер"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -341,7 +341,7 @@ msgstr "Задание: %(name)s"
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr ""
+msgstr "Сбросить как проект"
 
 #. module: project
 #: view:project.task:0
@@ -353,6 +353,8 @@ msgstr "Делегированные"
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
 msgstr ""
+"Участников проекта. Не использовать в расчетах, только в информационных "
+"целях."
 
 #. module: project
 #: view:project.project:0
@@ -363,7 +365,7 @@ msgstr "Мои проекты"
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 msgid "All projects"
-msgstr ""
+msgstr "Все проекты"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -374,7 +376,7 @@ msgstr ""
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegated Task"
-msgstr "Делегированная задание"
+msgstr "Порученное задание"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -384,17 +386,17 @@ msgstr ""
 #. module: project
 #: wizard_field:project.task.delegate,init,new_task_description:0
 msgid "New Task Description"
-msgstr ""
+msgstr "Новое описание задания"
 
 #. module: project
 #: help:project.project,notes:0
 msgid "Internal description of the project."
-msgstr ""
+msgstr "Внутреннее описание проекта."
 
 #. module: project
 #: field:project.project,parent_id:0
 msgid "Parent Project"
-msgstr ""
+msgstr "Основной проект"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -416,13 +418,13 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task5_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog
 msgid "My Current Tasks"
-msgstr ""
+msgstr "Мои текущие задания"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project
 #: model:ir.ui.menu,name:project.menu_open_view_project
 msgid "New Project"
-msgstr ""
+msgstr "Новый проект"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -444,7 +446,7 @@ msgstr "Тип проектного задания"
 #. module: project
 #: field:project.project,planned_hours:0
 msgid "Planned Time"
-msgstr ""
+msgstr "Запланированное время"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -456,7 +458,7 @@ msgstr "Работа по заданию"
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Hours"
-msgstr ""
+msgstr "Часов"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_pending
@@ -480,13 +482,13 @@ msgstr "Неназначенные задания"
 #. module: project
 #: wizard_field:project.task.delegate,init,name:0
 msgid "Delegated Title"
-msgstr ""
+msgstr "Название поручения"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project
 #: model:ir.ui.menu,name:project.menu_open_view_my_project
 msgid "My Projects"
-msgstr ""
+msgstr "Мои проекты"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours:0
@@ -498,19 +500,19 @@ msgstr ""
 #. module: project
 #: selection:project.project,state:0
 msgid "Template"
-msgstr ""
+msgstr "Шаблон"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
 #: view:res.company:0
 msgid "Configuration"
-msgstr "Настройки"
+msgstr "Конфигурация"
 
 #. module: project
 #: field:project.project,date_start:0
 #: field:project.task,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Дата начала"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_all_project
@@ -531,7 +533,7 @@ msgstr "Описание задания"
 #. module: project
 #: model:process.node,name:project.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Триггер счета"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -1153,7 +1155,7 @@ msgstr "Предположительное окончание"
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr ""
+msgstr "Поручить ваше задание другому пользователю"
 
 #. module: project
 #: view:project.project:0
@@ -1165,4 +1167,4 @@ msgstr "Нижняя часть письма"
 #: model:ir.actions.act_window,name:project.open_view_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
-msgstr ""
+msgstr "Запущенные проекты"
diff --git a/addons/project/installer.py b/addons/project/installer.py
new file mode 100644
index 00000000000..d6a56bd453c
--- /dev/null
+++ b/addons/project/installer.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+
+class project_installer(osv.osv_memory):
+    _name = 'project.installer'
+    _inherit = 'res.config.installer'
+
+    _columns = {
+        # Project Management
+        'project_long_term':fields.boolean('Long Term Planning'),
+        'project_wiki':fields.boolean('Specifications in a Wiki'),
+        'hr_timesheet_sheet':fields.boolean('Timesheets'),
+        'hr_timesheet_invoice':fields.boolean('Invoice Based on Hours'),
+        'account_budget':fields.boolean('Budgets'),
+        'project_messages':fields.boolean('Project Messages'),
+        'project_crm':fields.boolean('Issues Tracker & Features Requests'),
+        # Methodologies
+        'scrum':fields.boolean('SCRUM'),
+        'project_gtd':fields.boolean('Getting Things Done'),
+        }
+project_installer()
diff --git a/addons/project/project.py b/addons/project/project.py
index 0865c24857b..b5865f8bd94 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -27,10 +27,20 @@ from tools.translate import _
 from osv import fields, osv
 from tools.translate import _
 
-#from resource.faces import *
-#from resource.faces.lib import workbreakdown
-#from resource.faces.lib import generator
-#from resource.faces.lib import resource
+class project_task_type(osv.osv):
+    _name = 'project.task.type'
+    _description = 'Project task type'
+    _columns = {
+        'name': fields.char('Type', required=True, size=64, translate=True),
+        'description': fields.text('Description'),
+        'sequence': fields.integer('Sequence'),
+    }
+    _order = 'sequence'
+    
+    _defaults = {
+        'sequence': lambda *args: 1
+    }
+project_task_type()
 
 class project(osv.osv):
     _name = "project.project"
@@ -121,6 +131,8 @@ class project(osv.osv):
 #                                  help='The project can be in either if the states \'Template\' and \'Running\'.\n If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
 #                                 \n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'),
 #        'company_id': fields.many2one('res.company', 'Company'),
+#        'timesheet_id': fields.many2one('hr.timesheet.group', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"),
+        'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Allowed Task Types'),
      }
 
     _defaults = {
@@ -152,7 +164,7 @@ class project(osv.osv):
         return res
 
     def set_done(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'done'}, context=context)
+        self.write(cr, uid, ids, {'state':'close'}, context=context)
         return True
 
     def set_cancel(self, cr, uid, ids, context={}):
@@ -180,27 +192,29 @@ class project(osv.osv):
             default['name'] = proj.name+_(' (copy)')
         res = super(project, self).copy(cr, uid, id, default, context)
         ids = self.search(cr, uid, [('parent_id','child_of', [res])])
-        cr.execute('update project_task set active=True where project_id in ('+','.join(map(str, ids))+')')
+        if ids:
+            cr.execute('update project_task set active=True where project_id in ('+','.join(map(str, ids))+')')
         return res
 
     def duplicate_template(self, cr, uid, ids,context={}):
+        result = []
         for proj in self.browse(cr, uid, ids):
-            parent_id=context.get('parent_id',False)
-            new_id=self.pool.get('project.project').copy(cr, uid, proj.id,default={'name':proj.name+_(' (copy)'),'state':'open','parent_id':parent_id})
+            parent_id = context.get('parent_id',False)
+            new_id = self.pool.get('project.project').copy(cr, uid, proj.id, default = {
+                                    'name': proj.name +_(' (copy)'),
+                                    'state':'open',
+                                    'parent_id':parent_id})
+            result.append(new_id)
             cr.execute('select id from project_task where project_id=%s', (proj.id,))
             res = cr.fetchall()
             for (tasks_id,) in res:
-                self.pool.get('project.task').copy(cr, uid, tasks_id,default={'project_id':new_id,'active':True}, context=context)
-            cr.execute('select id from project_project where parent_id=%s', (proj.id,))
-            res = cr.fetchall()
-            project_ids = [x[0] for x in res]
-            for child in project_ids:
-                self.duplicate_template(cr, uid, [child],context={'parent_id':new_id})
-
-        # TODO : Improve this to open the new project (using a wizard)
-
-        cr.commit()
-        raise osv.except_osv(_('Operation Done'), _('A new project has been created !\nWe suggest you to close this one and work on this new project.'))
+                self.pool.get('project.task').copy(cr, uid, tasks_id, default = {
+                                    'project_id': new_id,
+                                    'active':True}, context=context)
+            child_ids = self.search(cr, uid, [('parent_id','=', proj.id)])            
+            if child_ids:
+                self.duplicate_template(cr, uid, child_ids, context={'parent_id':new_id})
+        return result
 
     # set active value for a project, its sub projects and its tasks
     def setActive(self, cr, uid, ids, value=True, context={}):
@@ -210,22 +224,12 @@ class project(osv.osv):
             tasks_id = [x[0] for x in cr.fetchall()]
             if tasks_id:
                 self.pool.get('project.task').write(cr, uid, tasks_id, {'active': value}, context)
-            cr.execute('select id from project_project where parent_id=%s', (proj.id,))
-            project_ids = [x[0] for x in cr.fetchall()]
-            for child in project_ids:
-                self.setActive(cr, uid, [child], value, context)
+            child_ids = self.search(cr, uid, [('parent_id','=', proj.id)]) 
+            if child_ids:
+                self.setActive(cr, uid, child_ids, value, context)
         return True
 project()
 
-class project_task_type(osv.osv):
-    _name = 'project.task.type'
-    _description = 'Project task type'
-    _columns = {
-        'name': fields.char('Type', required=True, size=64, translate=True),
-        'description': fields.text('Description'),
-    }
-project_task_type()
-
 class task(osv.osv):
     _name = "project.task"
     _description = "Tasks"
@@ -239,10 +243,7 @@ class task(osv.osv):
 #                task_obj = self.pool.get('project.task').browse(cr,uid,task_ids)
 #                task_1 = task_obj[0]
 #                task_1.date_start = self.pool.get('project.project').browse(cr,uid,project_id[i]).date_start
-##                print '1st Date Start::::',task_1.date_start,type(task_1.date_start)
 #                dt = mx.DateTime.strptime(task_1.date_start,"%Y-%m-%d").strftime("%Y-%m-%d")
-##                print 'Hours:::::',task_1.planned_hours
-##                print 'Date',dt
 #                def Project_1():
 #                   title = "New Project"
 #                   start = dt
@@ -252,7 +253,6 @@ class task(osv.osv):
 #                       effort = task_1.planned_hours
 #                       title = "Task 1"
 ##                project_1 = BalancedProject(Project_1)
-##                print 'Title::::::',project_1.title
 ##                for t in project_1:
 ##                    print 'details:::',t.indent_name(), t.start, t.end, t.effort
 
@@ -333,11 +333,11 @@ class task(osv.osv):
      
     _columns = {
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the task without removing it."),
-        'name': fields.char('Task summary', size=128, required=True),
+        'name': fields.char('Task Summary', size=128, required=True),
         'description': fields.text('Description'),
         'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."),
-        'type': fields.many2one('project.task.type', 'Type'),
+        'type': fields.many2one('project.task.type', 'Type', readonly=True),
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the task is created the state \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
@@ -363,7 +363,7 @@ class task(osv.osv):
         'delegated_user_id': fields.related('child_ids','user_id',type='many2one', relation='res.users', string='Delegated To'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
-        'manager_id': fields.related('project_id','manager', type='many2one', relation='res.users', string='Project Manager'),
+        'manager_id': fields.related('project_id','category_id','user_id', type='many2one', relation='res.users', string='Project Manager'),
         'company_id': fields.many2one('res.company', 'Company'),
     }
     _defaults = {
@@ -492,6 +492,27 @@ class task(osv.osv):
         self.write(cr, uid, ids, {'state': 'pending'})
         return True
 
+    def next_type(self, cr, uid, ids, *args):
+        for typ in self.browse(cr, uid, ids):
+            typeid = typ.type.id
+            types = map(lambda x:x.id, typ.project_id.type_ids or [])
+            if types:
+                if not typeid:
+                    self.write(cr, uid, typ.id, {'type': types[0]})
+                elif typeid and typeid in types and types.index(typeid) != len(types)-1 :
+                    index = types.index(typeid)
+                    self.write(cr, uid, typ.id, {'type': types[index+1]})
+        return True
+
+    def prev_type(self, cr, uid, ids, *args):
+        for typ in self.browse(cr, uid, ids):
+            typeid = typ.type.id
+            types = map(lambda x:x.id, typ.project_id.type_ids)
+            if types:
+                if typeid and typeid in types and types.index(typeid) != 0 :
+                    index = types.index(typeid)
+                    self.write(cr, uid, typ.id, {'type': types[index-1]})
+        return True
 
 task()
 
@@ -569,10 +590,18 @@ class message(osv.osv):
 message()
 
 def _project_get(self, cr, uid, context={}):
-    obj = self.pool.get('project.project')
-    ids = obj.search(cr, uid, [])
-    res = obj.read(cr, uid, ids, ['id','name'], context)
-    res = [(str(r['id']),r['name']) for r in res]
+    if uid==1:
+        ids = self.pool.get('project.project').search(cr, uid, [])
+        res = self.pool.get('project.project').read(cr, uid, ids, ['id','name'], context)
+        res = [(str(r['id']),r['name']) for r in res]
+    else:
+        cr.execute("""SELECT project.id,account.name FROM project_project project
+                   LEFT JOIN account_analytic_account account ON account.id = project.category_id
+                   WHERE (account.user_id = %s) OR project.id IN (SELECT project_id FROM project_resource_rel
+                                                                 WHERE resource_id IN (SELECT id FROM resource_resource
+                                                                                       WHERE (user_id= %s)))"""%(uid, uid))
+        res = cr.fetchall()
+        res = [(str(r[0]),r[1]) for r in res]
     return res
 
 class users(osv.osv):
@@ -581,7 +610,6 @@ class users(osv.osv):
     _columns = {
         'context_project_id': fields.selection(_project_get, 'Project'),
         }
-
 users()
 
-# 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/project_demo.xml b/addons/project/project_demo.xml
index e762d3874ba..7b5d565fead 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -9,23 +9,30 @@
             <field name="project_time_mode_id" ref="product.uom_hour"></field>
         </record>
         
-        <record id="project_tt_analysis" model="project.task.type">
-            <field name="name">Analysis</field>
+		<!-- Task Types -->
+        <record id="project_tt_specification" model="project.task.type">
+            <field name="sequence">1</field>
+            <field name="name">Specification</field>
         </record>
-        <record id="project_tt_feature" model="project.task.type">
-            <field name="name">New Feature</field>
+        <record id="project_tt_development" model="project.task.type">
+            <field name="sequence">2</field>
+            <field name="name">Development</field>
         </record>
-        <record id="project_tt_quote" model="project.task.type">
-            <field name="name">Quotation</field>
+        <record id="project_tt_testing" model="project.task.type">
+        	<field name="sequence">3</field>
+            <field name="name">Testing</field>
         </record>
-        <record id="project_tt_bug" model="project.task.type">
-            <field name="name">Bug</field>
+        <record id="project_tt_merge" model="project.task.type">
+            <field name="sequence">4</field>
+            <field name="name">Merge</field>
         </record>
-
+		
+		<!-- Projects -->
         <record id="project_project_9" model="project.project">
             <field name="warn_manager">1</field>
             <field name="name">Open ERP Integration</field>
             <field name="manager" ref="base.user_root"/>
+            <field eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge')])]" name="type_ids"/>
         </record>
         <record id="project_project_21" model="project.project">
             <field name="warn_manager">1</field>
@@ -34,6 +41,7 @@
             <field name="name">Study + Prototype</field>
             <field model="account.analytic.account" name="category_id" search="[('name','=', 'Seagate P1')]"/>
             <field name="manager" ref="base.user_root"/>
+            <field eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development')])]" name="type_ids"/>
         </record>
         <record id="project_project_22" model="project.project">
             <field name="priority">20</field>
@@ -41,6 +49,7 @@
             <field name="name">Specific Developements</field>
             <field model="account.analytic.account" name="category_id" search="[('name','=', 'Seagate P1')]"/>
             <field name="manager" ref="base.user_root"/>
+            <field eval="[(6, 0, [ref('project_tt_specification'), ref('project_tt_development')])]" name="type_ids"/>
         </record>
         <record id="project_project_23" model="project.project">
             <field name="priority">30</field>
@@ -48,12 +57,14 @@
             <field name="name">Install, data import, configuration</field>
             <field model="account.analytic.account" name="category_id" search="[('name','=', 'Seagate P1')]"/>
             <field name="manager" ref="base.user_root"/>
+            <field eval="[(6, 0, [ref('project_tt_development')])]" name="type_ids"/>
         </record>
         
+		<!-- Tasks -->
         <record id="project_task_116" model="project.task">
             <field name="planned_hours">38.0</field>
             <field name="remaining_hours">38.0</field>
-            <field name="type" ref="project_tt_feature"/>
+            <field name="type" ref="project_tt_development"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="description">BoM, After sales returns, interventions. Tracability.</field>
@@ -62,7 +73,7 @@
         <record id="project_task_130" model="project.task">
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
-            <field name="type" ref="project_tt_feature"/>
+            <field name="type" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Data importation + Doc</field>
@@ -70,7 +81,7 @@
         <record id="project_task_131" model="project.task">
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
-            <field name="type" ref="project_tt_feature"/>
+            <field name="type" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Modifications asked by the customer.</field>
@@ -78,7 +89,7 @@
         <record id="project_task_184" model="project.task">
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
-            <field name="type" ref="project_tt_feature"/>
+            <field name="type" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project_project_21"/>
@@ -88,7 +99,7 @@
             <field name="sequence">15</field>
             <field name="planned_hours">8.0</field>
             <field name="remaining_hours">8.0</field>
-            <field name="type" ref="project_tt_feature"/>
+            <field name="type" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Internal testing + Software Install</field>
@@ -98,7 +109,7 @@
             <field name="sequence">17</field>
             <field name="planned_hours">16.0</field>
             <field name="remaining_hours">16.0</field>
-            <field name="type" ref="project_tt_feature"/>
+            <field name="type" ref="project_tt_development"/>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="priority">2</field>
             <field name="state">open</field>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
new file mode 100644
index 00000000000..4d8b40103c1
--- /dev/null
+++ b/addons/project/project_installer.xml
@@ -0,0 +1,69 @@
+<openerp>
+  <data>
+    <record id="view_project_installer" model="ir.ui.view">
+      <field name="name">project.installer.view</field>
+      <field name="model">project.installer</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="arch" type="xml">
+        <data>
+          <form position="attributes"><attribute name="string">
+              Project Modules Installation
+          </attribute></form>
+
+          <group string="res_config_contents" position="replace">
+            <separator string="Configure Your Project Management"
+                       colspan="4"/>
+            <image name="gtk-dialog-info"/>
+            <newline/>
+            <label align="0.0" string=" Lorem ipsum dolor
+                sit amet, consectetur adipiscing elit. Cras metus
+                augue, ultricies et vehicula id, fringilla quis
+                mauris. Vestibulum fringilla ipsum sit amet est
+                adipiscing eget euismod velit semper. Proin non mauris
+                velit. Donec malesuada nisi sed augue viverra commodo
+                sagittis nisi rutrum. Cras vitae libero nunc, a
+                molestie sapien. Proin et augue sit amet est egestas
+                fermentum ut eu lacus. Etiam nisi orci, volutpat
+                aliquam viverra interdum, vehicula iaculis
+                lectus. Mauris ligula sapien, auctor in pharetra non,
+                ultrices quis odio."/>
+            <group>
+              <separator string="Project Management" colspan="4"/>
+              <field name="project_long_term"/>
+              <field name="project_wiki"/>
+              <field name="hr_timesheet_sheet"/>
+              <field name="hr_timesheet_invoice"/>
+              <field name="account_budget"/>
+              <field name="project_messages"/>
+              <field name="project_crm"/>
+              <separator string="Methodologies" colspan="4"/>
+              <field name="scrum"/>
+              <field name="project_gtd"/>
+            </group>
+          </group>
+
+          <xpath expr='//button[@name="action_skip"]' position='replace'/>
+          <xpath expr='//button[@name="action_next"]' position='attributes'>
+            <attribute name='string'>Install Modules</attribute>
+          </xpath>
+        </data>
+      </field>
+    </record>
+
+    <record id="action_project_installer" model="ir.actions.act_window">
+      <field name="name">Project Modules Installation</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">project.installer</field>
+      <field name="view_id" ref="view_project_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="project_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_project_installer"/>
+      <field name="sequence">1</field>
+    </record>
+  </data>
+</openerp>
diff --git a/addons/project/project_mailgate.py b/addons/project/project_mailgate.py
index 90315c02aa2..93c9732c720 100644
--- a/addons/project/project_mailgate.py
+++ b/addons/project/project_mailgate.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5dffaac2b34..55819fb911b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -2,8 +2,25 @@
 <openerp>
     <data>
         <menuitem icon="terp-project" id="menu_main" name="Project Management"/>
-        <menuitem id="menu_tasks" name="Tasks" parent="menu_main"/>
-        <menuitem id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="1"/>
+         <menuitem id="menu_project_management" name="Project Management" parent="menu_main" sequence="1"/>
+        <!-- <menuitem id="menu_tasks" name="Tasks" parent="menu_main"/>-->
+
+        <menuitem id="menu_pm_invoicing" name="Invoicing" parent="menu_main" sequence="7"/>
+        <menuitem id="menu_pm_budget" name="Budgets" parent="menu_pm_invoicing"/>
+        <menuitem action="account_budget.open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
+        <menuitem parent="menu_pm_budget"
+             id="menu_act_pm_crossovered_budget_view"
+             action="account_budget.act_crossovered_budget_view" />
+         <menuitem id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="60"/>
+         <!--Time Tracking menu-->
+ 		<menuitem
+             id="menu_project_management_time_tracking"
+             name="Time Tracking"
+             parent="menu_main" sequence="3"/>
+         <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="menu_project_management_time_tracking"
+             groups="hr.group_hr_manager"/>
+        <menuitem action="report_timesheet.action_random_timesheet_lines_board" id="menu_project_management_timesheet_lines_board" parent="menu_project_management_time_tracking"/>
+        <menuitem action="hr_attendance.si_so" id="menu_project_management_si_so" parent="menu_project_management_time_tracking" type="wizard"/>
 
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
@@ -41,9 +58,9 @@
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_done" string="Done" type="object" states="open,pending" icon="gtk-jump-to"/>
                                 <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
-                                <button name="duplicate_template"
+                                <button 
                                     string="New Project Based on Template"
-                                    type="object"
+                                    name="%(wizard_duplicate_template)d"  type="action" 
                                     states="template" icon="gtk-new"/>
                             </group>
                         </page>
@@ -66,22 +83,9 @@
                                 <label string="Date Stop: %%(date_stop)s"/>
                             </group>
                         </page>
-                        <page string="Tasks">
-                           <field name="tasks" nolabel="1" attrs="{'readonly':[('state','in',['cancelled','done'])]}">
-                           <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">
-                           <!--    <tree string="Tasks">-->
-                                   <field name="sequence"/>
-                                   <field name="name"/>
-                                   <field name="user_id" string="Project Manager"/>
-                                   <field name="date_deadline"/>
-                                   <field name="planned_hours" sum="Planned" widget="float_time"/>
-                                   <field name="delay_hours" sum="Delay" widget="float_time"/>
-                                   <field name="progress" widget="progressbar"/>
-                                   <field name="priority"/>
-                                   <field name="state"/>
-                                   <field name="remaining_hours" invisible="1"/>
-                                   </tree>
-                           </field>
+                        <page string="Tasks" groups="base.group_extended">
+                           <separator string="Task Types"/>
+                           <field nolabel="1" name="type_ids" colspan="4"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="description" nolabel="1"/>
@@ -144,17 +148,17 @@
                 </tree>
             </field>
         </record>
-        <menuitem id="menu_all_project" parent="project.menu_main" name="Projects"/>
+        <!--<menuitem id="menu_all_project" parent="project.menu_main" name="Projects"/> -->
 
         <record id="open_view_project_all" model="ir.actions.act_window">
-            <field name="name">All projects</field>
+            <field name="name">Projects</field>
             <field name="res_model">project.project</field>
             <field name="view_type">form</field>
             <field name="domain">[]</field>
             <field name="view_id" ref="view_project"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
         </record>
-        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_all_project"/>
+        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
 
         <record id="open_view_template_project" model="ir.actions.act_window">
             <field name="name">Templates of Projects</field>
@@ -163,8 +167,9 @@
             <field name="domain">[('state','=','template')]</field>
             <field name="view_id" ref="view_project"/>
         </record>
-        <menuitem action="open_view_template_project" id="menu_template_project" parent="project.menu_definitions"/>
-
+        <!--<menuitem action="open_view_template_project" id="menu_template_project" parent="project.menu_definitions"/>-->
+		<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>
             <field name="model">project.task.work</field>
@@ -218,10 +223,10 @@
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_id" ref="view_my_project"/>
         </record>
-        <menuitem
+        <!--<menuitem
             action="open_view_my_project_open"
             id="menu_open_view_my_project_open"
-            parent="project.menu_all_project"/>
+            parent="project.menu_all_project"/>-->
 
     <!-- Wizard for compute remaining hours -->
 
@@ -289,10 +294,10 @@
                             <field colspan="4" name="description" nolabel="1" select="2"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
                             <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['draft','done'])]}">
                                 <tree string="Task Work" editable="top">
-                                    <field name="date" />
-                                    <field name="user_id" />
-                                    <field name="hours" widget="float_time" />
                                     <field name="name" />
+                                    <field name="hours" widget="float_time" />
+                                    <field name="user_id" />
+                                    <field name="date" />
                                 </tree>
                             </field>
                             <newline/>
@@ -305,7 +310,6 @@
                                 <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
                                 <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
-
                             </group>
                         </page>
                         <page groups="base.group_extended" string="Delegations">
@@ -325,7 +329,7 @@
                             </field>
                             <field colspan="4" name="history" nolabel="1"/>
                         </page>
-                        
+
                         <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
                             <group colspan="2" col="2">
                                 <separator string="Planning" colspan="2"/>
@@ -334,14 +338,17 @@
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Dates" colspan="2"/>
-                                <field name="date_start" select="2"/>
                                 <field name="date_close" select="2"/>
                             </group>
                             <separator string="Miscelleanous" colspan="4"/>
-                            <field name="type" widget="selection"/>
-                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                            <field name="active" select="2"/>
                             <field name="partner_id" select="2"/>
+                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                            <group col="4" colspan="2">
+                                <field name="type" widget="selection" />
+	    						<button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Type"/>
+                                <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Type"/>
+	                        </group>
+                            <field name="active" select="2"/>
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
@@ -356,12 +363,14 @@
             <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" string="Seq."/>
+                    <field name="sequence" invisible="1"/>
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent"/>
                     <field name="user_id"/>
                     <field name="date_deadline"/>
                     <field name="remaining_hours" widget="float_time"/>
+                    <field name="type"/>
+                    <button name="next_type" states="draft,open,pending" string="Change Type" type="object" icon="gtk-go-forward" help="Change Type"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="state"/>
                     <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state"/>
@@ -461,89 +470,41 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                <search string="Task Edition">
-                    <group col="8" colspan="4">
+                    <group col="20" colspan="4">
                         <filter string="Draft" domain="[('state','=','draft')]" help="Draft Tasks" icon="terp-project"/>
-                        <filter string="Open" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
+                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Tasks" icon="terp-project"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="project_id" select="1" widget="selection">
                              <filter domain="[('manager_id','=',False)]" help="Unassigned Project" icon="terp-project"/>
                         </field>
-                    </group>
-                    <group col="4" colspan="1">
                         <field name="user_id" select="1" widget="selection">
-                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute"/>
-                            <filter domain="[('user_id', 'child_of', [uid])]" help="My Department tasks" icon="gtk-execute" separator="1"/>
+                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" default="1"/>
                             <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
                         </field>
                     </group>
+                    <group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="By Users" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="By Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="By Type" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
+                    </group>
                 </search>
             </field>
         </record>
 
         <record id="action_view_task" model="ir.actions.act_window">
-            <field name="name">All Tasks</field>
+            <field name="name">Tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,gantt,graph</field>
             <field eval="False" name="view_id"/>
             <field eval="True" name="filter"/>
-        </record>
-        <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_tasks"/>
-
-        <record id="action_view_task_department" model="ir.actions.act_window">
-            <field name="name">My Department Tasks</field>
-            <field name="res_model">project.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,gantt,graph</field>
-            <field eval="True" name="filter"/>
-            <field name="domain">[('user_id', 'child_of', [uid])]</field>
-            <field eval="True" name="filter"/>
-            <field name="search_view_id" ref="view_task_search_form"/>
-        </record>
-
-        <record id="action_view_task5_departments_pending" model="ir.actions.act_window">
-            <field name="name">My Department's Pending Tasks</field>
-            <field name="res_model">project.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('user_id', 'child_of', [uid]),('state','=','pending')]</field>
-            <field name="view_id" ref="my_pending_task"/>
-           <field name="filter" eval="True"/>
-           <field name="search_view_id" ref="view_task_search_form"/>
-        </record>
-
-        <record id="action_view_task5_departments_prog" model="ir.actions.act_window">
-            <field name="name">My Department's Current Tasks</field>
-            <field name="res_model">project.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field eval="True" name="filter"/>
-            <field name="domain">[('user_id', 'child_of', [uid]),('state','in',('open','draft'))]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_task_search_form"/>
-        </record>
-
-        <record id="action_view_task5_departments_prog_prog" model="ir.actions.act_window">
-            <field name="name">My Department's Tasks in Progress</field>
-            <field name="res_model">project.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('user_id', 'child_of', [uid]),('state','=','open')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_task_search_form"/>
-        </record>
-
-        <record id="action_view_task5_departments_prog_draft" model="ir.actions.act_window">
-            <field name="name">My Department's Draft Tasks</field>
-            <field name="res_model">project.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('user_id', 'child_of', [uid]),('state','=','draft')]</field>
-            <field name="filter" eval="True"/>
+            <field name="view_id" ref="view_task_tree2"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
+        <!--<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_tasks"/> -->
+		<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" name="Tasks" sequence="2"/>
 
         <record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
             <field name="name">Overpassed Tasks</field>
@@ -555,26 +516,6 @@
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
 
-        <record id="action_view_task6_prog" model="ir.actions.act_window">
-            <field name="name">Tasks in Progress</field>
-            <field name="res_model">project.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph,gantt</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_task_search_form"/>
-            <field name="domain">[('state','=','open')]</field>
-        </record>
-menu_main
-        <record id="action_view_task7" model="ir.actions.act_window">
-            <field name="name">Unassigned Tasks</field>
-            <field name="res_model">project.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph,gantt</field>
-            <field name="domain">[('user_id', '=', False)]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_task_search_form"/>
-        </record>
-
         <!-- Opening task when double clicking on project -->
         <record id="dblc_proj" model="ir.actions.act_window">
             <field name="res_model">project.task</field>
@@ -599,7 +540,8 @@ menu_main
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Task type">
-                    <field colspan="4" name="name" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="sequence"/>
                     <field colspan="4" name="description" select="1"/>
                 </form>
             </field>
@@ -610,6 +552,7 @@ menu_main
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Task type">
+                	<field name="sequence"/>
                     <field name="name"/>
                 </tree>
             </field>
@@ -636,7 +579,7 @@ menu_main
         <act_window
             domain="[('project_id', '=', active_id)]"
             id="act_project_project_2_project_task_all"
-            name="All Tasks"
+            name="Tasks"
             res_model="project.task"
             src_model="project.project"
             view_mode="tree,form,calendar,graph"
@@ -734,12 +677,12 @@ menu_main
             <field name="view_id" ref="view_project_message_tree"/>
        </record>
 
-		<menuitem id="menu_message_main" name="Message" parent="menu_main"/>
-        <menuitem action="action_view_project_messages_tree" id="menu_message_tree" parent="menu_message_main"/>
+		<!--<menuitem id="menu_message_main" name="Message" parent="menu_main"/>-->
+        <menuitem action="action_view_project_messages_tree" id="menu_message_tree" parent="menu_project_management" sequence="11"/>
 
         <act_window domain="[('user_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
 
         <act_window domain="[('user_id', '=', active_id),('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project/project_wizard.xml b/addons/project/project_wizard.xml
index 109a003da4a..a9b7ade39b5 100644
--- a/addons/project/project_wizard.xml
+++ b/addons/project/project_wizard.xml
@@ -3,6 +3,10 @@
     <data>
         <wizard id="wizard_close_task" menu="False" model="project.task" name="project.task.close" string="Close Task"/>
         <wizard id="wizard_delegate_task" menu="False" model="project.task" name="project.task.delegate" string="Delegate Task"/>
-        <wizard id="wizard_attachment_task" model="project.task" name="project.task.attachment" string="All Attachments"/>
+        <wizard 
+            id="wizard_duplicate_template" 
+            menu="False" 
+            model="project.project" 
+            name="project.duplicate.template" string="Duplicate Template"/>
     </data>
 </openerp>
diff --git a/addons/project/report/__init__.py b/addons/project/report/__init__.py
index 9756c402c6a..214059ca619 100644
--- a/addons/project/report/__init__.py
+++ b/addons/project/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project/report/_date_compute.py b/addons/project/report/_date_compute.py
index a1a10541695..1d44bd5c3cf 100644
--- a/addons/project/report/_date_compute.py
+++ b/addons/project/report/_date_compute.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project/report/gantt.py b/addons/project/report/gantt.py
index d92b95f36a2..ad69233240d 100644
--- a/addons/project/report/gantt.py
+++ b/addons/project/report/gantt.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project/report/gantt_report.py b/addons/project/report/gantt_report.py
index cb6782b603d..b07f40c1a33 100644
--- a/addons/project/report/gantt_report.py
+++ b/addons/project/report/gantt_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 064b9bec27a..6d862a8dbc6 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -44,7 +44,7 @@
         <field name="global" eval="True"/>
     </record>
  	<record id="project_task_rule" model="ir.rule">
-        <field name="domain_force">['|',('project_id','=',False),('project_id','=',user.context_project_id)]</field>
+        <field name="domain_force">['|',('project_id','=',False),('project_id','in',[user.context_project_id])]</field>
         <field name="rule_group" ref="project_task_rule_group"/>
     </record>
 
@@ -54,7 +54,7 @@
         <field name="global" eval="True"/>
     </record>
  	<record id="project_task_work_rule" model="ir.rule">
-        <field name="domain_force">['|',('task_id.project_id','=',False),('task_id.project_id','=',user.context_project_id)]</field>
+        <field name="domain_force">['|',('task_id.project_id','=',False),('task_id.project_id','in',[user.context_project_id])]</field>
         <field name="rule_group" ref="project_task_work_rule_group"/>
     </record>
 
@@ -64,7 +64,7 @@
         <field name="global" eval="True"/>
     </record>
  	<record id="project_project_rule" model="ir.rule">
-        <field name="domain_force">['|',('id','=',False),('id','=',user.context_project_id)]</field>
+        <field name="domain_force">['|',('id','=',False),('id','in',[user.context_project_id])]</field>
         <field name="rule_group" ref="project_project_rule_group"/>
     </record>
 
@@ -74,7 +74,7 @@
         <field name="global" eval="True"/>
     </record>
  	<record id="project_message_rule" model="ir.rule">
-        <field name="domain_force">['|',('project_id','=',False),('project_id','=',user.context_project_id)]</field>
+        <field name="domain_force">['|',('project_id','=',False),('project_id','in',[user.context_project_id])]</field>
         <field name="rule_group" ref="project_message_rule_group"/>
     </record>
 
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index 77e5f11171d..b724bd6e7ca 100644
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -21,7 +21,7 @@
 
 import close_task
 import task_delegate
-import task_attachment
+import duplicate_template_wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project/wizard/close_task.py b/addons/project/wizard/close_task.py
index 69dee7f3a18..f577929a8f6 100644
--- a/addons/project/wizard/close_task.py
+++ b/addons/project/wizard/close_task.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project/wizard/duplicate_template_wizard.py b/addons/project/wizard/duplicate_template_wizard.py
new file mode 100644
index 00000000000..27a4ec4bd7d
--- /dev/null
+++ b/addons/project/wizard/duplicate_template_wizard.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2010 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/>.
+#
+##############################################################################
+
+from mx.DateTime import now
+
+import wizard
+import netsvc
+import ir
+import pooler
+import time
+
+from tools.translate import _
+
+class project_duplicate_template(wizard.interface):
+
+    def duplicate_template(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        project_obj = pool.get('project.project')
+        res = project_obj.duplicate_template(cr, uid, data['ids'])        
+        if res and len(res):
+            res_id = res[0]        
+            data_obj = pool.get('ir.model.data')                        
+            form_view_id = data_obj._get_id(cr, uid, 'project', 'edit_project')
+            form_view = data_obj.read(cr, uid, form_view_id, ['res_id']) 
+            tree_view_id = data_obj._get_id(cr, uid, 'project', 'view_project_list')
+            tree_view = data_obj.read(cr, uid, tree_view_id, ['res_id']) 
+            search_view_id = data_obj._get_id(cr, uid, 'project', 'view_project_project_filter')
+            search_view = data_obj.read(cr, uid, search_view_id, ['res_id'])                        
+            return {            
+                'name': _('Projects'),
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'project.project',
+                'view_id': False,
+                'res_id' : res_id,
+                'views': [(form_view['res_id'],'form'),(tree_view['res_id'],'tree')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': search_view['res_id']
+                }
+        return {}
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'action', 'action': duplicate_template, 'state': 'order'}
+        },
+        'order': {
+            'actions': [],
+            'result': {'type': 'state', 'state': 'end'}
+        }
+    }
+project_duplicate_template('project.duplicate.template')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py
index ed1aa1b65f8..35fe2019ea6 100644
--- a/addons/project/wizard/task_delegate.py
+++ b/addons/project/wizard/task_delegate.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -63,7 +63,7 @@ class wizard_delegate(wizard.interface):
             'child_ids': [],
             'work_ids': []
         })
-        task_obj.write(cr, uid, data['id'], {
+        task_obj.write(cr, uid, [data['id']], {
             'remaining_hours': data['form']['planned_hours_me'],
             'name': newname
         })
diff --git a/addons/project_calendar/__init__.py b/addons/project_calendar/__init__.py
index 08bcccf6426..6cd8cd53857 100644
--- a/addons/project_calendar/__init__.py
+++ b/addons/project_calendar/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -20,6 +20,5 @@
 ##############################################################################
 
 import project_calendar
-import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_calendar/__terp__.py b/addons/project_calendar/__terp__.py
index cc314f5d873..dc091369928 100644
--- a/addons/project_calendar/__terp__.py
+++ b/addons/project_calendar/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -26,7 +26,7 @@
     "category" : "Generic Modules/Others", 
     "description": """ Synchronize between Project task and Caldav Vtodo.""", 
     "depends" : ["project", "caldav"], 
-    "init_xml" : [], 
+    "init_xml" : ["project_calendar_data.xml"], 
     "demo_xml" : [], 
     "update_xml" : ["project_calendar_view.xml", 
                                 "project_calendar_wizard.xml"], 
diff --git a/addons/project_calendar/project_calendar.py b/addons/project_calendar/project_calendar.py
index 1f1130ecbf5..11a6c080c31 100644
--- a/addons/project_calendar/project_calendar.py
+++ b/addons/project_calendar/project_calendar.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -19,219 +19,15 @@
 #
 ##############################################################################
 
-from caldav import common
-from datetime import datetime
 from osv import fields, osv
-from service import web_services
-import base64
-import re
-import time
 
 class project_task(osv.osv):
-    _inherit = "project.task"
-
+    _name = "project.task"
+    _inherit = ["calendar.todo", "project.task"]
     _columns = {
-                'class': fields.selection([('PUBLIC', 'PUBLIC'), ('PRIVATE', 'PRIVATE'), \
-                                             ('CONFIDENTIAL', 'CONFIDENTIAL')], 'Privacy'), 
-                'location' : fields.char('Location', size=264, help="Gives Location of Task"), 
-                'rrule' : fields.char('Recurrent Rule', size=352),
-                'exdate' : fields.text('Exception Date/Times', help="This property defines the list\
-                                 of date/time exceptions for arecurring calendar component."), 
-                'exrule' : fields.char('Exception Rule', size=352, help="defines a rule or repeating pattern\
-                                 for anexception to a recurrence set"), 
-               'attendee_ids': fields.many2many('crm.caldav.attendee', 'task_attendee_rel', 'case_id', \
-                                              'attendee_id', 'Attendees'), 
-               'alarm_id': fields.many2one('crm.caldav.alarm', 'Reminder'), 
-               'caldav_url': fields.char('Caldav URL', size=34), 
-    }
-    
-    __attribute__ = {
-        'class': {'field': 'class', 'type': 'text'}, 
-        'completed': {'field': 'date_close', 'type': 'datetime'}, 
-#        'created': {'field': 'field', 'type': 'text'}, 
-        'description': {'field': 'description', 'type': 'text'}, 
-#        'dtstamp': {'field': 'field', 'type': 'text'}, 
-        'dtstart': {'field': 'date_start', 'type': 'datetime'}, 
-        'duration': {'field': 'planned_hours', 'type': 'timedelta'}, 
-        'due': {'field': 'date_deadline', 'type': 'datetime'}, 
-#        'geo': {'field': 'field', 'type': 'text'}, 
-#        'last-mod ': {'field': 'field', 'type': 'text'}, 
-        'location': {'field': 'location', 'type': 'text'}, # To add
-        'organizer': {'field': 'partner_id', 'type': 'many2one', 'object': 'res.partner'}, 
-        'percent': {'field': 'progress_rate', 'type': 'int'}, 
-        'priority': {'field': 'priority', 'type': 'text'}, 
-#        'recurid': {'field': 'field', 'type': 'text'}, 
-        'seq': {'field': 'sequence', 'type': 'text'}, 
-        'status': {'field': 'state', 'type': 'selection', 'mapping': {'NEEDS-ACTION': 'draft', \
-                                              'COMPLETED': 'done', 'IN-PROCESS': 'open', \
-                                              'CANCELLED': 'cancelled'}}, 
-        'summary': {'field': 'name', 'type': 'text'}, 
-        'uid': {'field': 'id', 'type': 'int'}, 
-        'url': {'field': 'caldav_url', 'type': 'text'}, # To add 
-#        'attach': {'field': 'field', 'type': 'text'}, 
-        'attendee': {'field': 'attendee_ids', 'type': 'many2many', 'object': 'crm.caldav.attendee'}, 
-#        'categories': {'field': 'type', 'type': 'text'}, # Needs review 
-        'comment': {'field': 'notes', 'type': 'text'}, 
-#        'contact': {'field': 'field', 'type': 'text'}, 
-        'exdate'  : {'field':'exdate', 'type':'datetime'}, 
-        'exrule'  : {'field':'exrule', 'type':'text'}, 
-#        'rstatus': {'field': 'field', 'type': 'text'}, 
-#        'related': {'field': 'field', 'type': 'text'}, 
-#        'resources': {'field': 'field', 'type': 'text'}, 
-#        'rdate': {'field': 'field', 'type': 'text'}, 
-        'rrule': {'field': 'rrule', 'type': 'text'}, 
-        'valarm' : {'field':'alarm_id', 'type':'many2one', 'object' : 'crm.caldav.alarm'},
-                     }
+                'attendee_ids': fields.many2many('calendar.attendee', 'task_attendee_rel', 'task_id', 'attendee_id', 'Attendees'),
+                }
 
-    def import_cal(self, cr, uid, data, context={}):
-        file_content = base64.decodestring(data)
-        todo_obj = self.pool.get('caldav.todo')
-        todo_obj.__attribute__.update(self.__attribute__)
-        
-        attendee_obj = self.pool.get('caldav.attendee')
-        crm_attendee = self.pool.get('crm.caldav.attendee')
-        attendee_obj.__attribute__.update(crm_attendee.__attribute__)
-        
-        alarm_obj = self.pool.get('caldav.alarm')
-        crm_alarm = self.pool.get('crm.caldav.alarm')
-        alarm_obj.__attribute__.update(crm_alarm.__attribute__)
-
-        vals = todo_obj.import_ical(cr, uid, file_content)
-        for val in vals:
-            obj_tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
-            if not val.has_key('planned_hours'):
-                # 'Computes duration' in days
-                start = datetime.strptime(val['date_start'], '%Y-%m-%d %H:%M:%S')
-                end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S')
-                diff = end - start
-                plan = (diff.seconds/float(86400) + diff.days) * obj_tm.factor
-                val['planned_hours'] = plan
-            else:
-                # Converts timedelta into Project time unit
-                val['planned_hours'] = (val['planned_hours'].seconds/float(86400) + \
-                                        val['planned_hours'].days) * obj_tm.factor
-
-            is_exists = common.uid2openobjectid(cr, val['id'], self._name )
-            val.pop('id')
-            if is_exists:
-                self.write(cr, uid, [is_exists], val)
-            else:
-                case_id = self.create(cr, uid, val)
-        return {'count': len(vals)}
-    
-    def export_cal(self, cr, uid, ids, context={}):
-        task_data = self.read(cr, uid, ids, [], context ={'read': True})
-        todo_obj = self.pool.get('caldav.todo')
-        todo_obj.__attribute__.update(self.__attribute__)
-        
-        attendee_obj = self.pool.get('caldav.attendee')
-        attendee = self.pool.get('crm.caldav.attendee')
-        attendee_obj.__attribute__.update(attendee.__attribute__)
-        
-        alarm_obj = self.pool.get('caldav.alarm')
-        alarm = self.pool.get('crm.caldav.alarm')
-        alarm_obj.__attribute__.update(alarm.__attribute__)
-        
-        ical = todo_obj.export_ical(cr, uid, task_data, {'model': 'project.task'})
-        caendar_val = ical.serialize()
-        caendar_val = caendar_val.replace('"', '').strip()
-        return caendar_val
-
-    def read(self, cr, uid, ids, fields=None, context={},  load='_classic_read'):
-        """         logic for recurrent event
-         example : 123-20091111170822"""        
-        if context and context.has_key('read'):
-            return super(project_task, self).read(cr, uid, ids, fields=fields, context=context, \
-                                              load=load)
-        if not type(ids) == list :
-            # Called from code
-            return super(project_task, self).read(cr, uid, common.caldevIDs2readIDs(ids), \
-                                                      fields=fields, context=context, load=load)
-        else:
-            ids = map(lambda x:common.caldevIDs2readIDs(x), ids)
-
-        if fields and 'date_start' not in fields:
-            fields.append('date_start')
-        if not ids:
-            return []
-        result =  []
-        for read_id in ids:
-            res = super(project_task, self).read(cr, uid, read_id, fields=fields, context=context, load=load)
-            cr.execute("""select id, rrule, date_start, exdate \
-                                from project_task where id = %s""" % read_id)
-            data = cr.dictfetchall()[0]
-            if not data['rrule']:
-                strdate = ''.join((re.compile('\d')).findall(data['date_start']))
-                idval = str(common.caldevIDs2readIDs(data['id'])) + '-' + strdate
-                data['id'] = idval
-                res.update(data)
-                result.append(res)
-            else:
-                exdate = data['exdate'] and data['exdate'].split(',') or []
-                event_obj = self.pool.get('caldav.event')
-                rdates = event_obj.get_recurrent_dates(str(data['rrule']), exdate, data['date_start'])[:10]
-                for rdate in rdates:
-                    val = res.copy()
-                    idval = (re.compile('\d')).findall(rdate)
-                    val['date_start'] = rdate
-                    id = str(res['id']).split('-')[0]
-                    val['id'] = id + '-' + ''.join(idval)
-                    val1 = val.copy()
-                    result.append(val1)
-        return result
-
-    def search(self, cr, uid, args, offset=0, limit=None, order=None, 
-            context=None, count=False):
-        res = super(project_task, self).search(cr, uid, args, offset, 
-                limit, order, context, count)
-        return res
-
-    def write(self, cr, uid, ids, vals, context=None):
-        new_ids = []
-        for id in ids:
-            id = common.caldevIDs2readIDs(id)
-            if not id in new_ids:
-                new_ids.append(id)
-        res = super(project_task, self).write(cr, uid, new_ids, vals, context=context)
-        return res
-
-    def browse(self, cr, uid, ids, context=None, list_class=None, fields_process={}):
-        if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids        
-        select = map(lambda x:common.caldevIDs2readIDs(x), select)
-        res = super(project_task, self).browse(cr, uid, select, context, list_class, fields_process)        
-        if isinstance(ids, (str, int, long)):
-            return res and res[0] or False
-        return res
-    
-    def copy(self, cr, uid, id, default=None, context={}):
-        return super(project_task, self).copy(cr, uid, common.caldevIDs2readIDs(id), default, context)
-
-    def unlink(self, cr, uid, ids, context=None):
-        for id in ids:
-            if len(str(id).split('-')) > 1:
-                date_new = time.strftime("%Y-%m-%d %H:%M:%S", \
-                                 time.strptime(str(str(id).split('-')[1]), "%Y%m%d%H%M%S"))
-                for record in self.read(cr, uid, [common.caldevIDs2readIDs(id)], \
-                                            ['date', 'rrule', 'exdate']):
-                    if record['rrule']:
-                        exdate = (record['exdate'] and (record['exdate'] + ',' )  or '') + \
-                                    ''.join((re.compile('\d')).findall(date_new)) + 'Z'
-                        if record['date_start'] == date_new:
-                            self.write(cr, uid, [common.caldevIDs2readIDs(id)], {'exdate' : exdate})
-                    else:
-                        ids = map(lambda x:common.caldevIDs2readIDs(x), ids)
-                        return super(project_task, self).unlink(cr, uid, ids)
-            else:
-                return super(project_task, self).unlink(cr, uid, ids)
-
-    def create(self, cr, uid, vals, context={}):
-        if 'case_id' in vals:
-            vals['case_id'] = common.caldevIDs2readIDs(vals['case_id'])
-        return super(project_task, self).create(cr, uid, vals, context)
 project_task()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_calendar/project_calendar_data.xml b/addons/project_calendar/project_calendar_data.xml
new file mode 100644
index 00000000000..176feddd76f
--- /dev/null
+++ b/addons/project_calendar/project_calendar_data.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<openerp>
+	<data noupdate="1">
+		
+		<record model="basic.calendar.lines" id="caldav.calendar_lines_todo">
+			<field name="name">vtodo</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','project.task')]" />
+		</record>
+		
+		<record model="basic.calendar.fields" id="caldav.map_todo_1">
+			<field name="name" ref="base_calendar.field_todo_status" />
+			<field name="type_id" ref="caldav.calendar_lines_todo" />
+			<field name="field_id" search="[('name','=','state'),('model_id.model','=','project.task')]" />
+			<field name="mapping">{'needs-action': 'draft', 'completed': 'done', 'in-process': 'open', 'cancelled': 'cancelled'}</field>
+			<field name="fn">field</field>
+		</record>
+		
+		<record model="basic.calendar.fields" id="caldav.map_todo_3">
+			<field name="name" ref="base_calendar.field_todo_attendee" />
+			<field name="type_id" ref="caldav.calendar_lines_todo" />
+			<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','project.task')]" />
+			<field name="fn">field</field>
+		</record>
+		
+		<record model="basic.calendar.fields" id="caldav.map_todo_9">
+		    <field name="name" ref="base_calendar.field_todo_percent"/>
+		    <field name="type_id" ref="caldav.calendar_lines_todo" />
+			<field name="field_id" search="[('name','=','progress'),('model_id.model','=','project.task')]" />
+			<field name="fn">field</field>
+		</record>
+		
+		<record model="basic.calendar.fields" id="caldav.map_todo_12">
+			<field name="name" ref="base_calendar.field_event_priority"/>
+			<field name="type_id" ref="caldav.calendar_lines_todo" />
+			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','project.task')]" />
+			<field name="fn">field</field>
+		</record>
+		
+		<record model="basic.calendar.fields" id="caldav.map_todo_15">
+		    <field name="name" ref="base_calendar.field_todo_duration"/>
+		    <field name="type_id" ref="caldav.calendar_lines_todo" />
+			<field name="field_id" search="[('name','=','planned_hours'),('model_id.model','=','project.task')]" />
+			<field name="fn">hours</field>
+		</record>
+		
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/project_calendar/project_calendar_view.xml b/addons/project_calendar/project_calendar_view.xml
index b42f518d5f1..d331f8614c7 100644
--- a/addons/project_calendar/project_calendar_view.xml
+++ b/addons/project_calendar/project_calendar_view.xml
@@ -2,18 +2,6 @@
 <openerp>
     <data>
         
-	<record id="caldav_project_task_view" model="ir.ui.view">
-            <field name="name">project.task.caldav.tree</field>
-            <field name="model">project.task</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="project.view_task_tree2"/>
-            <field name="arch" type="xml">
-           			<field name="sequence" position="before">
-           				<field name="id" widget="char"/>
-        			</field>
-            </field>
-        </record>
-        
     	<record id="view_project_caldav_task_form" model="ir.ui.view">
 			<field name="name">project.task.caldav.form</field>
 			<field name="model">project.task</field>
@@ -21,27 +9,90 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<notebook position="inside">
-					<page string="Calendar Properties">
-						<field name="class"/>
-						<field name="caldav_url" widget="url"/>
-						<field name="location"/>
-						<field name="alarm_id"/>
-						<newline/>
-						<field name="rrule" colspan="2"/>
-						<button string="Change RRule" name="97"
-							icon="gtk-save-as" type="action" colspan="2"
-							context="{'model' : 'project.task'}"/>
-						<field name="exrule" colspan="4"/>
-						<separator string="Exception Dates" colspan="4"/>
-						<field name="exdate" nolabel="1"  colspan="4"/>
-					</page>
-					<page string="Attendee Details">
-						<separator string="Attendee" colspan="4"/>
-						<field name="attendee_ids" colspan="4" nolabel="1"/>
+					<page string="Assignees Detail">
+            			<button string="Assign Task"
+            				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
+            				icon="terp-partner" type="action"
+            				context="{'model' : 'project.task'}" colspan="2"/>
+            			<field name="attendee_ids" colspan="4"
+            				nolabel="1" widget="one2many" mode="tree,form">
+            				<tree string="Assignees details"
+            					editable="top">
+            					<field name="email" />
+            					<field name="role" select="1" />
+            					<field name="state" />
+            				</tree>
+            				<form string="Assignees details">
+            					<notebook colspan="4">
+            						<page string="Details">
+            							<field name="email" />
+            							<field name="rsvp" select="1" />
+            							<field name="cutype" select="1" />
+            							<field name="role" select="1" />
+            							<separator colspan="4"
+            								string="" />
+            							<field name="state" />
+            						</page>
+            						<page string="Other">
+            							<field name="user_id"
+            								select="1" />
+            							<field name="partner_address_id"
+            								select="1" />
+            							<newline />
+            						</page>
+            					</notebook>
+            				</form>
+            			</field>
 					</page>
 				</notebook>
 			</field>
 		</record>	
 		
+		<record id="view_project_caldav_task_form1" model="ir.ui.view">
+			<field name="name">project.task.caldav.form1</field>
+			<field name="model">project.task</field>
+			<field name="inherit_id" ref="project.view_task_form2"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="sequence" position="after">
+					<field name="class" />
+				</field>
+			</field>
+		</record>	
+		
+		<record id="view_project_caldav_task_form2" model="ir.ui.view">
+			<field name="name">project.task.caldav.form2</field>
+			<field name="model">project.task</field>
+			<field name="inherit_id" ref="project.view_task_form2" />
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="date_close" position="after">
+					<group colspan="2" col="3">
+						<field name="rrule_type" string="Recurrency"
+							on_change="onchange_rrule_type(rrule_type)" colspan="1" />
+						<button string="Custom" name="101"
+							icon="gtk-save-as" type="action"
+							context="{'model' : 'project.task'}"
+							attrs="{'readonly': [('rrule_type','!=','custom')]}" />
+					</group>
+				</field>
+			</field>
+		</record>
+	
+	<record id="view_project_caldav_task_form3" model="ir.ui.view">
+			<field name="name">project.task.caldav.form3</field>
+			<field name="model">project.task</field>
+			<field name="inherit_id" ref="project.view_task_form2" />
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="partner_id" position="after">
+					<field name="location" colspan="2" />
+					<field name="alarm_id" string="Reminder" widget="selection" />
+					<field name="caldav_url" widget="url" />
+					<field name="rrule" invisible="1"/>
+				</field>
+			</field>
+		</record>
+		
     </data>
 </openerp>
diff --git a/addons/project_calendar/project_calendar_wizard.xml b/addons/project_calendar/project_calendar_wizard.xml
index b30abb809e0..25ac4cfa82f 100644
--- a/addons/project_calendar/project_calendar_wizard.xml
+++ b/addons/project_calendar/project_calendar_wizard.xml
@@ -1,21 +1,18 @@
 <openerp>
 	<data>
-		<wizard string="Import ICS File" model="project.task"
-			name="caldav.project.import" id="wizard_project_cal_import"
-			multi="True"
-		/>
-		<wizard string="Export ICS File" model="project.task"
-			name="caldav.project.export" id="wizard_project_cal_export"
-			multi="True"
-		/>
-		
-		<wizard string="Subscribe to a Remote calendar" model="project.task"
-			name="caldav.project.subscribe" id="wizard_project_cal_subscribe" multi="True"
-		/>
-		
-		<wizard string="Set RRULE" model="crm.case"
-			name="caldav.set.rrule" id="wizard_crm_set_rrule" menu="False"
-		/>
+		<wizard string="Import .ics File" model="project.task"
+			name="calendar.event.import" id="base_calendar.wizard_cal_event_import" multi="True" />
+
+		<wizard string="Subscribe to a Remote calendar"
+			model="project.task" name="calendar.event.subscribe"
+			id="base_calendar.wizard_cal_event_subscribe" multi="True" />
+
+		<wizard string="Export .ics File" model="project.task"
+			name="calendar.event.export" id="base_calendar.wizard_cal_event_export" multi="True" />
+
+		<wizard string="Edit this event" model="project.task"
+			name="calendar.event.edit.this" id="base_calendar.wizard_edit_this_event"
+			menu="False" />
 
 	</data>
 </openerp>
diff --git a/addons/project_calendar/wizard/wizard_cal_export.py b/addons/project_calendar/wizard/wizard_cal_export.py
deleted file mode 100644
index d8e70ca83fc..00000000000
--- a/addons/project_calendar/wizard/wizard_cal_export.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import base64
-import pooler
-
-
-class project_cal_export_wizard(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="Export ICS">
-        <field name="name"/>
-        <field name="file_path" colspan="4" width="300"/>
-    </form>'''
-    
-    form1_fields = {
-            'file_path': {
-                'string': 'Save ICS file', 
-                'type': 'binary', 
-                'required' : True, 
-                'filters' : '*.ics'
-                },
-            'name': {
-                    'string': 'File name', 
-                    'type': 'char', 
-                    'size': 34, 
-                    'required': True, 
-                    'help': 'Save in .ics format'}, 
-            }
-    
-    def _process_export_ics(self, cr, uid, data, context):
-        task_obj = pooler.get_pool(cr.dbname).get('project.task')
-        calendar = task_obj.export_cal(cr, uid, data['ids'], context)
-        return {'file_path': base64.encodestring(calendar), \
-                                'name': 'OpenERP Tasks.ics'}
-    
-    states = {
-        'init': {
-            'actions': [_process_export_ics], 
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, \
-                       'state': [('end', '_Cancel', 'gtk-cancel'), ('end', 'Ok', 'gtk-ok')]}
-        }, 
-    }
-    
-project_cal_export_wizard('caldav.project.export')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_calendar/wizard/wizard_cal_import.py b/addons/project_calendar/wizard/wizard_cal_import.py
deleted file mode 100644
index 98a1f2fbfa4..00000000000
--- a/addons/project_calendar/wizard/wizard_cal_import.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-
-class project_cal_imp_wizard(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="Import ICS">
-        <separator string="Select ICS file"/>
-        <field name="file_path" colspan="4" width="300" nolabel="1"/>
-    </form>'''
-    
-    form1_fields = {
-            'file_path': {
-                'string': 'Select ICS file', 
-                'type': 'binary', 
-                'required': True, 
-                'filters': '*.ics'
-                }
-            }
-    display = '''<?xml version="1.0"?>
-    <form string="Import Message">
-        <field name="msg" colspan="4" width="300" nolabel="1"/>
-    </form>'''
-    
-    display_fields = {
-            'msg': {
-                'string': '', 
-                'type': 'text', 
-                'readonly': True, 
-                'default': 'Imported %s Tasks'
-                }
-            }
-
-    def _process_imp_ics(self, cr, uid, data, context=None):
-        task_obj = pooler.get_pool(cr.dbname).get('project.task')
-        vals = task_obj.import_cal(cr, uid, data['form']['file_path'], context)
-        global cnt
-        cnt = 0
-        if vals:
-            cnt = vals['count']
-        return {}
-    
-    def _result_set(self, cr, uid, data, context=None):
-        return {'msg': 'Imported %s Task(s)' % cnt}
-    
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type': 'form', 'arch': form1, 'fields': form1_fields, \
-                       'state': [('end', '_Cancel', 'gtk-cancel'), ('open', '_Import', 'gtk-ok')]}
-        }, 
-        'open': {
-            'actions': [], 
-            'result': {'type': 'action', 'action': _process_imp_ics, 'state': 'display'}
-        },
-       'display': {
-            'actions': [_result_set], 
-            'result': {'type': 'form', 'arch': display, 'fields': display_fields, \
-                       'state': [('end', 'Ok', 'gtk-ok')]}
-        }, 
-    }
-    
-project_cal_imp_wizard('caldav.project.import')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_calendar/wizard/wizard_cal_subscribe.py b/addons/project_calendar/wizard/wizard_cal_subscribe.py
deleted file mode 100644
index a67ff03879c..00000000000
--- a/addons/project_calendar/wizard/wizard_cal_subscribe.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from tools.translate import _
-import base64
-import pooler
-import urllib
-import wizard
-
-class project_cal_subscribe_wizard(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="Subscribe to Remote ICS">
-        <separator string="Provide path for Remote Calendar"/>
-        <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
-    </form>'''
-    
-    form1_fields = {
-            'url_path': {
-                'string': 'Provide path for remote calendar', 
-                'type': 'char', 
-                'required': True, 
-                'size': 124
-                }
-            }
-    display = '''<?xml version="1.0"?>
-    <form string="Message...">
-        <field name="msg" colspan="4" width="300" nolabel="1"/>
-    </form>'''
-    
-    display_fields = {
-            'msg': {
-                'string': '', 
-                'type': 'text', 
-                'readonly': True, 
-                }
-            }
-
-    def _process_imp_ics(self, cr, uid, data, context=None):
-        global cnt
-        cnt = 0
-        try:
-            f =  urllib.urlopen(data['form']['url_path'])
-            caldata= f.fp.read()
-            f.close()
-        except Exception,e:
-            raise wizard.except_wizard(_('Error!'), _('Please provide Proper URL !'))
-
-        task_obj = pooler.get_pool(cr.dbname).get('project.task')
-        context.update({'url': data['form']['url_path']})
-        vals = task_obj.import_cal(cr, uid, base64.encodestring(caldata), context)
-        if vals:
-            cnt = vals['count']
-        return {}
-    
-    def _result_set(self, cr, uid, data, context=None):
-        return {'msg': 'Subscribed %s Task(s)' % cnt}
-    
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type': 'form', 'arch': form1, 'fields': form1_fields, \
-                       'state': [('end', '_Cancel', 'gtk-cancel'), ('open', '_Subscribe', 'gtk-ok')]}
-        }, 
-        'open': {
-            'actions': [], 
-            'result': {'type': 'action', 'action': _process_imp_ics, 'state': 'display'}
-        },
-       'display': {
-            'actions': [_result_set], 
-            'result': {'type': 'form', 'arch': display, 'fields': display_fields, \
-                       'state': [('end', 'Ok', 'gtk-ok')]}
-        }, 
-    }
-    
-project_cal_subscribe_wizard('caldav.project.subscribe')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_gtd/__init__.py b/addons/project_gtd/__init__.py
index 5e31cd7bcef..cb17064b6b8 100644
--- a/addons/project_gtd/__init__.py
+++ b/addons/project_gtd/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project_gtd/__terp__.py b/addons/project_gtd/__terp__.py
index 99406e67155..2c45a3c51bb 100644
--- a/addons/project_gtd/__terp__.py
+++ b/addons/project_gtd/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index b7f5dbecfe2..943ecc2c7d0 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -19,9 +19,6 @@
 #
 ##############################################################################
 
-from xml import dom
-from lxml import etree
-
 from mx import DateTime
 from mx.DateTime import now
 import time
@@ -29,6 +26,16 @@ import tools
 import netsvc
 from osv import fields, osv
 import ir
+from tools.translate import _
+
+import sys
+from tools.translate import _
+
+try:
+    from lxml import etree
+except ImportError:
+    sys.stderr.write("ERROR: Import lxml module\n")
+    sys.stderr.write("ERROR: Try to install the python-lxml package\n")
 
 class project_gtd_context(osv.osv):
     _name = "project.gtd.context"
@@ -130,17 +137,17 @@ class project_task(osv.osv):
     _defaults = {
         'context_id': _get_context
     }
-    
     def next_timebox(self, cr, uid, ids, *args):
         timebox_obj = self.pool.get('project.gtd.timebox')
         timebox_ids = timebox_obj.search(cr,uid,[])
+        if not timebox_ids: return True
         for task in self.browse(cr,uid,ids):
             timebox = task.timebox_id.id
-            if timebox and  timebox_ids.index(timebox) != len(timebox_ids)-1 :
+            if not timebox:
+                self.write(cr, uid, task.id, {'timebox_id': timebox_ids[0]})
+            elif timebox_ids.index(timebox) != len(timebox_ids)-1:
                 index = timebox_ids.index(timebox)
-            else:
-                index = -1
-            self.write(cr, uid, task.id, {'timebox_id': timebox_ids[index+1]})
+                self.write(cr, uid, task.id, {'timebox_id': timebox_ids[index+1]})
         return True
 
     def prev_timebox(self, cr, uid, ids, *args):
@@ -148,28 +155,29 @@ class project_task(osv.osv):
         timebox_ids = timebox_obj.search(cr,uid,[])
         for task in self.browse(cr,uid,ids):
             timebox = task.timebox_id.id
-            if timebox and  timebox_ids.index(timebox) != 0 :
-                index = timebox_ids.index(timebox)
-            else:
-                index = len(timebox_ids)
-            self.write(cr, uid, task.id, {'timebox_id': timebox_ids[index - 1]})
+            if timebox:
+                if timebox_ids.index(timebox):
+                    index = timebox_ids.index(timebox)
+                    self.write(cr, uid, task.id, {'timebox_id': timebox_ids[index - 1]})
+                else:
+                    self.write(cr, uid, task.id, {'timebox_id': False})
         return True
-    
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = super(project_task,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         search_extended = False
         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">''' % (len(tt)+6,)
-            search_extended += '''<filter domain="[('timebox_id','=', 0)]" icon="gtk-new" string="Inbox"/>'''
+            search_extended ='''<newline/><group col="%d" expand="1" string="%s">''' % (len(tt)+6,_('Getting Things Done'))
+            search_extended += '''<filter domain="[('timebox_id','=', False)]" icon="gtk-new" string="Inbox"/>'''
             search_extended += '''<separator orientation="vertical"/>'''
             for time in tt:
                 if time.icon:
                     icon = time.icon
                 else :
                     icon=""
-                search_extended += ''' <filter domain="[('timebox_id','=', ''' + str(time.id) + ''')]" icon="''' + icon + '''" string="''' + time.name + '''"/>'''
+                search_extended += '''<filter domain="[('timebox_id','=', ''' + str(time.id) + ''')]" icon="''' + icon + '''" string="''' + time.name + '''"/>'''
             search_extended += '''
             <separator orientation="vertical"/>
             <field name="context_id" select="1" widget="selection"/> 
diff --git a/addons/project_gtd/project_gtd_demo.xml b/addons/project_gtd/project_gtd_demo.xml
index ac73d5c7e1e..73584a57c0f 100644
--- a/addons/project_gtd/project_gtd_demo.xml
+++ b/addons/project_gtd/project_gtd_demo.xml
@@ -45,7 +45,7 @@
         <field name="remaining_hours">38.0</field>
         <field name="timebox_id" ref="timebox_daily"/>
         <field name="context_id" ref="context_office"/>
-        <field name="type" ref="project.project_tt_feature"/>
+        <field name="type" ref="project.project_tt_development"/>
         <field name="user_id" ref="base.user_root"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field name="name">Specific adaptation to MRP</field>
@@ -78,7 +78,7 @@
         <field name="remaining_hours">38.0</field>
         <field name="timebox_id" ref="timebox_daily"/>
         <field name="context_id" ref="context_office"/>
-        <field name="type" ref="project.project_tt_feature"/>
+        <field name="type" ref="project.project_tt_development"/>
         <field name="user_id" ref="base.user_root"/>
         <field name="project_id" ref="project.project_project_22"/>
         <field name="name">Specific adaptation to MRP</field>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index b3c8d695a5e..dfaca11e286 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -76,8 +76,8 @@
         <field name="arch" type="xml">
             <field name="project_id" position="after">
                 <field name="timebox_id"/>
-                <button name="next_timebox" string="Next Timebox" type="object" icon="gtk-indent" attrs="{'invisible':[('timebox_id.type','=','other')]}"/>
-                <button name="prev_timebox" string="Previous Timebox" type="object" icon="gtk-indent" attrs="{'invisible':[('timebox_id.type','=','daily')]}"/>
+                <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open"/>
+                <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open"/>
             </field>
         </field>
     </record>
@@ -103,12 +103,16 @@
         <field eval="2" name="priority"/>
         <field name="arch" type="xml">
             <tree editable="top" colors="grey:state in ('done',);red:state in ('cancelled');black:state not in ('done','cancelled')" string="Tasks">
+                <field name="sequence" invisible="1"/>
                 <field name="name"/>
                 <field name="user_id"/>
                 <field name="timebox_id" widget="selection"/>
+                <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open"/>
+                <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open"/>
                 <field name="planned_hours" widget="float_time"/>
                 <field name="state" invisible="1"/>
                 <button name="%(project.wizard_close_task)d" states="draft,pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>
+                <button groups="base.group_extended" name="%(project.wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
                 <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks"/>
             </tree>
@@ -123,10 +127,10 @@
         <field name="search_view_id" ref="project.view_task_search_form"/>
     </record>
 
-    <menuitem name="Todo List"
+    <menuitem name="To-Dos"
         groups="group_project_getting"
         id="menu_task_inbox"
-        parent="project.menu_main"
+        parent="project.menu_project_management"
         action="action_prject_task_tree"/>
 
     <act_window name="My Inbox"
diff --git a/addons/project_gtd/wizard/__init__.py b/addons/project_gtd/wizard/__init__.py
index 220c71d81a2..e92fa265ed3 100644
--- a/addons/project_gtd/wizard/__init__.py
+++ b/addons/project_gtd/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project_gtd/wizard/project_gtd_daily.py b/addons/project_gtd/wizard/project_gtd_daily.py
index 4761067a2d5..68b2a0d8ce3 100644
--- a/addons/project_gtd/wizard/project_gtd_daily.py
+++ b/addons/project_gtd/wizard/project_gtd_daily.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project_gtd/wizard/project_gtd_empty.py b/addons/project_gtd/wizard/project_gtd_empty.py
index 2416f4ea3d8..a2ebe2e8dba 100644
--- a/addons/project_gtd/wizard/project_gtd_empty.py
+++ b/addons/project_gtd/wizard/project_gtd_empty.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project_gtd/wizard/project_gtd_fill.py b/addons/project_gtd/wizard/project_gtd_fill.py
index e1dd95cd468..3bbb947c5ba 100644
--- a/addons/project_gtd/wizard/project_gtd_fill.py
+++ b/addons/project_gtd/wizard/project_gtd_fill.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project_long_term/project_view.xml b/addons/project_long_term/project_view.xml
index 5afbad59af8..b2219f8f281 100644
--- a/addons/project_long_term/project_view.xml
+++ b/addons/project_long_term/project_view.xml
@@ -92,9 +92,9 @@
         res_model="project.task"
         src_model="project.phase"
         view_mode="tree,form"
-        domain="[('phase_id','=',active_id)]"/>
+        domain="[('phase_id','=',active_id)]"/>        
 
-        <menuitem action="act_project_phase" id="menu_project_phase" parent="project.menu_all_project"/>
+        <menuitem action="act_project_phase" id="menu_project_phase" parent="project.menu_project_management" sequence="4"/>
 
 
     </data>
diff --git a/addons/project_messages/__init__.py b/addons/project_messages/__init__.py
new file mode 100644
index 00000000000..de63635487f
--- /dev/null
+++ b/addons/project_messages/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import messages
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_messages/__terp__.py b/addons/project_messages/__terp__.py
new file mode 100644
index 00000000000..54e1c77daeb
--- /dev/null
+++ b/addons/project_messages/__terp__.py
@@ -0,0 +1,38 @@
+# -*- 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" : "In-Project Messaging System",
+    "version" : "1.0",
+    "depends" : ["project"],
+    "author" : "Tiny",
+    "description": """Provides the ability to send small messages to other
+    users on the project.
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': [],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_messages/messages.py b/addons/project_messages/messages.py
new file mode 100644
index 00000000000..422bdb3675c
--- /dev/null
+++ b/addons/project_messages/messages.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+import netsvc
+
+class messages(osv.osv):
+    """Message from one user to another within a project
+    """
+    _name = 'project.messages'
+    logger = netsvc.Logger()
+
+    _columns = {
+        'from_id':fields.many2one('res.users', 'From', ondelete="CASCADE"),
+        'to_id':fields.many2one('res.users', 'To', ondelete="CASCADE"),
+        'project_id':fields.many2one('project.project', 'Project',
+                                     required=True, ondelete="CASCADE"),
+        'message':fields.text('Message', required=True),
+    }
+
+    _defaults = {
+        'from_id':lambda self, cr, uid, context: uid,
+        'to_id':None,
+    }
+
+    def broadcast(self, cr, uid, project_id, message):
+        """ Send a message to all the users of a project.
+        The sender of the message is the current user.
+
+        The method returns the new message's id.
+
+        Arguments:
+        - `project_id`: the id of the project to broadcast to
+        - `message`: the message to broadcast
+        """
+        return self.create(cr, uid, {
+            'to_id':None,
+            'project_id':project_id,
+            'message':message
+        }, context=context)
+messages()
+
+class project_with_message(osv.osv):
+    _inherit = 'project.project'
+
+    _columns = {
+        'message_ids':fields.one2many(
+            'project.messages', 'project_id', 'Messages',
+            domain="[('to_id','in',[uid,False])]"),
+    }
+project_with_message()
diff --git a/addons/project_mrp/__init__.py b/addons/project_mrp/__init__.py
index 7ba8e71deff..2d56968e7bd 100644
--- a/addons/project_mrp/__init__.py
+++ b/addons/project_mrp/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project_mrp/__terp__.py b/addons/project_mrp/__terp__.py
index 2f43d28a681..7b09931c06b 100644
--- a/addons/project_mrp/__terp__.py
+++ b/addons/project_mrp/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project_mrp/mrp.py b/addons/project_mrp/mrp.py
index 2a594ff8e28..7ee07875e22 100644
--- a/addons/project_mrp/mrp.py
+++ b/addons/project_mrp/mrp.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project_mrp/project.py b/addons/project_mrp/project.py
index e8cf31ebfba..4f0cbdc2251 100644
--- a/addons/project_mrp/project.py
+++ b/addons/project_mrp/project.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project_retro_planning/__init__.py b/addons/project_retro_planning/__init__.py
index 3c23de852a9..f8b889e85d7 100644
--- a/addons/project_retro_planning/__init__.py
+++ b/addons/project_retro_planning/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project_retro_planning/__terp__.py b/addons/project_retro_planning/__terp__.py
index 36b9cc30028..e05b161d8f8 100644
--- a/addons/project_retro_planning/__terp__.py
+++ b/addons/project_retro_planning/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project_retro_planning/project_retro_planning.py b/addons/project_retro_planning/project_retro_planning.py
index 95501281feb..0f35ddb4338 100644
--- a/addons/project_retro_planning/project_retro_planning.py
+++ b/addons/project_retro_planning/project_retro_planning.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project_timesheet/__init__.py b/addons/project_timesheet/__init__.py
index 2b67488f2ba..6c907cff3bf 100644
--- a/addons/project_timesheet/__init__.py
+++ b/addons/project_timesheet/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/project_timesheet/__terp__.py b/addons/project_timesheet/__terp__.py
index 889fcac9caa..87ee1e4eff5 100644
--- a/addons/project_timesheet/__terp__.py
+++ b/addons/project_timesheet/__terp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -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/>.
 #
 ##############################################################################
 
@@ -31,7 +31,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'project', 'hr_timesheet_sheet'],
+    'depends': ['base', 'project', 'hr_timesheet_sheet','hr_timesheet'],
     'init_xml': [],
     'update_xml': ["process/project_timesheet_process.xml"],
     'demo_xml': [],
diff --git a/addons/project_timesheet/process/project_timesheet_process.xml b/addons/project_timesheet/process/project_timesheet_process.xml
index 301ee3c71ee..213d48f5540 100644
--- a/addons/project_timesheet/process/project_timesheet_process.xml
+++ b/addons/project_timesheet/process/project_timesheet_process.xml
@@ -7,7 +7,7 @@
         -->
 
         <record id="process_node_timesheettask0" model="process.node">
-            <field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form"/>
+         <!--   <field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form"/>-->
             <field name="model_id" ref="hr_timesheet.model_hr_analytic_timesheet"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Timesheet task&quot;&quot;&quot;" name="name"/>
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 03d463b8269..063d9937fd4 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -110,11 +110,13 @@ class project_work(osv.osv):
         return super(project_work,self).write(cr, uid, ids, vals, context)
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
-        timesheet_id = self.pool.get('project.task.work').browse(cr, uid, ids)[0].hr_analytic_timesheet_id
-#         delete entry from timesheet too while deleting entry to task.
-        list_avail_ids = self.pool.get('hr.analytic.timesheet').search(cr, uid, [])
-        if timesheet_id in list_avail_ids:
-            obj = self.pool.get('hr.analytic.timesheet').unlink(cr, uid, [timesheet_id], *args, **kwargs)
+        pool_analytic_timesheet = self.pool.get('hr.analytic.timesheet')
+        for work_id in ids:
+            timesheet_id = self.read(cr, uid, work_id, ['hr_analytic_timesheet_id'])['hr_analytic_timesheet_id']
+#            delete entry from timesheet too while deleting entry to task.
+            list_avail_ids = pool_analytic_timesheet.search(cr, uid, [])
+            if timesheet_id in list_avail_ids:
+                obj = pool_analytic_timesheet.unlink(cr, uid, [timesheet_id], *args, **kwargs)
 
         return super(project_work,self).unlink(cr, uid, ids, *args, **kwargs)
 
@@ -124,6 +126,40 @@ class project_work(osv.osv):
 
 project_work()
 
+class task(osv.osv):
+    _inherit = "project.task"
+    _description = "Tasks"
+
+    def unlink(self, cr, uid, ids, *args, **kwargs):
+        for task_obj in self.browse(cr, uid, ids, *args, **kwargs):
+            if task_obj.work_ids:
+                work_ids = [x.id for x in task_obj.work_ids]
+                self.pool.get('project.task.work').unlink(cr, uid, work_ids, *args, **kwargs)
+        
+        return super(task,self).unlink(cr, uid, ids, *args, **kwargs)
+    
+    def write(self, cr, uid, ids,vals,context={}):
+        if (vals.has_key('project_id') and vals['project_id']) or (vals.has_key('name') and vals['name']):
+            vals_line = {}
+            hr_anlytic_timesheet = self.pool.get('hr.analytic.timesheet')
+            task_obj_l = self.browse(cr, uid, ids, context)
+            if (vals.has_key('project_id') and vals['project_id']):
+                project_obj = self.pool.get('project.project').browse(cr, uid, vals['project_id'])
+                acc_id = project_obj.category_id.id
+
+            for task_obj in task_obj_l:
+                if len(task_obj.work_ids):
+                    for task_work in task_obj.work_ids:
+                        line_id = task_work.hr_analytic_timesheet_id
+                        if (vals.has_key('project_id') and vals['project_id']):
+                            vals_line['account_id'] = acc_id
+                        if (vals.has_key('name') and vals['name']):
+                            vals_line['name'] = '%s: %s' % (tools.ustr(vals['name']), tools.ustr(task_work.name) or '/')
+                        hr_anlytic_timesheet.write(cr, uid, [line_id], vals_line, {})
+        return super(task,self).write(cr, uid, ids, vals, context)
+
+task()
+
 class project_project(osv.osv):
     _inherit = "project.project"
     def name_get(self, cr, user, ids, context=None):
diff --git a/addons/purchase/__init__.py b/addons/purchase/__init__.py
index 16c0e19c987..41c673c0104 100644
--- a/addons/purchase/__init__.py
+++ b/addons/purchase/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py
index 018a961983e..7c5aa05f640 100644
--- a/addons/purchase/__terp__.py
+++ b/addons/purchase/__terp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -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/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index d95be41f525..ce7425d5a01 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/i18n/pt.po
@@ -7,44 +7,44 @@ 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:16+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-20 23:55+0000\n"
+"Last-Translator: Paulino <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: 2009-12-16 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-01-22 04:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
-msgstr "Facturado e pago"
+msgstr "Facturado & Pago"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr ""
+msgstr "Factura do fornecedor pré-gerada nas recepções para controlo"
 
 #. module: purchase
 #: field:purchase.order,location_id:0
 msgid "Destination"
-msgstr ""
+msgstr "Destino"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
-msgstr ""
+msgstr "Da recolha"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Validated By"
-msgstr ""
+msgstr "Validado por"
 
 #. module: purchase
 #: 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 acção"
 
 #. module: purchase
 #: field:purchase.order,partner_id:0
@@ -54,7 +54,7 @@ msgstr "Fornecedor"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery"
-msgstr "Entrega"
+msgstr "Expedição"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
@@ -64,27 +64,27 @@ msgstr "Quantidade"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Order"
-msgstr ""
+msgstr "A partir da ordem"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
 msgid "Confirmed Purchase"
-msgstr ""
+msgstr "Compra confirmada"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Invoice Exception"
-msgstr "Excepção da factura"
+msgstr "Excepção na factura"
 
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
-msgstr "Lista de preço de compra predefinido"
+msgstr "Lista de preços de compra predefinida"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
 msgid "Create invoice"
-msgstr ""
+msgstr "Criar factura"
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -92,8 +92,8 @@ msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
 msgstr ""
-"Esta lista de preços será usada,em vez do predefinido, para compras do "
-"terceiro actual"
+"Esta lista de preços será usada,em vez da predefinida, para compras ao "
+"parceiro actual"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -103,7 +103,7 @@ msgstr "Fax :"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
 msgid "Create invoice from product recept"
-msgstr ""
+msgstr "Criar factura pela recepção do artigo."
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -111,24 +111,23 @@ msgid ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
 msgstr ""
-"A lista de preço determina a moeda usada para este pedido de compra. "
-"Igualmente processa o preço do fornecedor para os produtos/quantidades "
-"seleccionados."
+"A lista de preço determina a moeda usada para esta ordem de compra. Também "
+"processa o preço do fornecedor para os artigos e quantidades seleccionados."
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase Process"
-msgstr ""
+msgstr "Processo de compra"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 msgid "Invoice from Packing list"
-msgstr ""
+msgstr "Factura a partir da lista de empacotamento"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Purchase"
-msgstr "Aprovar a compra"
+msgstr "Aprovar compra"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -139,7 +138,7 @@ msgstr "Aprovado"
 #: model:ir.actions.act_window,name:purchase.purchase_form_action4
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
 msgid "Purchase Orders in Progress"
-msgstr "Pedidos de compra em progresso"
+msgstr "Ordens de compra em curso"
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -168,22 +167,22 @@ msgstr "Impostos"
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
 msgid "Purchase Order"
-msgstr "Pedido de compra"
+msgstr "Ordem de compra"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Regards,"
-msgstr ""
+msgstr "Cumprimentos,"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Total líquido :"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Cancelled"
-msgstr "Cancelado"
+msgstr "Cancelada"
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -195,13 +194,12 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
-"O estado do pedido de compra ou do pedido de citação. Uma citação é um "
-"pedido de compra no estado de ' Rascunho'. Depois a ordem tem que ser "
-"confirmada pelo utilizador, o estado muda para ' Confirmado'. Então o "
-"fornecedor deve confirmar o pedido para mudar o estado para ' Aprovado'. "
-"Quando o pedido de compra é pago e recebido, o estado transforma-se em ' "
-"Concluído'. Se uma acção de cancelamento ocorre na factura ou na recepção "
-"dos bens, o estado torna-se na excepção."
+"O estado da ordem de compra ou do pedido de cotação. Uma cotação é uma ordem "
+"de compra em estado 'rascunho'. Depois de a ordem confirmada pelo "
+"utilizador, o estado muda para ' Confirmado'. Então o fornecedor deve "
+"confirmar a ordem para mudar o estado para ' Aprovado'. Quando ordem é paga "
+"e recebida, o estado passa 'Concluído'. Se uma acção de cancelamento ocorre "
+"na factura ou na recepção dos bens, o estado passa a \"Excepção\"."
 
 #. module: purchase
 #: field:purchase.order,origin:0
@@ -211,43 +209,43 @@ msgstr "Origem"
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
 msgid "Incoming Products"
-msgstr ""
+msgstr "Produtos a entrar"
 
 #. module: purchase
 #: rml:purchase.order:0
 #: rml:purchase.quotation:0
 msgid "Qty"
-msgstr "Quantidade"
+msgstr "Qt"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Manually Corrected"
-msgstr ""
+msgstr "Corrigido manualmente"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Reference"
-msgstr ""
+msgstr "Referência"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "TVA :"
-msgstr "TVA:"
+msgstr "IVA:"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Tel.:"
-msgstr ""
+msgstr "Tel.:"
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr "Conta da contabilidade analítica"
+msgstr "Conta analítica"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
 msgid "Purchase Order lines"
-msgstr "Linhas de pedidos de compras"
+msgstr "Linhas da ordem de compra"
 
 #. module: purchase
 #: field:purchase.order,validator:0
@@ -268,17 +266,17 @@ msgstr ""
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
 msgid "Invoice based on deliveries"
-msgstr ""
+msgstr "Factura baseada nas entregas"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Net Price"
-msgstr "Preço da rede"
+msgstr "Preço líquido"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Order Line"
-msgstr "Linda do pedido"
+msgstr "Linha da ordem"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -288,7 +286,7 @@ msgstr "Confirmado"
 #. module: purchase
 #: model:process.node,name:purchase.process_node_productrecept0
 msgid "Product Receipt"
-msgstr ""
+msgstr "Recepção do artigo"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
@@ -298,18 +296,18 @@ msgstr "Confirmar"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Invoice Control"
-msgstr "Contolo de factura"
+msgstr "Contolo de facturas"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
 msgid "RFQ"
-msgstr ""
+msgstr "Cotação"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Waiting"
-msgstr "Em espera"
+msgstr "A Aguardar"
 
 #. module: purchase
 #: field:purchase.order,picking_ids:0
@@ -324,17 +322,17 @@ msgstr "Armazem"
 #. module: purchase
 #: field:purchase.order,order_line:0
 msgid "Order Lines"
-msgstr "Lindas do pedido"
+msgstr "Lindas da ordem"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr ""
+msgstr "Confirmar ordem de compra a partir de pedido de cotação sem origem"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Fax:"
-msgstr ""
+msgstr "Fax:"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -344,7 +342,7 @@ msgstr "Montante sem impostos"
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Expected Date"
-msgstr ""
+msgstr "Data prevista"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -355,12 +353,12 @@ msgstr "Endereço de envio:"
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
 #: field:res.partner,property_product_pricelist_purchase:0
 msgid "Purchase Pricelist"
-msgstr "Lista de preço de compra"
+msgstr "Lista de preços de compra"
 
 #. module: purchase
 #: field:purchase.order,minimum_planned_date:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Data planeada"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -370,7 +368,7 @@ msgstr "Aprovado pelo fornecedor"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
 msgid "Packing"
-msgstr ""
+msgstr "Empacotamento"
 
 #. module: purchase
 #: model:ir.actions.wizard,name:purchase.purchase_order_merge
@@ -385,12 +383,12 @@ msgstr "Destino da reserva"
 #. module: purchase
 #: field:purchase.order,name:0
 msgid "Order Reference"
-msgstr "Referência do Pedido"
+msgstr "Referência da ordem"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Done"
-msgstr "Concluído"
+msgstr "Pronto"
 
 #. module: purchase
 #: field:purchase.order,pricelist_id:0
@@ -400,27 +398,27 @@ msgstr "Lista de preços"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "When controlling invoice from orders"
-msgstr ""
+msgstr "Ao controlar facturas baseadas em ordens"
 
 #. module: purchase
 #: 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 da vista"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "Pre-generated supplier invoice to control based on order"
-msgstr ""
+msgstr "Factura do fornecedor pre-criada com na base em ordens para controlo"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 msgid "Invoice from Purchase"
-msgstr ""
+msgstr "Factura a partir da compra"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "Packing is created for the products reception control."
-msgstr ""
+msgstr "O empacotamento é criado para controlo da recepção dos artigos."
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -430,12 +428,12 @@ msgstr "Manual"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirming Purchase"
-msgstr ""
+msgstr "Confirmar Compra"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "Approve Purchase order after Confirming"
-msgstr ""
+msgstr "Aprovar Ordem de Compra após confirmação"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -445,7 +443,7 @@ msgstr "Excepção de envio"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Encoded manually by the user."
-msgstr ""
+msgstr "Registado manualmente pelo utilizador."
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
@@ -453,11 +451,13 @@ msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
 msgstr ""
+"Esta é calculada como a data mínima agendada dos artigos de todas as linhas "
+"de ordens de compra"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 msgid "Purchase orders"
-msgstr "Pedidos de compras"
+msgstr "Ordens de compra"
 
 #. module: purchase
 #: help:purchase.order,dest_address_id:0
@@ -466,27 +466,29 @@ msgid ""
 "customer.In this case, it will remove the warehouse link and set the "
 "customer location."
 msgstr ""
+"Ponha um endereço se quer enviar directamente do fornecedor para o cliente. "
+"Neste caso, irá remover o armazém e definir a localização do cliente."
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Request for Quotation :"
-msgstr ""
+msgstr "Pedido de cotação"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
 msgid "Confirm Purchase order from Request for quotation"
-msgstr ""
+msgstr "Confirmar ordem de compra a partir de pedido de cotação"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Confirm Purchase Order"
-msgstr "Confirmar pedido de compra"
+msgstr "Confirmar ordem de compra"
 
 #. module: purchase
 #: help:purchase.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this purchase"
-msgstr "Esta é lista da lista de recolha que foi gerada para esta compra"
+msgstr "Esta é relação de listas de recolha geradas para esta compra"
 
 #. module: purchase
 #: model:ir.module.module,shortdesc:purchase.module_meta_information
@@ -497,12 +499,12 @@ msgstr "Gestão de compras"
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Partner Ref."
-msgstr "Ref. de Terceiro"
+msgstr "Ref. do Parceiro"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Impostos:"
 
 #. module: purchase
 #: field:purchase.order,invoiced_rate:0
@@ -518,7 +520,7 @@ msgstr "Endereço de destino"
 #: view:purchase.order.line:0
 #: field:stock.move,purchase_line_id:0
 msgid "Purchase Order Line"
-msgstr "Linhas de pedidos de compra"
+msgstr "Linha de ordem de compra"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -528,43 +530,43 @@ msgstr "Vista do calendário"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Tornar rascunho"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
 msgid "Purchase order is approved by supplier."
-msgstr ""
+msgstr "Ordem de compra aprovada pelo fornecedor"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
 #: model:process.node,name:purchase.process_node_invoicecontrol0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Factura rascunho"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order
 msgid "Purchase order"
-msgstr "Pedido de compra"
+msgstr "Ordem de compra"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 msgid "Request for quotation is proposed by the system."
-msgstr ""
+msgstr "Pedido de cotação é proposto pelo sistema."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
 msgid "Packing Invoice"
-msgstr ""
+msgstr "Factura de empacotamento"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
 msgid "Creates invoice from packin list"
-msgstr ""
+msgstr "Cria factura pela lista de empacotamento"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
-msgstr ""
+msgstr "Data de criação deste documento."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -574,37 +576,37 @@ msgstr "Entregas e facturas"
 #. module: purchase
 #: field:purchase.order,date_order:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr ""
+msgstr "Referencia do documento que gerou a cotação de ordem de compra."
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Tél. :"
-msgstr "Telef."
+msgstr "tel.   :"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
 msgid "After Purchase order , Create invoice."
-msgstr ""
+msgstr "Após ordem de compra, cria factura."
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
 msgid "Scheduled date"
-msgstr "Data agendada"
+msgstr "Data Prevista"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Our Order Reference"
-msgstr ""
+msgstr "A nossa referência da ordem"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "TVA:"
-msgstr ""
+msgstr "IVA"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -614,47 +616,48 @@ msgstr "Calcular"
 #. module: purchase
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
+msgstr "Não pode ter duas versões da lista de preços que se sobrepõem"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Cancel Purchase Order"
-msgstr "Cancelar pedidos de compras"
+msgstr "Cancelar ordem de compra"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
 msgid "Create Packing list"
-msgstr ""
+msgstr "Criar lista de empacotamento"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "When purchase order is approved , it creates its packing list."
 msgstr ""
+"Quando a ordem de compra é aprovada, cria a sua lista de empacotamento."
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "History"
-msgstr ""
+msgstr "Histórico"
 
 #. module: purchase
 #: field:purchase.order,state:0
 msgid "Order Status"
-msgstr "Estado do pedido"
+msgstr "Estado da ordem"
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr "Sub-total"
+msgstr "Subtotal"
 
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
-msgstr ""
+msgstr "Versão da lista de preços de compra pré-definida"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -665,12 +668,12 @@ msgstr "Preço Unitário"
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "Posição Fiscal"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Request for Quotation N°"
-msgstr ""
+msgstr "Pedido de cotação Nº"
 
 #. module: purchase
 #: field:purchase.order,invoice_id:0
@@ -687,37 +690,38 @@ msgstr "Cancelar"
 #. module: purchase
 #: view:res.partner:0
 msgid "Purchases Properties"
-msgstr ""
+msgstr "Propriedades das Compras"
 
 #. module: purchase
 #: field:purchase.order.line,order_id:0
 msgid "Order Ref"
-msgstr "Ref do Pedido"
+msgstr "Ref. da ordem"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
 msgid "Purchase Orders"
-msgstr "Pedidos de compras"
+msgstr "ordens de compra"
 
 #. module: purchase
 #: wizard_view:purchase.order.merge,init:0
 #: wizard_button:purchase.order.merge,init,merge:0
 msgid "Merge orders"
-msgstr "Juntar ordens"
+msgstr "Fundir ordens"
 
 #. module: purchase
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
+"O nome do Objecto deve começar com x_ e não pode conter nenhum caractere "
+"especial !"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action_new
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
 msgid "New Purchase Order"
-msgstr "Novo pedido de compra"
+msgstr "Nova ordem de compra"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
@@ -729,22 +733,22 @@ msgstr "Recebido"
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
 msgid "Request for Quotation"
-msgstr "Pedidos de citação"
+msgstr "Pedido de cotação"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
 msgid "Out Packing"
-msgstr ""
+msgstr "Pacote a sair"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Control invoices on receptions"
-msgstr ""
+msgstr "Controlo das facturas nas recepções"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Date Req."
-msgstr ""
+msgstr "Data cotação"
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
@@ -761,7 +765,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order.line,product_id:0
 msgid "Product"
-msgstr "Produto"
+msgstr "Artigo"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -773,28 +777,28 @@ msgstr "Descrição"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_productrecept0
 msgid "Product recept invoice"
-msgstr ""
+msgstr "Factura do artigo recebido"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Expected Delivery address:"
-msgstr ""
+msgstr "Endereço de entrega esperado"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action3
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
 msgid "Purchase Order Waiting Approval"
-msgstr "Pedido de compra esperando confirmação"
+msgstr "Ordem de compra aguardando aprovação"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
 msgid "Confirming Purchase Order"
-msgstr ""
+msgstr "Confirmando Ordem de Compra"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
 msgid "Product UOM"
-msgstr "UdM do produto"
+msgstr "UdM do artigo"
 
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
@@ -804,22 +808,22 @@ msgstr "Reserva"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
 msgid "Purchase order is confirmed by the user."
-msgstr ""
+msgstr "Ordem de compra confirmada pelo utilizador"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "Purchase Invoice"
-msgstr ""
+msgstr "Factura de compra"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Your Order Reference"
-msgstr ""
+msgstr "Referência da sua ordem"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr ""
+msgstr "Confirmação de ordem de compra nº"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -840,7 +844,7 @@ msgstr "Controlo de compra"
 #: model:ir.actions.act_window,name:purchase.purchase_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
 msgid "Request For Quotations"
-msgstr "Pedidos de citação"
+msgstr "Pedidos de cotação"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -850,17 +854,17 @@ msgstr "Controlo de facturação"
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
 msgid "Approve"
-msgstr ""
+msgstr "Aprovar"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
 msgid "Approved Purchase"
-msgstr ""
+msgstr "Compra aprovada"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
 msgid "From Packing list, Create invoice."
-msgstr ""
+msgstr "Da lista de empacotamento, criar factura."
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -870,19 +874,20 @@ msgstr "Total"
 #. module: purchase
 #: wizard_view:purchase.order.merge,init:0
 msgid "Are you sure you want to merge these orders ?"
-msgstr "Você tem certeza que pretende juntar estas pedidos ?"
+msgstr "Tem certeza que quer fundir estas ordens?"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approving Purchase Order"
-msgstr ""
+msgstr "Aprovando ordem de compra"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
 msgid "After approved purchase order , it comes into the supplier invoice"
 msgstr ""
+"Após a aprovação da ordem de compra, torna-se na factura do fornecedor"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Movimentos de stock"
diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index 49f5da35ba2..48d006f2c15 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml
index ddd23c9bf79..1f1a9bbd280 100755
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -17,7 +17,7 @@
         -->
 
         <record id="process_node_packinginvoice0" model="process.node">
-            <field name="menu_id" ref="stock.menu_action_picking_tree"/>
+<!--            <field name="menu_id" ref="stock.menu_action_picking_tree"/>-->
             <field name="model_id" ref="stock.model_stock_picking"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Outgoing Products&quot;&quot;&quot;" name="name"/>
@@ -119,7 +119,7 @@
         </record>
 
         <record id="process_node_productrecept0" model="process.node">
-            <field name="menu_id" ref="stock.menu_action_picking_tree"/>
+<!--            <field name="menu_id" ref="stock.menu_action_picking_tree"/>-->
             <field name="model_id" ref="stock.model_stock_picking"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Incoming Products&quot;&quot;&quot;" name="name"/>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 3d344dc17f8..c7700a757c1 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -151,20 +151,17 @@ class purchase_order(osv.osv):
         'partner_ref': fields.char('Supplier Reference', size=64),
         'date_order':fields.date('Date Ordered', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="Date on which this document has been created."),
         'date_approve':fields.date('Date Approved', readonly=1),
-        'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, change_default=True),
-        'partner_address_id':fields.many2one('res.partner.address', 'Supplier Address', required=True, states={'posted':[('readonly',True)]}),
-
+        'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, change_default=True),
+        'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True, states={'posted':[('readonly',True)]}),
         'dest_address_id':fields.many2one('res.partner.address', 'Destination Address', states={'posted':[('readonly',True)]},
             help="Put an address if you want to deliver directly from the supplier to the customer." \
                 "In this case, it will remove the warehouse link and set the customer location."
         ),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'posted':[('readonly',True)]}),
         'location_id': fields.many2one('stock.location', 'Destination', required=True),
-
-        'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
-
+        'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
         'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Waiting Supplier Ack'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
-        'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)]}),
+        'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'notes': fields.text('Notes', translate=True),
         'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
@@ -396,7 +393,7 @@ class purchase_order(osv.osv):
                     continue
                 if order_line.product_id.product_tmpl_id.type in ('product', 'consu'):
                     dest = order.location_id.id
-                    self.pool.get('stock.move').create(cr, uid, {
+                    move = self.pool.get('stock.move').create(cr, uid, {
                         'name': 'PO:'+order_line.name,
                         'product_id': order_line.product_id.id,
                         'product_qty': order_line.product_qty,
@@ -408,12 +405,14 @@ class purchase_order(osv.osv):
                         'location_dest_id': dest,
                         'picking_id': picking_id,
                         'move_dest_id': order_line.move_dest_id.id,
-                        'state': 'assigned',
+                        'state': 'draft',
                         'purchase_line_id': order_line.id,
                         'company_id': order.company_id.id,
                     })
                     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})
+                    self.pool.get('stock.move').action_confirm(cr, uid, [move])
+                    self.pool.get('stock.move').force_assign(cr,uid, [move])
             wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
         return picking_id
@@ -493,15 +492,6 @@ class purchase_order_line(osv.osv):
             uom = prod_uom_po
         if not date_order:
             date_order = time.strftime('%Y-%m-%d')
-        if price_unit:
-            price = price_unit
-        else:
-            price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist],
-                product, qty or 1.0, partner_id, {
-                    'uom': uom,
-                    'date': date_order,
-                    })[pricelist]
-
         qty = qty or 1.0
         seller_delay = 0
         for s in prod.seller_ids:
@@ -510,7 +500,14 @@ class purchase_order_line(osv.osv):
                 temp_qty = s.qty # supplier _qty assigned to temp
                 if qty < temp_qty: # If the supplier quantity is greater than entered from user, set minimal.
                     qty = temp_qty
-
+        if price_unit:
+            price = price_unit
+        else:
+            price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist],
+                    product, qty or 1.0, partner_id, {
+                        'uom': uom,
+                        'date': date_order,
+                        })[pricelist]
         dt = (DateTime.now() + DateTime.RelativeDateTime(days=seller_delay or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
         prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id])[0][1]
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 966c331a95e..9480f3327c3 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,8 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"
+        <!--<menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"
+            groups="group_purchase_user"/>-->
+       <menuitem icon="terp-purchase" id="menu_purchase_root" name="Procurement Management"
             groups="group_purchase_user"/>
+	   <menuitem id="menu_procurement_management" name="Procurement Management"
+            parent="menu_purchase_root" sequence="1"/>
+
+     <!--supplier menu-->
+     <menuitem id="menu_procurement_management_supplier" name="Suppliers"
+            parent="menu_purchase_root" sequence="3"/>
+     <menuitem id="menu_procurement_management_supplier_name" name="Suppliers"
+            parent="menu_procurement_management_supplier" action="base.action_partner_supplier_form" />
+
+
+
+          <!--Inventory control-->
+      <menuitem id="menu_procurement_management_nventory" name="Inventory Control"
+            parent="menu_purchase_root" sequence="4"/>
+      <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_nventory"
+      		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_nventory" sequence="10"/>
+
+     <!--Invoice control-->
+      <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
+            parent="menu_purchase_root" sequence="6"/>
+      <menuitem name="Pending Invoices" id="menu_procurement_management_panding_invoice" action="account.action_invoice_tree_panding_invoice"
+      parent="menu_procurement_management_invoice"/>
+
+      <!--product menu-->
+      <menuitem id="menu_procurement_management_product" name="Product"
+            parent="menu_purchase_root" sequence="8"/>
+      <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
+      parent="menu_procurement_management_product"/>
 
        <record model="ir.ui.view" id="purchase_order_calendar">
             <field name="name">purchase.order.calendar</field>
@@ -140,7 +172,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
         </record>
-        <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="purchase.menu_purchase_root"/>
+        <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management"/>
 
         <record id="purchase_form_action4" model="ir.actions.act_window">
             <field name="name">Purchase Orders in Progress</field>
@@ -213,6 +245,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <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"/>
                     <field name="product_id"/>
diff --git a/addons/purchase/report/__init__.py b/addons/purchase/report/__init__.py
index 1d73ba833df..c4cc8211bd9 100644
--- a/addons/purchase/report/__init__.py
+++ b/addons/purchase/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase/report/order.py b/addons/purchase/report/order.py
index 1e1b53e5734..0e4e0d982d9 100644
--- a/addons/purchase/report/order.py
+++ b/addons/purchase/report/order.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase/report/request_quotation.py b/addons/purchase/report/request_quotation.py
index e3a9b342206..dffeeed7aba 100644
--- a/addons/purchase/report/request_quotation.py
+++ b/addons/purchase/report/request_quotation.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 68be681fdf5..5fb968e6ce1 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -7,3 +7,4 @@
 "access_stock_move_purchase_user","stock.move purchase_user","stock.model_stock_move","purchase.group_purchase_user",1,1,1,1
 "access_purchase_order_stock_worker","purchase.order stock_worker","model_purchase_order","stock.group_stock_user",1,0,0,0
 "access_purchase_order_line_stock_worker","purchase.order.line stock_worker","model_purchase_order_line","stock.group_stock_user",1,0,0,0
+"access_account_tax_purchase_user","account.tax purchase_user","account.model_account_tax","purchase.group_purchase_user",1,0,0,0
\ No newline at end of file
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index a0ed16f94c8..087c9d6ddc8 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase/wizard/__init__.py b/addons/purchase/wizard/__init__.py
index 48c0f1c024e..e79d70fbaeb 100644
--- a/addons/purchase/wizard/__init__.py
+++ b/addons/purchase/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase/wizard/wizard_group.py b/addons/purchase/wizard/wizard_group.py
index ffe634a4d6f..050be8c88d6 100644
--- a/addons/purchase/wizard/wizard_group.py
+++ b/addons/purchase/wizard/wizard_group.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase_analytic_plans/__init__.py b/addons/purchase_analytic_plans/__init__.py
index 199594c8a3d..7820cdb0bd3 100644
--- a/addons/purchase_analytic_plans/__init__.py
+++ b/addons/purchase_analytic_plans/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase_analytic_plans/__terp__.py b/addons/purchase_analytic_plans/__terp__.py
index 5f399476cf6..88dff2cdc57 100644
--- a/addons/purchase_analytic_plans/__terp__.py
+++ b/addons/purchase_analytic_plans/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans.py b/addons/purchase_analytic_plans/purchase_analytic_plans.py
index 2b4b3f9389a..757868f13ed 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans.py
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase_manual/__init__.py b/addons/purchase_manual/__init__.py
index 38d62db06bd..9409cb3b358 100644
--- a/addons/purchase_manual/__init__.py
+++ b/addons/purchase_manual/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase_manual/__terp__.py b/addons/purchase_manual/__terp__.py
index d8e00f75aa1..7634af9ca7a 100644
--- a/addons/purchase_manual/__terp__.py
+++ b/addons/purchase_manual/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase_manual/purchase_manual.py b/addons/purchase_manual/purchase_manual.py
index a16a0a76e04..f31b96f4c8a 100644
--- a/addons/purchase_manual/purchase_manual.py
+++ b/addons/purchase_manual/purchase_manual.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase_manual/purchase_manual_view.xml b/addons/purchase_manual/purchase_manual_view.xml
index de424bb17f6..60460f30546 100644
--- a/addons/purchase_manual/purchase_manual_view.xml
+++ b/addons/purchase_manual/purchase_manual_view.xml
@@ -5,7 +5,7 @@
         #
         # Define PO Line Views
         #
-        
+
         <record id="purchase_order_form" model="ir.ui.view">
             <field name="name">purchase.order.form</field>
             <field name="model">purchase.order</field>
@@ -54,7 +54,7 @@
             </field>
         </record>
 
- 
+
         #
         # Inherit PO view to get buttons
         #
@@ -77,7 +77,7 @@
             <field name="view_id" ref="purchase_order_line_form"/>
             <field name="act_window_id" ref="purchase_line_form_action"/>
         </record>
-        <menuitem action="purchase_line_form_action" id="menu_purchase_line_form_action" parent="purchase.menu_purchase_root"/>
+<!--        <menuitem action="purchase_line_form_action" id="menu_purchase_line_form_action" parent="purchase.menu_purchase_root"/>-->
 
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
             <field name="name">Uninvoiced Purchase Order Lines</field>
@@ -99,7 +99,7 @@
             <field name="view_id" ref="purchase_order_line_form"/>
             <field name="act_window_id" ref="purchase_line_form_action2"/>
         </record>
-         <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_purchase_line_form_action"/>
+<!--         <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_purchase_line_form_action"/>-->
 
     </data>
 </openerp>
diff --git a/addons/purchase_manual/wizard/__init__.py b/addons/purchase_manual/wizard/__init__.py
index d6d7d7dc310..e93c28bfe14 100644
--- a/addons/purchase_manual/wizard/__init__.py
+++ b/addons/purchase_manual/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py b/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py
index fca0f0e443f..0e30368d41b 100644
--- a/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py
+++ b/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -24,6 +24,7 @@ import netsvc
 import ir
 import pooler
 from osv import osv
+from tools.translate import _
 
 invoice_form = """<?xml version="1.0"?>
 <form string="Control invoices">
diff --git a/addons/purchase_tender/__init__.py b/addons/purchase_tender/__init__.py
new file mode 100644
index 00000000000..68f1f7ae5bc
--- /dev/null
+++ b/addons/purchase_tender/__init__.py
@@ -0,0 +1,22 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import purchase_tender
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/purchase_tender/__terp__.py b/addons/purchase_tender/__terp__.py
new file mode 100644
index 00000000000..723ec148162
--- /dev/null
+++ b/addons/purchase_tender/__terp__.py
@@ -0,0 +1,37 @@
+##############################################################################
+#    
+#    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" : "Purchase - Purchase Tender",
+    "version" : "0.1",
+    "author" : "Tiny",
+    "category" : "Generic Modules/Purchase",
+    "website" : "http://www.openerp.com",
+    "description": """ This module allows you to manage your Purchase Tenders. When a purchase order is created, you now have the opportunity to save the related tender. 
+    This new object will regroup and will allow you to easily keep track and order all your purchase orders.
+""",
+    "depends" : ["purchase"],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : ["purchase_tender_view.xml","purchase_tender_sequence.xml"],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/purchase_tender/i18n/fr_BE.po b/addons/purchase_tender/i18n/fr_BE.po
new file mode 100644
index 00000000000..5b9c10ca2cb
--- /dev/null
+++ b/addons/purchase_tender/i18n/fr_BE.po
@@ -0,0 +1,134 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_tender
+#
+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 14:07:40+0000\n"
+"PO-Revision-Date: 2009-11-25 14:07:40+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: purchase_tender
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML incorrect pour l'Architecture des Vues!"
+
+#. module: purchase_tender
+#: field:purchase.tender,date_end:0
+msgid "Date End"
+msgstr "Date de fin"
+
+#. module: purchase_tender
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "Le nom de l'Objet doit commencer par x_ et ne pas comporter de caractères spéciaux !"
+
+#. module: purchase_tender
+#: view:purchase.tender:0
+#: field:purchase.tender,description:0
+msgid "Description"
+msgstr "Description"
+
+#. module: purchase_tender
+#: model:ir.model,name:purchase_tender.model_purchase_tender
+#: field:purchase.order,tender_id:0
+#: view:purchase.tender:0
+msgid "Purchase Tender"
+msgstr "Appel d'Offre"
+
+#. module: purchase_tender
+#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender
+#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1
+#: model:ir.ui.menu,name:purchase_tender.menu_purchase_tender
+msgid "Purchase Tenders"
+msgstr "Appels d'offre"
+
+#. module: purchase_tender
+#: selection:purchase.tender,state:0
+msgid "Open"
+msgstr "Ouvert"
+
+#. module: purchase_tender
+#: field:purchase.tender,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: purchase_tender
+#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_draft
+#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_draft
+msgid "Draft Purchase Tenders"
+msgstr "Appels d'Offre brouillons"
+
+#. module: purchase_tender
+#: field:purchase.tender,state:0
+msgid "State"
+msgstr "Etat"
+
+#. module: purchase_tender
+#: selection:purchase.tender,state:0
+msgid "Draft"
+msgstr "Brouillon"
+
+#. module: purchase_tender
+#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_open
+#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_open
+msgid "Open Purchase Tenders"
+msgstr "Appels d'offre ouverts"
+
+#. module: purchase_tender
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom de modèle incorrect pour la définition de l'action"
+
+#. module: purchase_tender
+#: model:ir.module.module,shortdesc:purchase_tender.module_meta_information
+msgid "Purchase - Purchase Tender"
+msgstr "Achat - Appel d'offre"
+
+#. module: purchase_tender
+#: field:purchase.tender,name:0
+msgid "Tender Reference"
+msgstr "Référence"
+
+#. module: purchase_tender
+#: selection:purchase.tender,state:0
+msgid "Close"
+msgstr "Clôturé"
+
+#. module: purchase_tender
+#: field:purchase.tender,date_start:0
+msgid "Date Start"
+msgstr "Date de début"
+
+#. module: purchase_tender
+#: view:purchase.tender:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase_tender
+#: model:ir.module.module,description:purchase_tender.module_meta_information
+msgid " This module allows you to manage your Purchase Tenders. When a purchase order is created, you now have the opportunity to save the related tender. \n"
+"    This new object will regroup and will allow you to easily keep track and order all your purchase orders.\n"
+""
+msgstr "Ce module vous permet de gérer des appels d'offre. Quand un appel d'offre est créé, vous avez maintenant l'opportunité de conserver une trace. \n"
+"    Ce nouvel objet regroupe et conserve la trace de tous vos appels d'offre.\n"
+""
+
+#. module: purchase_tender
+#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_new
+#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_new
+msgid "New Purchase Tenders"
+msgstr "Nouveaux Appels d'Offre"
+
+#. module: purchase_tender
+#: field:purchase.tender,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Bons d'achat"
+
diff --git a/addons/purchase_tender/purchase_tender.py b/addons/purchase_tender/purchase_tender.py
new file mode 100644
index 00000000000..d68281f3a6f
--- /dev/null
+++ b/addons/purchase_tender/purchase_tender.py
@@ -0,0 +1,63 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields,osv
+from osv import orm
+import netsvc
+import time
+
+class purchase_tender(osv.osv):
+    _name = "purchase.tender"
+    _description="Purchase Tender"
+    _columns = {
+        'name': fields.char('Tender Reference', size=32,required=True),
+        'date_start': fields.datetime('Date Start'),
+        'date_end': fields.datetime('Date End'),
+        'user_id': fields.many2one('res.users', 'Responsible'),
+        'description': fields.text('Description'),
+        'purchase_ids' : fields.one2many('purchase.order','tender_id','Purchase Orders'),
+        'state': fields.selection([('draft','Draft'),('open','Open'),('close','Close')], 'State', required=True)
+    }
+    _defaults = {
+        'date_start': lambda *args: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'state': lambda *args: 'open',
+        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.tender'),
+    }
+purchase_tender()
+
+class purchase_order(osv.osv):
+    _inherit = "purchase.order"
+    _description = "purchase order"
+    _columns = {
+        'tender_id' : fields.many2one('purchase.tender','Purchase Tender')
+    }
+    def wkf_confirm_order(self, cr, uid, ids, context={}):
+        res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context)
+        for po in self.browse(cr, uid, ids, context):
+            if po.tender_id:
+                for order in po.tender_id.purchase_ids:
+                    if order.id<>po.id:
+                        wf_service = netsvc.LocalService("workflow")
+                        wf_service.trg_validate(uid, 'purchase.order', order.id, 'purchase_cancel', cr)
+                    self.pool.get('purchase.tender').write(cr, uid, [po.tender_id.id], {'state':'close'})
+        return res
+purchase_order()
diff --git a/addons/purchase_tender/purchase_tender_sequence.xml b/addons/purchase_tender/purchase_tender_sequence.xml
new file mode 100644
index 00000000000..222e3f46282
--- /dev/null
+++ b/addons/purchase_tender/purchase_tender_sequence.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- Sequences for purchase.order --> 
+        <record id="seq_type_purchase_tender_order" model="ir.sequence.type">
+            <field name="name">Purchase Tender Order</field>
+            <field name="code">purchase.order.tender</field>
+        </record>
+        <record id="seq_purchase_tender_order" model="ir.sequence">
+            <field name="name">Purchase Tender Order</field>
+            <field name="code">purchase.order.tender</field>
+            <field name="prefix">TE</field>
+            <field name="padding">5</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/purchase_tender/purchase_tender_view.xml b/addons/purchase_tender/purchase_tender_view.xml
new file mode 100644
index 00000000000..a91c36a7201
--- /dev/null
+++ b/addons/purchase_tender/purchase_tender_view.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    <record model="ir.ui.view" id="purchase_order_tree_inherit">
+        <field name="name">purchase.order.tree.inherit</field>
+        <field name="type">tree</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_tree"/>
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="tender_id"/>
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="purchase_order_form_inherit">
+        <field name="name">purchase.order.form.inherit</field>
+        <field name="type">form</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_form"/>
+        <field name="arch" type="xml">
+            <field name="partner_ref" position="after">
+                <field name="tender_id" select="2"/>
+            </field>
+        </field>
+    </record>
+
+        <record model="ir.ui.view" id="view_purchase_tender_form">
+            <field name="name">purchase.tender.form</field>
+            <field name="type">form</field>
+            <field name="model">purchase.tender</field>
+            <field name="arch" type="xml">
+                <form string="Purchase Tender">
+                    <field name="name" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="date_start" select="2"/>
+                    <field name="date_end" select="2"/>
+                    <notebook colspan="4">
+                        <page string="Description">
+                            <field name="description" colspan="4" nolabel="1" select="2"/>
+                        </page>
+                        <page string="Quotations">
+                            <field name="purchase_ids" nolabel="1" colspan="4"/>
+                        </page>
+                    </notebook>
+                    <field name="state" select="1"/>
+                </form>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_purchase_tender_tree">
+            <field name="name">purchase.tender.tree</field>
+            <field name="type">tree</field>
+            <field name="model">purchase.tender</field>
+            <field name="arch" type="xml">
+                <tree string="Purchase Tender">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="action_purchase_tender">
+            <field name="name">Purchase Tenders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.tender</field>
+            <field name="view_type">form</field>
+        </record>
+<!--        <menuitem name="Purchase Tenders" id="menu_purchase_tender" parent="purchase.menu_purchase_root"/>-->
+<!--        <menuitem id="menu_purchase_Tender1" parent="menu_purchase_tender" action="action_purchase_tender"/>-->
+		<menuitem id="menu_purchase_Tender_pro_mgt" parent="purchase.menu_procurement_management" action="action_purchase_tender"/>
+        <record model="ir.actions.act_window" id="action_purchase_tender_draft">
+            <field name="name">Draft Purchase Tenders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.tender</field>
+            <field name="domain">[('state','=','draft')]</field>
+            <field name="view_type">form</field>
+        </record>
+<!--        <menuitem id="menu_purchase_Tender1_draft" parent="menu_purchase_Tender1" action="action_purchase_tender_draft"/>-->
+
+        <record model="ir.actions.act_window" id="action_purchase_tender_open">
+            <field name="name">Open Purchase Tenders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.tender</field>
+            <field name="domain">[('state','=','open')]</field>
+            <field name="view_type">form</field>
+        </record>
+<!--        <menuitem id="menu_purchase_Tender1_open" parent="menu_purchase_Tender1" action="action_purchase_tender_open"/>-->
+
+        <record model="ir.actions.act_window" id="action_purchase_tender_new">
+            <field name="name">New Purchase Tenders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.tender</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+        </record>
+<!--        <menuitem id="menu_purchase_Tender1_new" parent="menu_purchase_tender" action="action_purchase_tender_new"/>-->
+
+    </data>
+</openerp>
diff --git a/addons/report_account/__init__.py b/addons/report_account/__init__.py
index f67269cd858..a32842f6570 100644
--- a/addons/report_account/__init__.py
+++ b/addons/report_account/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_account/__terp__.py b/addons/report_account/__terp__.py
index 2544b80e5c4..43f9ab946f8 100644
--- a/addons/report_account/__terp__.py
+++ b/addons/report_account/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_account/report_receivable.py b/addons/report_account/report_receivable.py
index b8e3cf22f67..480784c6616 100644
--- a/addons/report_account/report_receivable.py
+++ b/addons/report_account/report_receivable.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_analytic/__init__.py b/addons/report_analytic/__init__.py
index 35ad18d84b1..ad14dd13f4e 100644
--- a/addons/report_analytic/__init__.py
+++ b/addons/report_analytic/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_analytic/__terp__.py b/addons/report_analytic/__terp__.py
index 28e9fefbdad..c5ec3a0dd8f 100644
--- a/addons/report_analytic/__terp__.py
+++ b/addons/report_analytic/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_analytic/report_analytic.py b/addons/report_analytic/report_analytic.py
index 3287d2705d0..5dfb419802b 100644
--- a/addons/report_analytic/report_analytic.py
+++ b/addons/report_analytic/report_analytic.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_analytic_line/__init__.py b/addons/report_analytic_line/__init__.py
index 75e502b0fad..2b3cdfd9263 100644
--- a/addons/report_analytic_line/__init__.py
+++ b/addons/report_analytic_line/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_analytic_line/__terp__.py b/addons/report_analytic_line/__terp__.py
index f3c8a5a0e81..63677acb34f 100644
--- a/addons/report_analytic_line/__terp__.py
+++ b/addons/report_analytic_line/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_analytic_line/report_analytic_line.py b/addons/report_analytic_line/report_analytic_line.py
index 42f219df1f3..c665537d197 100644
--- a/addons/report_analytic_line/report_analytic_line.py
+++ b/addons/report_analytic_line/report_analytic_line.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_analytic_planning/__init__.py b/addons/report_analytic_planning/__init__.py
index 5457d458707..0c7719f1919 100644
--- a/addons/report_analytic_planning/__init__.py
+++ b/addons/report_analytic_planning/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_analytic_planning/__terp__.py b/addons/report_analytic_planning/__terp__.py
index 559d9ba8bd7..6bbdfbb7577 100644
--- a/addons/report_analytic_planning/__terp__.py
+++ b/addons/report_analytic_planning/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_analytic_planning/report/__init__.py b/addons/report_analytic_planning/report/__init__.py
index e2c8cd49cc2..e68279cad8d 100644
--- a/addons/report_analytic_planning/report/__init__.py
+++ b/addons/report_analytic_planning/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_analytic_planning/report_analytic_planning.py b/addons/report_analytic_planning/report_analytic_planning.py
index ee1e04816af..3f9c77f253b 100644
--- a/addons/report_analytic_planning/report_analytic_planning.py
+++ b/addons/report_analytic_planning/report_analytic_planning.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -314,7 +314,7 @@ Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holi
                 WHERE holidays.employee_id IN 
                     (
                     SELECT emp.id 
-                    FROM hr_employee emp WHERE emp.user_id = users.id 
+                    FROM hr_employee emp, resource_resource res WHERE emp.resource_id = res.id and res.user_id = users.id 
                     )
                 AND holidays.state IN ('validate')
                 AND holidays.type = 'remove' 
diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index 825daf5a6af..5d5c6aa37aa 100644
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data>
-	
+
         <!-- Planning -->
 		<record id="account_analytic_planning_view_tree" model="ir.ui.view">
 			<field name="name">report.account.analytic.planning.tree</field>
@@ -97,9 +97,9 @@
 						                        <page string="Information">
 						                            <group col="3" colspan="4">
 						                            	<field name="effective_hours" widget="float_time" invisible="True" />
-						                                <field name="planned_hours" 
+						                                <field name="planned_hours"
 						                                    widget="float_time"
-						                                    attrs="{'readonly':[('state','!=','draft')]}" 
+						                                    attrs="{'readonly':[('state','!=','draft')]}"
 						                                    on_change="onchange_planned(planned_hours,effective_hours)"/>
 						                                <field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"/>
 						                                <button name="%(project.action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
@@ -114,7 +114,7 @@
 						                                <button groups="base.group_extended" name="%(project.wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
 						                                <button name="%(project.wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
 						                                <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
-						
+
 						                            </group>
 					                             </page>
 						                        <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
@@ -154,7 +154,7 @@
 				</form>
 			</field>
 		</record>
-		
+
 		<record id="account_analytic_planning_view_search" model="ir.ui.view">
 			<field name="name">report.account.analytic.planning.search</field>
 			<field name="model">report_account_analytic.planning</field>
@@ -217,12 +217,13 @@
 			<field name="view_mode">tree,form</field>
 			<field name="search_view_id" ref="account_analytic_planning_view_search"/>
 		</record>
-		
+		<menuitem id="base.menu_pm_planning" name="Planning" parent="project.menu_main" sequence="5"/>
 		<menuitem id="planning_main" name="Long Term Planning"
-			parent="project.menu_main" />
-			
+			parent="base.menu_pm_planning" />
+
 		<menuitem action="action_account_analytic_planning_form"
 			id="menu_report_account_analytic_planning" parent="planning_main" />
+		<menuitem action="resource.action_resource_resource_tree" id="base.menu_resource_resource_tree" parent="planning_main" />
 
 		<!--
 			Planning statistics
@@ -338,8 +339,8 @@
                 </notebook>
             </field>
         </record>
-        
-        
+
+
 <!--		Task Form -->
 
         <record id="view_task_planning_form" model="ir.ui.view">
@@ -359,8 +360,8 @@
 			id="act_task_of_lines" name="Planning tasks" res_model="project.task"
 			src_model="report_account_analytic.planning"
 		/>
-		
-		<!-- company form --> 
+
+		<!-- company form -->
         <record id="planning_company" model="ir.ui.view">
             <field name="name">res.company.planning.config</field>
             <field name="model">res.company</field>
diff --git a/addons/report_crm/__init__.py b/addons/report_crm/__init__.py
index be40e54d8d7..7a050fae5a7 100644
--- a/addons/report_crm/__init__.py
+++ b/addons/report_crm/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -20,6 +20,11 @@
 ##############################################################################
 
 import report_crm
+import report_crm_lead
+import report_crm_claim
+import report_crm_opportunity
+import report_crm_fundraising
+import report_crm_phonecall
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/report_crm/__terp__.py b/addons/report_crm/__terp__.py
index 8d656574b0b..9d9dae37390 100644
--- a/addons/report_crm/__terp__.py
+++ b/addons/report_crm/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -30,9 +30,16 @@
     'website': 'http://www.openerp.com',
     'depends': ['crm'],
     'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'report_crm_view.xml'],
+    'update_xml': ['security/ir.model.access.csv', 
+                   'report_crm_view.xml', 
+                   'report_crm_lead_view.xml',
+                   'report_crm_claim_view.xml',
+                   'report_crm_opportunity_view.xml',
+                   'report_crm_phonecall_view.xml',
+                   'report_crm_fundraising_view.xml'
+                   ],
     'demo_xml': [],
-    'installable': True,
+    'installable': True, #TODO : After fixed problems , set True
     'active': False,
     'certificate': '0030422968285',
 }
diff --git a/addons/report_crm/report_crm.py b/addons/report_crm/report_crm.py
index d6c2e9d0066..c55f6ce69d5 100644
--- a/addons/report_crm/report_crm.py
+++ b/addons/report_crm/report_crm.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -37,18 +37,13 @@ class report_crm_case_user(osv.osv):
     _columns = {
         '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),
-        'amount_revenue': fields.float('Est.Revenue', readonly=True),
-        'amount_costs': fields.float('Est.Cost', readonly=True),
-        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),        
         'nbr': fields.integer('# of Cases', readonly=True),
-        'probability': fields.float('Avg. Probability', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
-        'delay_close': fields.char('Delay to close', size=20, 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 = 'name desc, user_id, section_id'
+    _order = 'name desc, user_id'
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_crm_case_user')
         cr.execute("""
@@ -60,15 +55,10 @@ class report_crm_case_user(osv.osv):
                     c.state,
                     c.user_id,
                     c.section_id,
-                    count(*) as nbr,
-                    sum(planned_revenue) as amount_revenue,
-                    sum(planned_cost) as amount_costs,
-                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
-                    avg(probability)::decimal(16,2) as probability,
-                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                    count(*) as nbr
                 from
                     crm_case c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id, c.section_id
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id
             )""")
 report_crm_case_user()
 
@@ -78,19 +68,13 @@ class report_crm_case_categ(osv.osv):
     _auto = False
     _columns = {
         'name': fields.char('Year',size=64,required=False, readonly=True),
-        'categ_id':fields.many2one('crm.case.categ', 'Category', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
-        'amount_revenue': fields.float('Est.Revenue', readonly=True),
-        'amount_costs': fields.float('Est.Cost', readonly=True),
-        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
         'nbr': fields.integer('# of Cases', readonly=True),
-        'probability': fields.float('Avg. Probability', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
-        'delay_close': fields.char('Delay Close', size=20, 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 = 'name desc, categ_id, section_id'
+    _order = 'name desc'
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_crm_case_categ')
         cr.execute("""
@@ -100,17 +84,11 @@ class report_crm_case_categ(osv.osv):
                     to_char(c.create_date, 'YYYY') as name,
                     to_char(c.create_date, 'MM') as month,
                     c.state,
-                    c.categ_id,
                     c.section_id,
-                    count(*) as nbr,
-                    sum(planned_revenue) as amount_revenue,
-                    sum(planned_cost) as amount_costs,
-                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
-                    avg(probability)::decimal(16,2) as probability,
-                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                    count(*) as nbr
                 from
                     crm_case c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.categ_id, c.section_id
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state,c.section_id
             )""")
 report_crm_case_categ()
 
@@ -120,41 +98,15 @@ class report_crm_case_section(osv.osv):
     _description = "Cases by Section"
     _auto = False
     
-    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
-        res = {}
-        state_perc = 0.0
-        avg_ans = 0.0
-        
-        for case in self.browse(cr, uid, ids, context):
-            if field_name != 'avg_answers':
-                state = field_name[5:]
-                cr.execute("select count(*) from crm_case where section_id =%s and state='%s'"%(case.section_id.id,state))
-                state_cases = cr.fetchone()[0]
-                perc_state = (state_cases / float(case.nbr_cases) ) * 100
-                
-                res[case.id] = perc_state
-            else:
-                cr.execute('select count(*) from crm_case_log l  where l.section_id=%s'%(case.section_id.id))
-                logs = cr.fetchone()[0]
-                
-                avg_ans = logs / case.nbr_cases
-                res[case.id] = avg_ans       
-        
-        return res
-    
     _columns = {
         '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),
         'nbr_cases': fields.integer('# of Cases', 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"),
-        'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
-        'delay_close': fields.char('Delay to close', size=20, 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 = 'name desc, section_id'
+    _order = 'name desc'
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_crm_case_section')
         cr.execute("""
@@ -163,15 +115,11 @@ class report_crm_case_section(osv.osv):
                     min(c.id) as id,
                     to_char(c.create_date, 'YYYY') as name,
                     to_char(c.create_date, 'MM') as month,
-                    c.section_id as section_id,
                     count(*) as nbr_cases,
-                    0 as avg_answers,
-                    0.0 as perc_done,
-                    0.0 as perc_cancel,
-                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                    c.section_id as section_id
                 from
                     crm_case c
-                group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id
+                group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'), c.section_id
             )""")
 report_crm_case_section()
 
@@ -183,34 +131,23 @@ class report_crm_case_service_dashboard(osv.osv):
         'date': fields.datetime('Date', readonly=True),
         'date_deadline': fields.datetime('Deadline', readonly=True),
         'name': fields.char('Description', size=64, readonly=True),
-        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
         'user_id': fields.many2one('res.users', 'Responsible', readonly=True),
-        'priority': fields.char('Priority', size=64, readonly=True),
-        'planned_revenue': fields.float('Planned Revenue', readonly=True),
-        'planned_cost': fields.float('Planned Costs', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
-        'date_closed' : fields.datetime('Date Closed', readonly=True),
         'create_date' : fields.datetime('Create Date', readonly=True)
     }
-    _order = 'date_closed, create_date'
+    _order = 'create_date'
     
     def init(self, cr):
         cr.execute("""create or replace view report_crm_case_service_dashboard as (
             select
                 cse.id as id, cse.date as date, cse.date_deadline as date_deadline,
-                cse.name as name, cse.partner_id as partner_id, cse.user_id as user_id,
-                cse.priority as priority, cse.planned_revenue as planned_revenue,
-                cse.planned_cost as planned_cost, cse.state as state,
-                cse.date_closed as date_closed, cse.create_date as create_date
+                cse.name as name, cse.user_id as user_id,
+                 cse.state as state,
+                cse.create_date as create_date
             from
                 crm_case cse
             where
-                ((to_date(to_char(cse.date_closed, 'YYYY-MM-dd'),'YYYY-MM-dd') <= CURRENT_DATE)
-                    AND
-                (to_date(to_char(cse.date_closed, 'YYYY-MM-dd'),'YYYY-MM-dd') > (CURRENT_DATE-15)) 
-                    AND
-                    cse.state='done')
-                
+                (cse.state='done')
                 OR
                 
                 ((to_date(to_char(cse.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') <= CURRENT_DATE)
@@ -221,6 +158,38 @@ class report_crm_case_service_dashboard(osv.osv):
             )""")
 report_crm_case_service_dashboard()
 
+class report_crm_case_section_stage(osv.osv):
+    _name = "report.crm.case.section.stage"
+    _description = "Cases by section and stage"
+    _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),
+        'user_id':fields.many2one('res.users', 'User', 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),
+                }
+    _order = 'section_id'
+
+    def init(self, cr):
+        tools.sql.drop_view_if_exists(cr, "report_crm_case_section_stage")
+        cr.execute("""
+              create view report_crm_case_section_stage as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date,'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.user_id,
+                    c.state,
+                    c.section_id,
+                    count(*) as nbr
+                from
+                    crm_case c
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.user_id, c.state, c.section_id)""")
+
+report_crm_case_section_stage()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/report_crm/report_crm_claim.py b/addons/report_crm/report_crm_claim.py
new file mode 100644
index 00000000000..57c0df8793f
--- /dev/null
+++ b/addons/report_crm/report_crm_claim.py
@@ -0,0 +1,131 @@
+from osv import fields,osv
+import tools
+
+class report_crm_claim_user(osv.osv):
+    _name = "report.crm.claim.user"
+    _description = "Claim by user and section"
+    _auto = False
+    _inherit = "report.crm.case.user"
+    _columns = {
+        'probability': fields.float('Avg. Probability', readonly=True),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'amount_costs': fields.float('Est.Cost', readonly=True),
+        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_claim_user')
+        cr.execute("""
+            create or replace view report_crm_claim_user as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.state,
+                    c.user_id,
+                    c.section_id,
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    sum(planned_cost) as amount_costs,
+                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
+                    avg(probability)::decimal(16,2) as probability,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_claim c
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id
+            )""")
+report_crm_claim_user()
+
+class report_crm_claim_categ(osv.osv):
+    _name = "report.crm.claim.categ"
+    _description = "Claim by section and category"
+    _auto = False
+    _inherit = "report.crm.case.categ"
+    _columns = {
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'amount_costs': fields.float('Est.Cost', readonly=True),
+        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'probability': fields.float('Avg. Probability', readonly=True),
+        'delay_close': fields.char('Delay Close', size=20, readonly=True),
+    }
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_claim_categ')
+        cr.execute("""
+            create or replace view report_crm_claim_categ as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.categ_id,
+                    c.state,
+                    c.section_id,
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    sum(planned_cost) as amount_costs,
+                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
+                    avg(probability)::decimal(16,2) as probability,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_claim c
+                group by c.categ_id,to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state,c.section_id
+            )""")
+report_crm_claim_categ()
+
+class report_crm_claim_section(osv.osv):
+    _name = "report.crm.claim.section"
+    _description = "Claim by Section"
+    _auto = False
+    _inherit = "report.crm.case.section"
+    
+    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+        res = {}
+        state_perc = 0.0
+        avg_ans = 0.0
+        
+        for case in self.browse(cr, uid, ids, context):
+            if field_name != 'avg_answers':
+                state = field_name[5:]
+                cr.execute("select count(*) from crm_claim where section_id =%s and state='%s'"%(case.section_id.id,state))
+                state_cases = cr.fetchone()[0]
+                perc_state = (state_cases / float(case.nbr_cases) ) * 100
+                
+                res[case.id] = perc_state
+            else:
+                cr.execute('select count(*) from crm_case_log l  where l.section_id=%s'%(case.section_id.id))
+                logs = cr.fetchone()[0]
+                
+                avg_ans = logs / case.nbr_cases
+                res[case.id] = avg_ans       
+        
+        return res
+    
+    _columns = {
+        '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"),
+        'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+    }
+    _order = 'name desc, section_id'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_claim_section')
+        cr.execute("""
+            create or replace view report_crm_claim_section as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    count(*) as nbr_cases,
+                    c.section_id as section_id,
+                    0 as avg_answers,
+                    0.0 as perc_done,
+                    0.0 as perc_cancel,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_claim c
+                group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id
+            )""")
+report_crm_claim_section()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/report_crm/report_crm_claim_view.xml b/addons/report_crm/report_crm_claim_view.xml
new file mode 100644
index 00000000000..562ccbec8a4
--- /dev/null
+++ b/addons/report_crm/report_crm_claim_view.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	<!--
+	Claim by user and section
+	-->
+
+        <record id="view_crm_claim_user_tree" model="ir.ui.view">
+            <field name="name">report.crm.claim.user.tree</field>
+            <field name="model">report.crm.claim.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_crm_claim_user_form" model="ir.ui.view">
+            <field name="name">report.crm.claim.user.form</field>
+            <field name="model">report.crm.claim.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_crm_claim_user_graph" model="ir.ui.view">
+            <field name="name">report.crm.claim.user.graph</field>
+            <field name="model">report.crm.claim.user</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Claims by User and Section" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="view_crm_claim_user_filter" model="ir.ui.view">
+            <field name="name">report.crm.claim.user.select</field>
+            <field name="model">report.crm.claim.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+               </field>
+            </field>
+        </record>
+        
+        <record id="action_report_crm_claim_user_tree" model="ir.actions.act_window">
+            <field name="name">Claim by User and Section</field>
+            <field name="res_model">report.crm.claim.user</field>
+            <field name="view_type">form</field>
+  			<field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_crm_claim_user_graph"/>
+            <field name="search_view_id" ref="view_crm_claim_user_filter"/>
+        </record>
+        <menuitem name="Claim" id="menu_crm_claim_tree" parent="crm.next_id_52"/>
+        <menuitem action="action_report_crm_claim_user_tree" id="menu_crm_claim_user_tree" parent="menu_crm_claim_tree"/>
+        
+        <!-- # Claims by section and category of case -->
+
+        <record id="view_crm_claim_categ_tree" model="ir.ui.view">
+            <field name="name">report.crm.claim.categ.tree</field>
+            <field name="model">report.crm.claim.categ</field>
+            <field name="inherit_id" ref="view_crm_case_categ_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_crm_claim_categ_form" model="ir.ui.view">
+            <field name="name">report.crm.claim.categ.form</field>
+            <field name="model">report.crm.claim.categ</field>
+            <field name="inherit_id" ref="view_crm_case_categ_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+
+		<record id="view_crm_claim_categ_graph" model="ir.ui.view">
+            <field name="name">report.crm.claim.categ.graph</field>
+            <field name="model">report.crm.claim.categ</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Claims by Section and Categories" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="categ_id"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_crm_claim_categ_filter" model="ir.ui.view">
+            <field name="name">report.crm.claim.categ.select</field>
+            <field name="model">report.crm.claim.categ</field>
+			<field name="inherit_id" ref="view_crm_case_categ_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+                </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_claim_categ_tree" model="ir.actions.act_window">
+            <field name="name">Claims by Categories and Section</field>
+            <field name="res_model">report.crm.claim.categ</field>
+            <field name="view_type">form</field>
+  			<field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_crm_claim_categ_graph"/>
+            <field name="search_view_id" ref="view_crm_claim_categ_filter"/>
+        </record>
+        <menuitem action="action_report_crm_claim_categ_tree" id="menu_crm_claim_categ_tree" parent="menu_crm_claim_tree"/>
+
+       <!-- Claim by Section  -->
+
+        <record id="view_report_crm_claim_section_tree" model="ir.ui.view">
+            <field name="name">report.crm.claim.section.tree</field>
+            <field name="model">report.crm.claim.section</field>
+            <field name="inherit_id" ref="view_report_crm_case_section_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr_cases" position="after">
+	                <field name="avg_answers"/>
+	                <field name="perc_done" select="2"/>
+                    <field name="perc_cancel" select="2"/>
+                    <field name="delay_close"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_report_crm_claim_section_graph" model="ir.ui.view">
+            <field name="name">report.crm.claim.section.graph</field>
+            <field name="model">report.crm.claim.section</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="claims by Section" type="bar">
+                    <field name="name"/>
+                    <field name="nbr_cases" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_report_crm_claim_section_filter" model="ir.ui.view">
+            <field name="name">report.crm.claim.section.select</field>
+            <field name="model">report.crm.claim.section</field>
+            <field name="inherit_id" ref="view_report_crm_case_section_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="nbr_cases" position="before">
+                </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_claim_section_tree" model="ir.actions.act_window">
+            <field name="name">Claims by Section</field>
+            <field name="res_model">report.crm.claim.section</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_report_crm_claim_section_graph"/>
+            <field name="search_view_id" ref="view_report_crm_claim_section_filter"/>
+        </record>
+        <menuitem action="action_report_crm_claim_section_tree" id="menu_crm_claim_section_tree" parent="menu_crm_claim_tree"/>        
+  </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/report_crm/report_crm_fundraising.py b/addons/report_crm/report_crm_fundraising.py
new file mode 100644
index 00000000000..4ee8911a776
--- /dev/null
+++ b/addons/report_crm/report_crm_fundraising.py
@@ -0,0 +1,131 @@
+from osv import fields,osv
+import tools
+
+class report_crm_fundraising_user(osv.osv):
+    _name = "report.crm.fundraising.user"
+    _description = "Fundraising by user and section"
+    _auto = False
+    _inherit = "report.crm.case.user"
+    _columns = {
+        'probability': fields.float('Avg. Probability', readonly=True),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'amount_costs': fields.float('Est.Cost', readonly=True),
+        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_fundraising_user')
+        cr.execute("""
+            create or replace view report_crm_fundraising_user as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.state,
+                    c.user_id,
+                    c.section_id,
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    sum(planned_cost) as amount_costs,
+                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
+                    avg(probability)::decimal(16,2) as probability,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_fundraising c
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id
+            )""")
+report_crm_fundraising_user()
+
+class report_crm_fundraising_categ(osv.osv):
+    _name = "report.crm.fundraising.categ"
+    _description = "Fundraising by section and category"
+    _auto = False
+    _inherit = "report.crm.case.categ"
+    _columns = {
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]"),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'amount_costs': fields.float('Est.Cost', readonly=True),
+        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'probability': fields.float('Avg. Probability', readonly=True),
+        'delay_close': fields.char('Delay Close', size=20, readonly=True),
+    }
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_fundraising_categ')
+        cr.execute("""
+            create or replace view report_crm_fundraising_categ as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.categ_id,
+                    c.state,
+                    c.section_id,
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    sum(planned_cost) as amount_costs,
+                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
+                    avg(probability)::decimal(16,2) as probability,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_fundraising c
+                group by c.categ_id,to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state,c.section_id
+            )""")
+report_crm_fundraising_categ()
+
+class report_crm_fundraising_section(osv.osv):
+    _name = "report.crm.fundraising.section"
+    _description = "Fundraising by Section"
+    _auto = False
+    _inherit = "report.crm.case.section"
+    
+    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+        res = {}
+        state_perc = 0.0
+        avg_ans = 0.0
+        
+        for case in self.browse(cr, uid, ids, context):
+            if field_name != 'avg_answers':
+                state = field_name[5:]
+                cr.execute("select count(*) from crm_fundraising where section_id =%s and state='%s'"%(case.section_id.id,state))
+                state_cases = cr.fetchone()[0]
+                perc_state = (state_cases / float(case.nbr_cases) ) * 100
+                
+                res[case.id] = perc_state
+            else:
+                cr.execute('select count(*) from crm_case_log l  where l.section_id=%s'%(case.section_id.id))
+                logs = cr.fetchone()[0]
+                
+                avg_ans = logs / case.nbr_cases
+                res[case.id] = avg_ans       
+        
+        return res
+    
+    _columns = {
+        '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"),
+        'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+    }
+    _order = 'name desc, section_id'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_fundraising_section')
+        cr.execute("""
+            create or replace view report_crm_fundraising_section as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    count(*) as nbr_cases,
+                    c.section_id as section_id,
+                    0 as avg_answers,
+                    0.0 as perc_done,
+                    0.0 as perc_cancel,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_fundraising c
+                group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id
+            )""")
+report_crm_fundraising_section()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/report_crm/report_crm_fundraising_view.xml b/addons/report_crm/report_crm_fundraising_view.xml
new file mode 100644
index 00000000000..0ee491fc5b0
--- /dev/null
+++ b/addons/report_crm/report_crm_fundraising_view.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	<!--
+	Fundraising by user and section
+	-->
+
+        <record id="view_crm_fundraising_user_tree" model="ir.ui.view">
+            <field name="name">report.crm.fundraising.user.tree</field>
+            <field name="model">report.crm.fundraising.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_crm_fundraising_user_form" model="ir.ui.view">
+            <field name="name">report.crm.fundraising.user.form</field>
+            <field name="model">report.crm.fundraising.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_crm_fundraising_user_graph" model="ir.ui.view">
+            <field name="name">report.crm.fundraising.user.graph</field>
+            <field name="model">report.crm.fundraising.user</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="fundraising by User and Section" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="view_crm_fundraising_user_filter" model="ir.ui.view">
+            <field name="name">report.crm.fundraising.user.select</field>
+            <field name="model">report.crm.fundraising.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+               </field>
+            </field>
+        </record>
+        
+        <record id="action_report_crm_fundraising_user_tree" model="ir.actions.act_window">
+            <field name="name">Fundraising by User and Section</field>
+            <field name="res_model">report.crm.fundraising.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_crm_fundraising_user_graph"/>
+            <field name="search_view_id" ref="view_crm_fundraising_user_filter"/>
+        </record>
+        <menuitem name="Fundraising" id="menu_crm_fundraising_tree" parent="crm.next_id_52"/>
+        <menuitem action="action_report_crm_fundraising_user_tree" id="menu_crm_fundraising_user_tree" parent="menu_crm_fundraising_tree"/>
+        
+        <!-- # fundraising by section and category of case -->
+
+        <record id="view_crm_fundraising_categ_tree" model="ir.ui.view">
+            <field name="name">report.crm.fundraising.categ.tree</field>
+            <field name="model">report.crm.fundraising.categ</field>
+            <field name="inherit_id" ref="view_crm_case_categ_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_crm_fundraising_categ_form" model="ir.ui.view">
+            <field name="name">report.crm.fundraising.categ.form</field>
+            <field name="model">report.crm.fundraising.categ</field>
+            <field name="inherit_id" ref="view_crm_case_categ_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+
+		<record id="view_crm_fundraising_categ_graph" model="ir.ui.view">
+            <field name="name">report.crm.fundraising.categ.graph</field>
+            <field name="model">report.crm.fundraising.categ</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="fundraising by Section and Categories" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="categ_id"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_crm_fundraising_categ_filter" model="ir.ui.view">
+            <field name="name">report.crm.fundraising.categ.select</field>
+            <field name="model">report.crm.fundraising.categ</field>
+			<field name="inherit_id" ref="view_crm_case_categ_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+                </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_fundraising_categ_tree" model="ir.actions.act_window">
+            <field name="name">Fundraising by Categories and Section</field>
+            <field name="res_model">report.crm.fundraising.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_crm_fundraising_categ_graph"/>
+            <field name="search_view_id" ref="view_crm_fundraising_categ_filter"/>
+        </record>
+        <menuitem action="action_report_crm_fundraising_categ_tree" id="menu_crm_fundraising_categ_tree" parent="menu_crm_fundraising_tree"/>
+        
+        <!-- fundraising by Section  -->
+
+        <record id="view_report_crm_fundraising_section_tree" model="ir.ui.view">
+            <field name="name">report.crm.fundraising.section.tree</field>
+            <field name="model">report.crm.fundraising.section</field>
+            <field name="inherit_id" ref="view_report_crm_case_section_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr_cases" position="after">
+	                <field name="avg_answers"/>
+	                <field name="perc_done" select="2"/>
+                    <field name="perc_cancel" select="2"/>
+                    <field name="delay_close"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_report_crm_fundraising_section_graph" model="ir.ui.view">
+            <field name="name">report.crm.fundraising.section.graph</field>
+            <field name="model">report.crm.fundraising.section</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="fundraising by Section" type="bar">
+                    <field name="name"/>
+                    <field name="nbr_cases" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_report_crm_fundraising_section_filter" model="ir.ui.view">
+            <field name="name">report.crm.fundraising.section.select</field>
+            <field name="model">report.crm.fundraising.section</field>
+            <field name="inherit_id" ref="view_report_crm_case_section_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="nbr_cases" position="before">
+                </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_fundraising_section_tree" model="ir.actions.act_window">
+            <field name="name">Fundraising by Section</field>
+            <field name="res_model">report.crm.fundraising.section</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_report_crm_fundraising_section_graph"/>
+            <field name="search_view_id" ref="view_report_crm_fundraising_section_filter"/>
+        </record>
+        <menuitem action="action_report_crm_fundraising_section_tree" id="menu_crm_fundraising_section_tree" parent="menu_crm_fundraising_tree"/>
+	</data>
+</openerp>
diff --git a/addons/report_crm/report_crm_lead.py b/addons/report_crm/report_crm_lead.py
new file mode 100644
index 00000000000..35b0b799235
--- /dev/null
+++ b/addons/report_crm/report_crm_lead.py
@@ -0,0 +1,167 @@
+from osv import fields,osv
+import tools
+
+class report_crm_lead_user(osv.osv):
+    _name = "report.crm.lead.user"
+    _description = "Leads by user and section"
+    _auto = False
+    _inherit = "report.crm.case.user"
+    _columns = {
+        'probability': fields.float('Avg. Probability', readonly=True),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'amount_costs': fields.float('Est.Cost', readonly=True),
+        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_lead_user')
+        cr.execute("""
+            create or replace view report_crm_lead_user as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.state,
+                    c.user_id,
+                    c.section_id,
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    sum(planned_cost) as amount_costs,
+                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
+                    avg(probability)::decimal(16,2) as probability,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                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
+            )""")
+report_crm_lead_user()
+
+class report_crm_lead_categ(osv.osv):
+    _name = "report.crm.lead.categ"
+    _description = "Leads by section and category"
+    _auto = False
+    _inherit = "report.crm.case.categ"
+    _columns = {
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'amount_costs': fields.float('Est.Cost', readonly=True),
+        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'probability': fields.float('Avg. Probability', readonly=True),
+        'delay_close': fields.char('Delay Close', size=20, readonly=True),
+    }
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_lead_categ')
+        cr.execute("""
+            create or replace view report_crm_lead_categ as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.categ_id,
+                    c.state,
+                    c.section_id,
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    sum(planned_cost) as amount_costs,
+                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
+                    avg(probability)::decimal(16,2) as probability,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_lead c
+                group by c.categ_id,to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state,c.section_id
+            )""")
+report_crm_lead_categ()
+
+class report_crm_lead_section(osv.osv):
+    _name = "report.crm.lead.section"
+    _description = "Leads by Section"
+    _auto = False
+    _inherit = "report.crm.case.section"
+    
+    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+        res = {}
+        state_perc = 0.0
+        avg_ans = 0.0
+        
+        for case in self.browse(cr, uid, ids, context):
+            if field_name != 'avg_answers':
+                state = field_name[5:]
+                cr.execute("select count(*) from crm_lead where section_id =%s and state='%s'"%(case.section_id.id,state))
+                state_cases = cr.fetchone()[0]
+                perc_state = (state_cases / float(case.nbr_cases) ) * 100
+                
+                res[case.id] = perc_state
+            else:
+                cr.execute('select count(*) from crm_case_log l  where l.section_id=%s'%(case.section_id.id))
+                logs = cr.fetchone()[0]
+                
+                avg_ans = logs / case.nbr_cases
+                res[case.id] = avg_ans       
+        
+        return res
+    
+    _columns = {
+        '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"),
+        'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+    }
+    _order = 'name desc, section_id'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_lead_section')
+        cr.execute("""
+            create or replace view report_crm_lead_section as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    count(*) as nbr_cases,
+                    c.section_id as section_id,
+                    0 as avg_answers,
+                    0.0 as perc_done,
+                    0.0 as perc_cancel,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_lead c
+                group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id
+            )""")
+report_crm_lead_section()
+
+class report_crm_lead_section_stage(osv.osv):
+    _name = "report.crm.lead.section.stage"
+    _description = "Leads by section and stage"
+    _auto = False
+    _inherit = "report.crm.case.section.stage"
+    _columns = {
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]", readonly=True),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]", readonly=True),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'delay_close': fields.char('Delay Close', size=20, readonly=True),
+                }
+    _order = 'stage_id, section_id'
+
+    def init(self, cr):
+        tools.sql.drop_view_if_exists(cr, "report_crm_lead_section_stage")
+        cr.execute("""
+              create view report_crm_lead_section_stage as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date,'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.user_id,
+                    c.state,
+                    c.stage_id,
+                    c.section_id,
+                    c.categ_id, 
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_lead c
+                where c.stage_id is not null
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.user_id, c.state, c.stage_id, c.categ_id, c.section_id)""")
+
+report_crm_lead_section_stage()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/report_crm/report_crm_lead_view.xml b/addons/report_crm/report_crm_lead_view.xml
new file mode 100644
index 00000000000..10782abeab3
--- /dev/null
+++ b/addons/report_crm/report_crm_lead_view.xml
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	<!--
+	Leads by user and section
+	-->
+
+        <record id="view_crm_lead_user_tree" model="ir.ui.view">
+            <field name="name">report.crm.lead.user.tree</field>
+            <field name="model">report.crm.lead.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_crm_lead_user_form" model="ir.ui.view">
+            <field name="name">report.crm.lead.user.form</field>
+            <field name="model">report.crm.lead.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_crm_lead_user_graph" model="ir.ui.view">
+            <field name="name">report.crm.lead.user.graph</field>
+            <field name="model">report.crm.lead.user</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Leads by User and Section" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="view_crm_lead_user_filter" model="ir.ui.view">
+            <field name="name">report.crm.lead.user.select</field>
+            <field name="model">report.crm.lead.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+               </field>
+            </field>
+        </record>
+        
+        <record id="action_report_crm_lead_user_tree" model="ir.actions.act_window">
+            <field name="name">Leads by User and Section</field>
+            <field name="res_model">report.crm.lead.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_crm_lead_user_graph"/>
+            <field name="search_view_id" ref="view_crm_lead_user_filter"/>
+        </record>
+        <menuitem name="Leads" id="menu_crm_leads_tree" parent="crm.next_id_52"/>
+        <menuitem action="action_report_crm_lead_user_tree" id="menu_crm_lead_user_tree" parent="menu_crm_leads_tree"/>
+        
+        <!-- # Leads by section and category of case -->
+
+        <record id="view_crm_lead_categ_tree" model="ir.ui.view">
+            <field name="name">report.crm.lead.categ.tree</field>
+            <field name="model">report.crm.lead.categ</field>
+            <field name="inherit_id" ref="view_crm_case_categ_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_crm_lead_categ_form" model="ir.ui.view">
+            <field name="name">report.crm.lead.categ.form</field>
+            <field name="model">report.crm.lead.categ</field>
+            <field name="inherit_id" ref="view_crm_case_categ_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+
+		<record id="view_crm_lead_categ_graph" model="ir.ui.view">
+            <field name="name">report.crm.lead.categ.graph</field>
+            <field name="model">report.crm.lead.categ</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Leads by Section and Categories" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="categ_id"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_crm_lead_categ_filter" model="ir.ui.view">
+            <field name="name">report.crm.lead.categ.select</field>
+            <field name="model">report.crm.lead.categ</field>
+			<field name="inherit_id" ref="view_crm_case_categ_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+                </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_lead_categ_tree" model="ir.actions.act_window">
+            <field name="name">Leads by Categories and Section</field>
+            <field name="res_model">report.crm.lead.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_crm_lead_categ_graph"/>
+            <field name="search_view_id" ref="view_crm_lead_categ_filter"/>
+        </record>
+        <menuitem action="action_report_crm_lead_categ_tree" id="menu_crm_lead_categ_tree" parent="menu_crm_leads_tree"/>
+        
+        <!-- Leads by Section  -->
+
+        <record id="view_report_crm_lead_section_tree" model="ir.ui.view">
+            <field name="name">report.crm.lead.section.tree</field>
+            <field name="model">report.crm.lead.section</field>
+            <field name="inherit_id" ref="view_report_crm_case_section_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr_cases" position="after">
+	                <field name="avg_answers"/>
+	                <field name="perc_done" select="2"/>
+                    <field name="perc_cancel" select="2"/>
+                    <field name="delay_close"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_report_crm_lead_section_graph" model="ir.ui.view">
+            <field name="name">report.crm.lead.section.graph</field>
+            <field name="model">report.crm.lead.section</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Leads by Section" type="bar">
+                    <field name="name"/>
+                    <field name="nbr_cases" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_report_crm_lead_section_filter" model="ir.ui.view">
+            <field name="name">report.crm.lead.section.select</field>
+            <field name="model">report.crm.lead.section</field>
+            <field name="inherit_id" ref="view_report_crm_case_section_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="nbr_cases" position="before">
+                </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_lead_section_tree" model="ir.actions.act_window">
+            <field name="name">Leads by Section</field>
+            <field name="res_model">report.crm.lead.section</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_report_crm_lead_section_graph"/>
+            <field name="search_view_id" ref="view_report_crm_lead_section_filter"/>
+        </record>
+        <menuitem action="action_report_crm_lead_section_tree" id="menu_crm_lead_section_tree" parent="menu_crm_leads_tree"/>
+     
+     
+	<!--  Cases by section and stage   -->
+	   <record model="ir.ui.view" id="view_crm_lead_section_stage_tree">
+	        <field name="name">Leads Report - Sections and Stage(Tree)</field>
+	        <field name="model">report.crm.lead.section.stage</field>
+	        <field name="inherit_id" ref="view_crm_case_section_stage_tree"/>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <field name="nbr" position="after">
+	            	<field name="categ_id"/>
+	            	<field name="stage_id" select="2"/>
+	               	<field name="amount_revenue" select="2"/>
+	               	<field name="delay_close"/>
+	           </field>
+	        </field>
+	    </record>
+	    <record model="ir.ui.view" id="view_crm_lead_section_stage_form">
+	        <field name="name">Leads Report - Sections and Stage(Form)</field>
+	        <field name="model">report.crm.lead.section.stage</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <field name="nbr" position="after">
+	            	<field name="categ_id"/>
+	            	<field name="stage_id" select="2"/>
+	               	<field name="amount_revenue" select="2"/>
+	               	<field name="delay_close"/>
+	           </field>
+	        </field>
+	    </record>
+	    <record model="ir.ui.view" id="view_crm_lead_section_stage_graph">
+	        <field name="name">Leads Report - Sections and Stage(Graph)</field>
+	        <field name="model">report.crm.lead.section.stage</field>
+	        <field name="type">graph</field>
+	        <field name="arch" type="xml">
+	            <graph string="Leads by Section and Stage" type="bar" orientation="horizontal">
+	                <field name="stage_id"/>
+	                <field name="amount_revenue" operator="+"/>
+	                <field name="section_id" group="True"/>
+	            </graph>
+	        </field>
+	    </record>
+		<record id="view_crm_lead_section_stage_filter" model="ir.ui.view">
+	            <field name="name">Leads Report - Sections and Stage(Select)</field>
+	            <field name="model">report.crm.lead.section.stage</field>
+	            <field name="type">search</field>
+	            <field name="arch" type="xml">
+	                <field name="state" position="before">
+	                </field>
+	            </field>
+	        </record>
+	
+	    <record model="ir.actions.act_window" id="action_report_crm_lead_section_stage_tree">
+	        <field name="res_model">report.crm.lead.section.stage</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">graph,tree</field>
+	        <field name="view_id" ref="view_crm_lead_section_stage_tree"/>
+	        <field name="search_view_id" ref="view_crm_lead_section_stage_filter"/>
+	    </record>
+  </data>
+</openerp>
diff --git a/addons/report_crm/report_crm_opportunity.py b/addons/report_crm/report_crm_opportunity.py
new file mode 100644
index 00000000000..dbd3149556d
--- /dev/null
+++ b/addons/report_crm/report_crm_opportunity.py
@@ -0,0 +1,131 @@
+from osv import fields,osv
+import tools
+
+class report_crm_opportunity_user(osv.osv):
+    _name = "report.crm.opportunity.user"
+    _description = "Opportunity by user and section"
+    _auto = False
+    _inherit = "report.crm.case.user"
+    _columns = {
+        'probability': fields.float('Avg. Probability', readonly=True),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'amount_costs': fields.float('Est.Cost', readonly=True),
+        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_opportunity_user')
+        cr.execute("""
+            create or replace view report_crm_opportunity_user as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.state,
+                    c.user_id,
+                    c.section_id,
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    sum(planned_cost) as amount_costs,
+                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
+                    avg(probability)::decimal(16,2) as probability,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_opportunity c
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id
+            )""")
+report_crm_opportunity_user()
+
+class report_crm_opportunity_categ(osv.osv):
+    _name = "report.crm.opportunity.categ"
+    _description = "Opportunity by section and category"
+    _auto = False
+    _inherit = "report.crm.case.categ"
+    _columns = {
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'amount_costs': fields.float('Est.Cost', readonly=True),
+        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'probability': fields.float('Avg. Probability', readonly=True),
+        'delay_close': fields.char('Delay Close', size=20, readonly=True),
+    }
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_opportunity_categ')
+        cr.execute("""
+            create or replace view report_crm_opportunity_categ as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.categ_id,
+                    c.state,
+                    c.section_id,
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    sum(planned_cost) as amount_costs,
+                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
+                    avg(probability)::decimal(16,2) as probability,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_opportunity c
+                group by c.categ_id,to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state,c.section_id
+            )""")
+report_crm_opportunity_categ()
+
+class report_crm_opportunity_section(osv.osv):
+    _name = "report.crm.opportunity.section"
+    _description = "Opportunity by Section"
+    _auto = False
+    _inherit = "report.crm.case.section"
+    
+    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+        res = {}
+        state_perc = 0.0
+        avg_ans = 0.0
+        
+        for case in self.browse(cr, uid, ids, context):
+            if field_name != 'avg_answers':
+                state = field_name[5:]
+                cr.execute("select count(*) from crm_opportunity where section_id =%s and state='%s'"%(case.section_id.id,state))
+                state_cases = cr.fetchone()[0]
+                perc_state = (state_cases / float(case.nbr_cases) ) * 100
+                
+                res[case.id] = perc_state
+            else:
+                cr.execute('select count(*) from crm_case_log l  where l.section_id=%s'%(case.section_id.id))
+                logs = cr.fetchone()[0]
+                
+                avg_ans = logs / case.nbr_cases
+                res[case.id] = avg_ans       
+        
+        return res
+    
+    _columns = {
+        '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"),
+        'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+    }
+    _order = 'name desc, section_id'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_opportunity_section')
+        cr.execute("""
+            create or replace view report_crm_opportunity_section as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    count(*) as nbr_cases,
+                    c.section_id as section_id,
+                    0 as avg_answers,
+                    0.0 as perc_done,
+                    0.0 as perc_cancel,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_opportunity c
+                group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id
+            )""")
+report_crm_opportunity_section()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/report_crm/report_crm_opportunity_view.xml b/addons/report_crm/report_crm_opportunity_view.xml
new file mode 100644
index 00000000000..6e2f82d99fa
--- /dev/null
+++ b/addons/report_crm/report_crm_opportunity_view.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	<!--
+	Opportunities by user and section
+	-->
+
+        <record id="view_crm_opportunity_user_tree" model="ir.ui.view">
+            <field name="name">report.crm.opportunity.user.tree</field>
+            <field name="model">report.crm.opportunity.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_crm_opportunity_user_form" model="ir.ui.view">
+            <field name="name">report.crm.opportunity.user.form</field>
+            <field name="model">report.crm.opportunity.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_crm_opportunity_user_graph" model="ir.ui.view">
+            <field name="name">report.crm.opportunity.user.graph</field>
+            <field name="model">report.crm.opportunity.user</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Opportunity by User and Section" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="view_crm_opportunity_user_filter" model="ir.ui.view">
+            <field name="name">report.crm.opportunity.user.select</field>
+            <field name="model">report.crm.opportunity.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+               </field>
+            </field>
+        </record>
+        
+        <record id="action_report_crm_opportunity_user_tree" model="ir.actions.act_window">
+            <field name="name">Opportunity by User and Section</field>
+            <field name="res_model">report.crm.opportunity.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_crm_opportunity_user_graph"/>
+            <field name="search_view_id" ref="view_crm_opportunity_user_filter"/>
+        </record>
+        <menuitem name="Opportinities" id="menu_crm_opportunity_tree" parent="crm.next_id_52"/>
+        <menuitem action="action_report_crm_opportunity_user_tree" id="menu_crm_opportunity_user_tree" parent="menu_crm_opportunity_tree"/>
+        
+        <!-- # Opportunity by section and category of case -->
+
+        <record id="view_crm_opportunity_categ_tree" model="ir.ui.view">
+            <field name="name">report.crm.opportunity.categ.tree</field>
+            <field name="model">report.crm.opportunity.categ</field>
+            <field name="inherit_id" ref="view_crm_case_categ_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_crm_opportunity_categ_form" model="ir.ui.view">
+            <field name="name">report.crm.opportunity.categ.form</field>
+            <field name="model">report.crm.opportunity.categ</field>
+            <field name="inherit_id" ref="view_crm_case_categ_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_costs"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+
+		<record id="view_crm_opportunity_categ_graph" model="ir.ui.view">
+            <field name="name">report.crm.opportunity.categ.graph</field>
+            <field name="model">report.crm.opportunity.categ</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Opportunity by Section and Categories" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="categ_id"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_crm_opportunity_categ_filter" model="ir.ui.view">
+            <field name="name">report.crm.opportunity.categ.select</field>
+            <field name="model">report.crm.opportunity.categ</field>
+			<field name="inherit_id" ref="view_crm_case_categ_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+                </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_opportunity_categ_tree" model="ir.actions.act_window">
+            <field name="name">Opportunity by Categories and Section</field>
+            <field name="res_model">report.crm.opportunity.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_crm_opportunity_categ_graph"/>
+            <field name="search_view_id" ref="view_crm_opportunity_categ_filter"/>
+        </record>
+        <menuitem action="action_report_crm_opportunity_categ_tree" id="menu_crm_opportunity_categ_tree" parent="menu_crm_opportunity_tree"/>
+        
+        <!-- Opportunity by Section  -->
+
+        <record id="view_report_crm_opportunity_section_tree" model="ir.ui.view">
+            <field name="name">report.crm.opportunity.section.tree</field>
+            <field name="model">report.crm.opportunity.section</field>
+            <field name="inherit_id" ref="view_report_crm_case_section_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr_cases" position="after">
+	                <field name="avg_answers"/>
+	                <field name="perc_done" select="2"/>
+                    <field name="perc_cancel" select="2"/>
+                    <field name="delay_close"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_report_crm_opportunity_section_graph" model="ir.ui.view">
+            <field name="name">report.crm.opportunity.section.graph</field>
+            <field name="model">report.crm.opportunity.section</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Opportunity by Section" type="bar">
+                    <field name="name"/>
+                    <field name="nbr_cases" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_report_crm_opportunity_section_filter" model="ir.ui.view">
+            <field name="name">report.crm.opportunity.section.select</field>
+            <field name="model">report.crm.opportunity.section</field>
+            <field name="inherit_id" ref="view_report_crm_case_section_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="nbr_cases" position="before">
+                </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_opportunity_section_tree" model="ir.actions.act_window">
+            <field name="name">Opportunity by Section</field>
+            <field name="res_model">report.crm.opportunity.section</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_report_crm_opportunity_section_graph"/>
+            <field name="search_view_id" ref="view_report_crm_opportunity_section_filter"/>
+        </record>
+        <menuitem action="action_report_crm_opportunity_section_tree" id="menu_crm_opportunity_section_tree" parent="menu_crm_opportunity_tree"/>
+	</data>
+</openerp>
diff --git a/addons/report_crm/report_crm_phonecall.py b/addons/report_crm/report_crm_phonecall.py
new file mode 100644
index 00000000000..c23e3357329
--- /dev/null
+++ b/addons/report_crm/report_crm_phonecall.py
@@ -0,0 +1,127 @@
+from osv import fields,osv
+import tools
+
+class report_crm_phonecall_user(osv.osv):
+    _name = "report.crm.phonecall.user"
+    _description = "Phone calls by user and section"
+    _auto = False
+    _inherit = "report.crm.case.user"
+    _columns = {
+        'probability': fields.float('Avg. Probability', readonly=True),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_phonecall_user')
+        cr.execute("""
+            create or replace view report_crm_phonecall_user as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.state,
+                    c.user_id,
+                    c.section_id,
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
+                    avg(probability)::decimal(16,2) as probability,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') 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
+            )""")
+report_crm_phonecall_user()
+
+class report_crm_phonecall_categ(osv.osv):
+    _name = "report.crm.phonecall.categ"
+    _description = "Phone Calls by section and category"
+    _auto = False
+    _inherit = "report.crm.case.categ"
+    _columns = {
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.phonecall')]"),
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
+        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'probability': fields.float('Avg. Probability', readonly=True),
+        'delay_close': fields.char('Delay Close', size=20, readonly=True),
+    }
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_phonecall_categ')
+        cr.execute("""
+            create or replace view report_crm_phonecall_categ as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    c.categ_id,
+                    c.state,
+                    c.section_id,
+                    count(*) as nbr,
+                    sum(planned_revenue) as amount_revenue,
+                    sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
+                    avg(probability)::decimal(16,2) as probability,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_phonecall c
+                group by c.categ_id,to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state,c.section_id
+            )""")
+report_crm_phonecall_categ()
+
+class report_crm_phonecall_section(osv.osv):
+    _name = "report.crm.phonecall.section"
+    _description = "Phonecalls by Section"
+    _auto = False
+    _inherit = "report.crm.case.section"
+    
+    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+        res = {}
+        state_perc = 0.0
+        avg_ans = 0.0
+        
+        for case in self.browse(cr, uid, ids, context):
+            if field_name != 'avg_answers':
+                state = field_name[5:]
+                cr.execute("select count(*) from crm_phonecall where section_id =%s and state='%s'"%(case.section_id.id,state))
+                state_cases = cr.fetchone()[0]
+                perc_state = (state_cases / float(case.nbr_cases) ) * 100
+                
+                res[case.id] = perc_state
+            else:
+                cr.execute('select count(*) from crm_case_log l  where l.section_id=%s'%(case.section_id.id))
+                logs = cr.fetchone()[0]
+                
+                avg_ans = logs / case.nbr_cases
+                res[case.id] = avg_ans       
+        
+        return res
+    
+    _columns = {
+        '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"),
+        'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
+        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+    }
+    _order = 'name desc, section_id'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_phonecall_section')
+        cr.execute("""
+            create or replace view report_crm_phonecall_section as (
+                select
+                    min(c.id) as id,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
+                    count(*) as nbr_cases,
+                    c.section_id as section_id,
+                    0 as avg_answers,
+                    0.0 as perc_done,
+                    0.0 as perc_cancel,
+                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                from
+                    crm_phonecall c
+                group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id
+            )""")
+report_crm_phonecall_section()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/report_crm/report_crm_phonecall_view.xml b/addons/report_crm/report_crm_phonecall_view.xml
new file mode 100644
index 00000000000..c45a6936bab
--- /dev/null
+++ b/addons/report_crm/report_crm_phonecall_view.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	<!--
+	Phone calls by user and section
+	-->
+
+        <record id="view_crm_phonecall_user_tree" model="ir.ui.view">
+            <field name="name">report.crm.phonecall.user.tree</field>
+            <field name="model">report.crm.phonecall.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_crm_phonecall_user_form" model="ir.ui.view">
+            <field name="name">report.crm.phonecall.user.form</field>
+            <field name="model">report.crm.phonecall.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                	<field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_crm_phonecall_user_graph" model="ir.ui.view">
+            <field name="name">report.crm.phonecall.user.graph</field>
+            <field name="model">report.crm.phonecall.user</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Phone calls by User and Section" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="view_crm_phonecall_user_filter" model="ir.ui.view">
+            <field name="name">report.crm.phonecall.user.select</field>
+            <field name="model">report.crm.phonecall.user</field>
+            <field name="inherit_id" ref="view_crm_case_user_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+               </field>
+            </field>
+        </record>
+        
+        <record id="action_report_crm_phonecall_user_tree" model="ir.actions.act_window">
+            <field name="name">Phone calls by User and Section</field>
+            <field name="res_model">report.crm.phonecall.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_crm_phonecall_user_graph"/>
+            <field name="search_view_id" ref="view_crm_phonecall_user_filter"/>
+        </record>
+        <menuitem name="Phone Calls" id="menu_crm_phonecalls_tree" parent="crm.next_id_52"/>
+        <menuitem action="action_report_crm_phonecall_user_tree" id="menu_crm_phonecall_user_tree" parent="menu_crm_phonecalls_tree"/>
+        
+        <!-- # Phonecalls by section and category of case -->
+
+        <record id="view_crm_phonecall_categ_tree" model="ir.ui.view">
+            <field name="name">report.crm.phonecall.categ.tree</field>
+            <field name="model">report.crm.phonecall.categ</field>
+            <field name="inherit_id" ref="view_crm_case_categ_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_crm_phonecall_categ_form" model="ir.ui.view">
+            <field name="name">report.crm.phonecall.categ.form</field>
+            <field name="model">report.crm.phonecall.categ</field>
+            <field name="inherit_id" ref="view_crm_case_categ_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="nbr" position="after">
+                    <field name="delay_close"/>
+                    <field name="amount_revenue"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="probability"/>
+                </field>
+            </field>
+        </record>
+
+		<record id="view_crm_phonecall_categ_graph" model="ir.ui.view">
+            <field name="name">report.crm.phonecall.categ.graph</field>
+            <field name="model">report.crm.phonecall.categ</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Phone calls by Section and Categories" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="categ_id"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_crm_phonecall_categ_filter" model="ir.ui.view">
+            <field name="name">report.crm.phonecall.categ.select</field>
+            <field name="model">report.crm.phonecall.categ</field>
+			<field name="inherit_id" ref="view_crm_case_categ_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+                </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_phonecall_categ_tree" model="ir.actions.act_window">
+            <field name="name">Phone calls by Categories and Section</field>
+            <field name="res_model">report.crm.phonecall.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_crm_phonecall_categ_graph"/>
+            <field name="search_view_id" ref="view_crm_phonecall_categ_filter"/>
+        </record>
+        <menuitem action="action_report_crm_phonecall_categ_tree" id="menu_crm_phonecall_categ_tree" parent="menu_crm_phonecalls_tree"/>
+        
+        <!-- Phone calls by Section  -->
+
+        <record id="view_report_crm_phonecall_section_tree" model="ir.ui.view">
+            <field name="name">report.crm.phonecall.section.tree</field>
+            <field name="model">report.crm.phonecall.section</field>
+            <field name="inherit_id" ref="view_report_crm_case_section_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="nbr_cases" position="after">
+	                <field name="avg_answers"/>
+	                <field name="perc_done" select="2"/>
+                    <field name="perc_cancel" select="2"/>
+                    <field name="delay_close"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_report_crm_phonecall_section_graph" model="ir.ui.view">
+            <field name="name">report.crm.phonecall.section.graph</field>
+            <field name="model">report.crm.phonecall.section</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Phone calls by Section" type="bar">
+                    <field name="name"/>
+                    <field name="nbr_cases" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+		<record id="view_report_crm_phonecall_section_filter" model="ir.ui.view">
+            <field name="name">report.crm.phonecall.section.select</field>
+            <field name="model">report.crm.phonecall.section</field>
+            <field name="inherit_id" ref="view_report_crm_case_section_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="nbr_cases" position="before">
+                </field>
+            </field>
+        </record>
+
+        <record id="action_report_crm_phonecall_section_tree" model="ir.actions.act_window">
+            <field name="name">Phone calls by Section</field>
+            <field name="res_model">report.crm.phonecall.section</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_report_crm_phonecall_section_graph"/>
+            <field name="search_view_id" ref="view_report_crm_phonecall_section_filter"/>
+        </record>
+        <menuitem action="action_report_crm_phonecall_section_tree" id="menu_crm_phonecall_section_tree" parent="menu_crm_phonecalls_tree"/>
+  </data>
+</openerp>
diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml
index ef7306f3b5b..d2cbc4e7bc9 100644
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -15,13 +15,8 @@
                     <field name="name" />
                     <field name="month"/>
                     <field name="user_id"/>
-                    <field name="section_id"/>
+ 					<field name="section_id"/>
                     <field name="nbr"/>
-                    <field name="delay_close"/>
-                    <field name="amount_revenue"/>
-                    <field name="amount_costs"/>
-                    <field name="amount_revenue_prob"/>
-                    <field name="probability"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -35,7 +30,7 @@
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="section_id" select="1" widget="selection"/>
+					<field name="section_id" select="1"/>
                     <field name="nbr" select="1"/>
                     <field name="state" select="1"/>
                 </form>
@@ -65,21 +60,21 @@
                    		<filter string="My Cases" icon="terp-hr" domain="[('user_id','=',uid)]" help="My cases by section"/>
                    		<separator orientation="vertical"/>
                    		<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 Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
 						<separator orientation="vertical"/>
 						<field name="name" select="1"/>
 	                    <field name="month" select="1"/>
 	                    <field name="user_id" select="1"/>
-	                    <field name="section_id" select="1" widget="selection"/>
+						<field name="section_id" select="1"/>
 	                    <field name="nbr" select="1"/>
 	                    <field name="state" select="1"/>
                    </group>
                </search>
             </field>
         </record>
+	    <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
+        <menuitem id="crm.next_id_52" name="Cases" parent="base.next_id_64" sequence="0"/>
 
-        <menuitem id="crm.next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>
-        <menuitem id="crm.next_id_52" name="All Cases" parent="crm.next_id_64" sequence="0"/>
 
         <record id="action_report_crm_case_user_tree" model="ir.actions.act_window">
             <field name="name">Cases by User and Section</field>
@@ -88,8 +83,8 @@
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_crm_case_user_filter"/>
         </record>
-        <menuitem action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree" parent="crm.next_id_64"/>
-
+        <!--<menuitem action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree" parent="crm.next_id_52"/>
+-->
         <!-- # Cases by section and categoryof case -->
 
         <record id="view_crm_case_categ_tree" model="ir.ui.view">
@@ -99,15 +94,9 @@
             <field name="arch" type="xml">
                 <tree string="Cases by User and Section">
                     <field name="name"/>
+					<field name="section_id" select="1"/>
                     <field name="month"/>
-                    <field name="categ_id"/>
-                    <field name="section_id"/>
                     <field name="nbr"/>
-                    <field name="delay_close"/>
-                    <field name="amount_revenue"/>
-                    <field name="amount_costs"/>
-                    <field name="amount_revenue_prob"/>
-                    <field name="probability"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -119,9 +108,8 @@
             <field name="arch" type="xml">
                 <form string="Cases by User and Section">
                     <field name="name" select="1"/>
+					<field name="section_id" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="categ_id" select="1"/>
-                    <field name="section_id" select="1" widget="selection"/>
                     <field name="nbr" select="1"/>
                     <field name="state" select="1"/>
                 </form>
@@ -136,12 +124,10 @@
                 <search string="Search Cases by categories and Sections">
                    <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 Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
 						<separator orientation="vertical"/>
 						<field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="categ_id" select="1"/>
-	                    <field name="section_id" select="1" widget="selection"/>
+						<field name="section_id" select="1"/>
 	                    <field name="nbr" select="1"/>
 	                    <field name="state" select="1"/>
                    </group>
@@ -156,7 +142,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_crm_case_categ_filter"/>
         </record>
-        <menuitem action="action_report_crm_case_categ_tree" id="menu_crm_case_categ_tree" parent="crm.next_id_64"/>
+       <!-- <menuitem action="action_report_crm_case_categ_tree" id="menu_crm_case_categ_tree" parent="crm.next_id_52"/>-->
 
         <act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_report_crm_case_user" name="Monthly cases" res_model="report.crm.case.user" src_model="res.users"/>
 
@@ -176,13 +162,10 @@
             <field name="arch" type="xml">
                 <tree string="Cases by Section">
                     <field name="name" select="1"/>
+ 					<field name="section_id" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="section_id" select="1"/>
                     <field name="nbr_cases" select="1"/>
                     <field name="avg_answers"/>
-                    <field name="perc_done" select="2"/>
-                    <field name="perc_cancel" select="2"/>
-                    <field name="delay_close"/>
                 </tree>
             </field>
         </record>
@@ -205,13 +188,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cases by Section">
-                   <group col="4" colspan="4">
+                   <group col="8" 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 Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
 						<separator orientation="vertical"/>
 						<field name="name" select="1"/>
+						<field name="section_id" select="1"/>
 	                    <field name="month" select="1"/>
-	                    <field name="section_id" select="1"/>
 	                    <field name="nbr_cases" select="1"/>
                    </group>
                </search>
@@ -223,10 +206,69 @@
             <field name="name">Cases by Section</field>
             <field name="res_model">report.crm.case.section</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">graph,tree</field>
             <field name="search_view_id" ref="view_report_crm_case_section_filter"/>
         </record>
 
+		#
+	    # Cases by section and stage
+	    #
+		<record model="ir.ui.view" id="view_crm_case_section_stage_tree">
+        <field name="name">CRM Report - Sections and Stage(Tree)</field>
+        <field name="model">report.crm.case.section.stage</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Cases by Section and Stage">
+                <field name="name"/>
+                <field name="month"/>
+                <field name="user_id"/>
+                <field name="section_id"/>
+                <field name="nbr"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_crm_case_section_stage_form">
+        <field name="name">CRM Report - Sections and Stage(Form)</field>
+        <field name="model">report.crm.case.section.stage</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Cases by Section and Stage">
+                <field name="name"/>
+                <field name="month"/>
+                <field name="user_id"/>
+                <field name="section_id" select="1" widget="selection"/>
+                <field name="nbr" select="1"/>
+                <field name="state" select="1"/>
+            </form>
+        </field>
+    </record>
+
+	<record id="view_crm_case_section_stage_filter" model="ir.ui.view">
+            <field name="name">CRM Report - Sections and Stage(Select)</field>
+            <field name="model">report.crm.case.section.stage</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Cases by Section and Stage">
+                   <group col="8" colspan="4">
+                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" help="Cases by Section and Stage for this year"/>
+						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" help="Cases by Section and Stage for this month"/>
+						<separator orientation="vertical"/>
+						<field name="section_id" select="1" widget="selection"/>
+                		<field name="nbr" select="1"/>
+                		<field name="state" select="1"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
+    <record model="ir.actions.act_window" id="action_report_crm_case_section_stage_tree">
+        <field name="res_model">report.crm.case.section.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="search_view_id" ref="view_crm_case_section_stage_filter"/>
+    </record>
+
         <!-- Closed & Open CRM Case view for Random Activities dashboard  -->
 
         <record id="board_view_crm_case_open_dashboard_tree" model="ir.ui.view">
@@ -239,11 +281,7 @@
                     <field name="date" select="1"/>
                     <field name="date_deadline"/>
                     <field name="name" select="1"/>
-                    <field name="partner_id" select="2"/>
                     <field name="user_id" select="2"/>
-                    <field name="priority"/>
-                    <field name="planned_revenue" sum="Planned revenue"/>
-                    <field name="planned_cost" sum="Planned costs"/>
                     <field name="state" />
                 </tree>
             </field>
@@ -255,15 +293,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="CRM Cases">
-                	<field name="date_closed" select="1"/>
                     <field name="date"/>
-                    <field name="date_deadline"/>
                     <field name="name"/>
-                    <field name="partner_id" select="2"/>
                     <field name="user_id" select="2"/>
-                    <field name="priority"/>
-                    <field name="planned_revenue" sum="Planned revenue"/>
-                    <field name="planned_cost" sum="Planned costs"/>
                     <field name="state" />
                 </tree>
             </field>
diff --git a/addons/report_designer/__init__.py b/addons/report_designer/__init__.py
new file mode 100644
index 00000000000..3511d091ecb
--- /dev/null
+++ b/addons/report_designer/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import installer
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_designer/__terp__.py b/addons/report_designer/__terp__.py
new file mode 100644
index 00000000000..518a5df74ce
--- /dev/null
+++ b/addons/report_designer/__terp__.py
@@ -0,0 +1,39 @@
+# -*- 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" : "Reporting Tools",
+    "version" : "1.0",
+    "depends" : ["base"],
+    "author" : "Tiny",
+    "description": """Installer for reporting tools selection
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': [
+        'report_designer_installer.xml',
+    ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py
new file mode 100644
index 00000000000..2eb061d1344
--- /dev/null
+++ b/addons/report_designer/installer.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+
+class report_designer_installer(osv.osv_memory):
+    _name = 'report_designer.installer'
+    _inherit = 'res.config.installer'
+
+    _columns = {
+        # Reporting
+        'base_report_designer':fields.boolean('OpenOffice Report Designer'),
+        'base_report_creator':fields.boolean('Query Builder'),
+        'olap':fields.boolean('Business Intelligence Report'),
+        }
+report_designer_installer()
+
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
new file mode 100644
index 00000000000..6fe998410ad
--- /dev/null
+++ b/addons/report_designer/report_designer_installer.xml
@@ -0,0 +1,61 @@
+<openerp>
+  <data>
+    <record id="view_report_designer_installer" model="ir.ui.view">
+      <field name="name">report_designer.installer.view</field>
+      <field name="model">report_designer.installer</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="arch" type="xml">
+        <data>
+          <form position="attributes"><attribute name="string">
+              Report Modules Installation
+          </attribute></form>
+
+          <group string="res_config_contents" position="replace">
+            <separator string="Select Reporting Tools To Install" colspan="4"/>
+            <image name="gtk-dialog-info"/>
+            <newline/>
+            <label align="0.0" string=" Lorem ipsum dolor
+                sit amet, consectetur adipiscing elit. Cras metus
+                augue, ultricies et vehicula id, fringilla quis
+                mauris. Vestibulum fringilla ipsum sit amet est
+                adipiscing eget euismod velit semper. Proin non mauris
+                velit. Donec malesuada nisi sed augue viverra commodo
+                sagittis nisi rutrum. Cras vitae libero nunc, a
+                molestie sapien. Proin et augue sit amet est egestas
+                fermentum ut eu lacus. Etiam nisi orci, volutpat
+                aliquam viverra interdum, vehicula iaculis
+                lectus. Mauris ligula sapien, auctor in pharetra non,
+                ultrices quis odio."/>
+            <group>
+              <separator string="Reporting" colspan="4"/>
+              <field name="base_report_designer"/>
+              <field name="base_report_creator"/>
+              <field name="olap"/>
+            </group>
+          </group>
+
+          <xpath expr='//button[@name="action_skip"]' position='replace'/>
+          <xpath expr='//button[@name="action_next"]' position='attributes'>
+            <attribute name='string'>Install Modules</attribute>
+          </xpath>
+        </data>
+      </field>
+    </record>
+
+    <record id="action_report_designer_installer" model="ir.actions.act_window">
+      <field name="name">Report Modules Installation</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">report_designer.installer</field>
+      <field name="view_id" ref="view_report_designer_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="report_designer_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_report_designer_installer"/>
+      <field name="sequence">1</field>
+    </record>
+  </data>
+</openerp>
diff --git a/addons/report_document/__init__.py b/addons/report_document/__init__.py
index 9e149f60828..589836526a1 100644
--- a/addons/report_document/__init__.py
+++ b/addons/report_document/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_document/__terp__.py b/addons/report_document/__terp__.py
index 1fd082632f6..a75bccbcf05 100644
--- a/addons/report_document/__terp__.py
+++ b/addons/report_document/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_document/report_document.py b/addons/report_document/report_document.py
index 27df808adf4..efe3a8183ab 100644
--- a/addons/report_document/report_document.py
+++ b/addons/report_document/report_document.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_document/report_document_view.xml b/addons/report_document/report_document_view.xml
index 423e02395d5..b8bee399f82 100644
--- a/addons/report_document/report_document_view.xml
+++ b/addons/report_document/report_document_view.xml
@@ -57,8 +57,8 @@
             </field>
         </record>
 
-        <menuitem name="Document Management" id="menu_action_view_my_document"/>
-        <menuitem name="Reporting" id="menu_action_view_my_document_report" parent="menu_action_view_my_document"/>
+     <!--   <menuitem name="Document Management" id="menu_action_view_my_document"/>
+        <menuitem name="Reporting" id="menu_action_view_my_document_report" parent="menu_action_view_my_document"/>-->
 
         <record model="ir.actions.act_window" id="action_view_all_document_tree1">
             <field name="name">All Users files</field>
@@ -68,7 +68,7 @@
             <field name="search_view_id" ref="view_report_document_user_search"/>
         </record>
 
-        <menuitem name="All Users files" id="menu_action_view_my_document_report_all_userfile" parent="menu_action_view_my_document_report" action="action_view_all_document_tree1"/>
+      <!--  <menuitem name="All Users files" id="menu_action_view_my_document_report_all_userfile" parent="menu_action_view_my_document_report" action="action_view_all_document_tree1"/>-->
 
 <!--        -->
         <record model="ir.ui.view" id="view_document_wall_form">
@@ -107,7 +107,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem name="Wall of Shame" id="menu_action_view_my_document_report_shame" parent="menu_action_view_my_document_report" action="action_view_wall"/>
+        <!--<menuitem name="Wall of Shame" id="menu_action_view_my_document_report_shame" parent="menu_action_view_my_document_report" action="action_view_wall"/>-->
 
 <!--***************************************************************************************-->
 
diff --git a/addons/report_intrastat/__init__.py b/addons/report_intrastat/__init__.py
index df4085668f1..d2f598434a2 100644
--- a/addons/report_intrastat/__init__.py
+++ b/addons/report_intrastat/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_intrastat/__terp__.py b/addons/report_intrastat/__terp__.py
index 0b1f6d19c8b..4f2366dfe81 100644
--- a/addons/report_intrastat/__terp__.py
+++ b/addons/report_intrastat/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_intrastat/report/__init__.py b/addons/report_intrastat/report/__init__.py
index 87e4c010ecd..64e530bc278 100644
--- a/addons/report_intrastat/report/__init__.py
+++ b/addons/report_intrastat/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_intrastat/report/invoice.py b/addons/report_intrastat/report/invoice.py
index 22e203f9dd1..815d3efc1fb 100644
--- a/addons/report_intrastat/report/invoice.py
+++ b/addons/report_intrastat/report/invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_intrastat/report_intrastat.py b/addons/report_intrastat/report_intrastat.py
index 5da69c1e579..c6d30f754d9 100644
--- a/addons/report_intrastat/report_intrastat.py
+++ b/addons/report_intrastat/report_intrastat.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 2242d37545b..c021962ed09 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -67,7 +67,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="product.menu_config_product"/>
+        <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="base.menu_product"/>
 
 
         <record id="view_report_intrastat_tree" model="ir.ui.view">
diff --git a/addons/report_mrp/__init__.py b/addons/report_mrp/__init__.py
index 72cfce50710..cac56f5f3bf 100644
--- a/addons/report_mrp/__init__.py
+++ b/addons/report_mrp/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_mrp/__terp__.py b/addons/report_mrp/__terp__.py
index 6fa91a63866..b58dbd5c601 100644
--- a/addons/report_mrp/__terp__.py
+++ b/addons/report_mrp/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_mrp/report_mrp.py b/addons/report_mrp/report_mrp.py
index 1f36e7e1637..6ae1b2e63e5 100644
--- a/addons/report_mrp/report_mrp.py
+++ b/addons/report_mrp/report_mrp.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_mrp/report_mrp_view.xml b/addons/report_mrp/report_mrp_view.xml
index 33e11f19150..90eba6c667a 100644
--- a/addons/report_mrp/report_mrp_view.xml
+++ b/addons/report_mrp/report_mrp_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <record id="view_workcenter_load_tree" model="ir.ui.view">
             <field name="name">report.workcenter.load.tree</field>
             <field name="model">report.workcenter.load</field>
@@ -15,7 +15,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_workcenter_load_graph" model="ir.ui.view">
             <field name="name">report.workcenter.load.graph</field>
             <field name="model">report.workcenter.load</field>
@@ -29,8 +29,8 @@
                 </graph>
             </field>
         </record>
-        
-        
+
+
         <record id="view_workcenter_load_form" model="ir.ui.view">
             <field name="name">report.workcenter.load.form</field>
             <field name="model">report.workcenter.load</field>
@@ -50,11 +50,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem id="next_id_77" name="Reporting" parent="mrp.menu_mrp_root" sequence="100"/>
+        <menuitem id="next_id_77" name="Reporting" parent="mrp.menu_mrp_root" sequence="49"/>
         <menuitem action="action_report_workcenter_load_tree" id="menu_report_workcenter_load" parent="next_id_77"/>
-        
+
         <!-- stock.move compared to internal location src/dest -->
-        
+
         <record id="view_report_in_out_picking_tree" model="ir.ui.view">
             <field name="name">report.mrp.inout.tree</field>
             <field name="model">report.mrp.inout</field>
@@ -66,7 +66,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_report_in_out_picking_form" model="ir.ui.view">
             <field name="name">report.mrp.inout.form</field>
             <field name="model">report.mrp.inout</field>
@@ -78,8 +78,8 @@
                 </form>
             </field>
         </record>
-        
-        
+
+
         <record id="view_report_in_out_picking_graph" model="ir.ui.view">
             <field name="name">report.mrp.inout.graph</field>
             <field name="model">report.mrp.inout</field>
@@ -91,7 +91,7 @@
                 </graph>
             </field>
         </record>
-        
+
         <record id="action_report_in_out_picking_tree" model="ir.actions.act_window">
             <field name="name">Weekly Stock Value Variation</field>
             <field name="res_model">report.mrp.inout</field>
@@ -99,8 +99,8 @@
             <field name="view_mode">graph,tree</field>
         </record>
         <menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking" parent="report_mrp.next_id_77"/>
-        
-        
-        
+
+
+
     </data>
 </openerp>
diff --git a/addons/report_project/__init__.py b/addons/report_project/__init__.py
index 88d26d8b641..eced45af748 100644
--- a/addons/report_project/__init__.py
+++ b/addons/report_project/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_project/__terp__.py b/addons/report_project/__terp__.py
index fe4b138c59a..0c55a666abf 100644
--- a/addons/report_project/__terp__.py
+++ b/addons/report_project/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_project/report_project.py b/addons/report_project/report_project.py
index e6f5fd828e1..f894b9301dc 100644
--- a/addons/report_project/report_project.py
+++ b/addons/report_project/report_project.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_purchase/__init__.py b/addons/report_purchase/__init__.py
index bb2d5ee66f1..83e17dc65d0 100644
--- a/addons/report_purchase/__init__.py
+++ b/addons/report_purchase/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_purchase/__terp__.py b/addons/report_purchase/__terp__.py
index 78341b928a8..279ff24ca8e 100644
--- a/addons/report_purchase/__terp__.py
+++ b/addons/report_purchase/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_purchase/report_purchase.py b/addons/report_purchase/report_purchase.py
index 342423422d2..caf482fe14e 100644
--- a/addons/report_purchase/report_purchase.py
+++ b/addons/report_purchase/report_purchase.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_purchase/report_purchase_view.xml b/addons/report_purchase/report_purchase_view.xml
index 9fd52a77a91..fdfd860461a 100644
--- a/addons/report_purchase/report_purchase_view.xml
+++ b/addons/report_purchase/report_purchase_view.xml
@@ -80,7 +80,8 @@
         </record>
 
         <menuitem id="next_id_73" name="Reporting" parent="purchase.menu_purchase_root"/>
-        <menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_73"/>
+        <menuitem action="action_order_product_tree_all" id="menu_report_order_product_all"
+        	name="PO by Products" parent="next_id_73"/>
 
         <!-- Purchases by category by month -->
 
@@ -159,7 +160,8 @@
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_order_category_search"/>
         </record>
-        <menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="report_purchase.next_id_73"/>
+        <menuitem action="action_order_category_tree_all" id="menu_report_order_category_all"
+        	name="PO by Products Category" parent="report_purchase.next_id_73"/>
 
         <act_window domain="[('product_id', '=', active_id)]" id="act_product_product_2_report_purchases_order_product" name="Monthly purchases" res_model="report.purchase.order.product" src_model="product.product"/>
 
diff --git a/addons/report_sale/__init__.py b/addons/report_sale/__init__.py
index 60dade61fbd..3fff21af134 100644
--- a/addons/report_sale/__init__.py
+++ b/addons/report_sale/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_sale/__terp__.py b/addons/report_sale/__terp__.py
index 2aab207ac61..6fca757ab51 100644
--- a/addons/report_sale/__terp__.py
+++ b/addons/report_sale/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_sale/report_sale.py b/addons/report_sale/report_sale.py
index 424b0c7042b..52b85a732ec 100644
--- a/addons/report_sale/report_sale.py
+++ b/addons/report_sale/report_sale.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_sale/report_sale_graph.xml b/addons/report_sale/report_sale_graph.xml
index 28f8ed4f74a..72c6f7ac578 100644
--- a/addons/report_sale/report_sale_graph.xml
+++ b/addons/report_sale/report_sale_graph.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
-        <menuitem id="next_id_83" name="Graphs" parent="report_sale.next_id_80"/><menuitem icon="STOCK_PRINT" id="ir_ui_menu1" name="Monthly Sales Turnover Over One Year" parent="next_id_83"/>
+
+        <menuitem id="next_id_83" name="Graphs" parent="base.next_id_64"/><menuitem icon="STOCK_PRINT" id="ir_ui_menu1" name="Monthly Sales Turnover Over One Year" parent="next_id_83" sequence="1"/>
         <menuitem icon="STOCK_PRINT" id="ir_ui_menu2" name="Daily Sales Turnover Over One Year" parent="report_sale.next_id_83"/>
         <menuitem icon="STOCK_PRINT" id="ir_ui_menu3" name="Monthly Cumulated Sales Turnover Over One Year" parent="report_sale.next_id_83"/>
-        
+
         <!-- reports -->
         <record id="ir_report_custom_4" model="ir.report.custom">
             <field model="ir.model" name="model_id" search="[('model','=','sale.order')]"/>
@@ -15,7 +15,7 @@
             <field name="type">bar</field>
             <field name="menu_id" ref="ir_ui_menu1"/>
         </record>
-        
+
         <record id="ir_report_custom_5" model="ir.report.custom">
             <field model="ir.model" name="model_id" search="[('model','=','sale.order')]"/>
             <field name="title">Daily sales turnover over one year</field>
@@ -24,7 +24,7 @@
             <field name="type">bar</field>
             <field name="menu_id" ref="ir_ui_menu2"/>
         </record>
-        
+
         <record id="ir_report_custom_6" model="ir.report.custom">
             <field model="ir.model" name="model_id" search="[('model','=','sale.order')]"/>
             <field name="title">Monthly cumulated sales turnover over one year</field>
@@ -33,7 +33,7 @@
             <field name="type">bar</field>
             <field name="menu_id" ref="ir_ui_menu3"/>
         </record>
-        
+
         <!-- fields -->
         <record id="ir_report_custom_fields_0" model="ir.report.custom.fields">
             <field model="ir.model.fields" name="field_child0" search="[('name','=','date_order'), ('model','=','sale.order')]"/>
@@ -51,7 +51,7 @@
             <field name="report_id" ref="ir_report_custom_4"/>
             <field name="name">sales</field>
         </record>
-        
+
         <record id="ir_report_custom_fields_2" model="ir.report.custom.fields">
             <field model="ir.model.fields" name="field_child0" search="[('name','=','date_order'), ('model','=','sale.order')]"/>
             <field name="sequence">1</field>
@@ -69,7 +69,7 @@
             <field name="report_id" ref="ir_report_custom_5"/>
             <field name="name">sale</field>
         </record>
-        
+
         <record id="ir_report_custom_fields_1" model="ir.report.custom.fields">
             <field model="ir.model.fields" name="field_child0" search="[('name','=','date_order'), ('model','=','sale.order')]"/>
             <field name="sequence">1</field>
@@ -87,10 +87,10 @@
             <field name="report_id" ref="ir_report_custom_6"/>
             <field name="name">sales</field>
         </record>
-        
+
         <function eval="[[ir_report_custom_4]]" model="ir.report.custom" name="subscribe"/>
         <function eval="[[ir_report_custom_5]]" model="ir.report.custom" name="subscribe"/>
         <function eval="[[ir_report_custom_6]]" model="ir.report.custom" name="subscribe"/>
-        
+
     </data>
 </openerp>
diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index c20153f0d10..476cb5ac11b 100644
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -77,8 +77,9 @@
             <field name="search_view_id" ref="view_order_product_search"/>
         </record>
 
-        <menuitem id="next_id_80" name="Reporting" parent="sale.menu_sale_root"/>
-        <menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_80"/>
+		<menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
+<!--        <menuitem id="base.next_id_80" name="Reporting" parent="base.menu_base_partner" sequence="7"/>-->
+        <menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="base.next_id_64" sequence="3"/>
 
         <!-- Sales by category by month -->
 
@@ -156,7 +157,7 @@
             <field name="view_mode">graph,tree</field>
             <field name="search_view_id" ref="view_order_category_search"/>
         </record>
-        <menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="report_sale.next_id_80"/>
+        <menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="base.next_id_64" sequence="4"/>
 
         <!-- Sales of the month -->
         <record id="view_order_graph" model="ir.ui.view">
@@ -177,7 +178,7 @@
             <field name="view_mode">graph,tree,form</field>
             <field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
         </record>
-        <menuitem action="action_order_sale_list" id="menu_report_order_sale_list" parent="report_sale.next_id_80"/>
+        <menuitem action="action_order_sale_list" id="menu_report_order_sale_list" parent="base.next_id_64" sequence="5"/>
 
 		<record id="view_so_pipeline_graph" model="ir.ui.view">
              <field name="name">sale.order.dashboard.graph</field>
diff --git a/addons/report_task/__init__.py b/addons/report_task/__init__.py
index 88f71ccb143..38945a471fe 100644
--- a/addons/report_task/__init__.py
+++ b/addons/report_task/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_task/__terp__.py b/addons/report_task/__terp__.py
index ffc4efa63e1..843bfa4c79e 100644
--- a/addons/report_task/__terp__.py
+++ b/addons/report_task/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_task/report_task.py b/addons/report_task/report_task.py
index 342d2f5c4ea..ff6590689f8 100644
--- a/addons/report_task/report_task.py
+++ b/addons/report_task/report_task.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml
index 2b5c56bee8a..e86abd878e6 100644
--- a/addons/report_task/report_task_view.xml
+++ b/addons/report_task/report_task_view.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+          <menuitem
+            id="hr.menu_hr_reporting"
+            name="Reporting"
+            parent="hr.menu_hr_root"
+            sequence="40" />
 
         <!-- Tasks by projects and users -->
 
diff --git a/addons/report_timesheet/__init__.py b/addons/report_timesheet/__init__.py
index b2110b3a2db..4b57906849c 100644
--- a/addons/report_timesheet/__init__.py
+++ b/addons/report_timesheet/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_timesheet/__terp__.py b/addons/report_timesheet/__terp__.py
index 4e782ce9248..67d797f86cb 100644
--- a/addons/report_timesheet/__terp__.py
+++ b/addons/report_timesheet/__terp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -28,7 +28,7 @@
     All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['hr_timesheet', 'hr_timesheet_invoice'],
+    'depends': ['hr_timesheet', 'hr_timesheet_invoice','hr_attendance'],
     'init_xml': [],
     'update_xml': ['security/ir.model.access.csv', 'report_timesheet_view.xml'],
     'demo_xml': [],
diff --git a/addons/report_timesheet/report_timesheet.py b/addons/report_timesheet/report_timesheet.py
index 015634b9001..28f129dce22 100644
--- a/addons/report_timesheet/report_timesheet.py
+++ b/addons/report_timesheet/report_timesheet.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index 65a9ba23370..ed9c0666c48 100644
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
+        <menuitem
+            id="hr.menu_hr_reporting"
+            name="Reporting"
+            parent="hr.menu_hr_root"
+            sequence="40" />
         <!-- Statistics report on timesheet by user -->
 
         <record id="view_timesheet_user_graph" model="ir.ui.view">
@@ -359,12 +363,15 @@
 
 		<record model="ir.actions.act_window" id="action_random_timesheet_lines_board">
             <field name="type">ir.actions.act_window</field>
-            <field name="name">Random Timesheet Lines</field>
+            <field name="name">Timesheet Lines</field>
             <field name="res_model">random.timesheet.lines</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_random_timesheet_lines_tree"/>
         </record>
-
+	  <!--<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board"
+            parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>-->
+       <menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board" name="Timesheets Lines"
+            parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>
     </data>
 </openerp>
diff --git a/addons/resource/__terp__.py b/addons/resource/__terp__.py
index 2ffbb7b5288..4970fe2ceac 100755
--- a/addons/resource/__terp__.py
+++ b/addons/resource/__terp__.py
@@ -37,7 +37,7 @@
     'init_xml': [],
     'update_xml': [
         #'security/resource_security.xml',
-        #'security/ir.model.access.csv',
+#        'security/ir.model.access.csv',        
         'resource_view.xml',        
     ],
     'demo_xml': [#'resource_demo.xml'
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 80d0650e0c8..2c53237a60a 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-hr" id="menu_resource_root" name="Resources Management"/>
-        <menuitem
-            id="menu_resource_reporting"
-            name="Reporting"
-            parent="menu_resource_root"
-            sequence="40" />
-        <menuitem
-            id="menu_resource_configuration"
-            name="Configuration"
-            parent="menu_resource_root"
-            sequence="5"/>
-
+<!--        <menuitem icon="terp-hr" id="base.menu_resource_root" name="Resources Management"/> -->
+<!--        <menuitem-->
+<!--            id="menu_resource_reporting"-->
+<!--            name="Reporting"-->
+<!--            parent="menu_resource_root"-->
+<!--            sequence="40" />-->
+<!--        <menuitem-->
+<!--            id="menu_resource_configuration"-->
+<!--            name="Configuration"-->
+<!--            parent="menu_resource_root"-->
+<!--            sequence="5"/>-->
 
         <record id="resource_calendar_form" model="ir.ui.view">
             <field name="name">resource.calendar.form</field>
@@ -34,7 +33,7 @@
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
         </record>
-        <menuitem string="Resource Calendar" action="action_resource_calendar_form" id="menu_resource_calendar_form" parent="menu_resource_configuration"/>
+<!--        <menuitem string="Resource Calendar" action="action_resource_calendar_form" id="menu_resource_calendar_form" parent="menu_resource_configuration"/>-->
 
         <record id="view_resource_calendar_week_tree" model="ir.ui.view">
             <field name="name">resource.calendar.week.tree</field>
@@ -130,7 +129,9 @@
             <field name="res_model">resource.resource</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_resource_resource_tree" id="menu_resource_resource_tree" parent="menu_resource_root"/>
+        <menuitem icon="terp-project" id="base.menu_main" name="Project Management"/>
+        <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>
+        <menuitem action="action_resource_resource_tree" id="base.menu_resource_resource_tree" parent="base.menu_pm_planning" />
 
         <record id="resource_calendar_leave_form" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.form</field>
@@ -167,7 +168,7 @@
             <field name="res_model">resource.calendar.leaves</field>
             <field name="view_mode">tree,form,calendar</field>
         </record>
-        <menuitem action="action_resource_calendar_leave_tree" id="menu_resource_calendar_leave_tree" parent="menu_resource_root"/>
+<!--        <menuitem action="action_resource_calendar_leave_tree" id="menu_resource_calendar_leave_tree" parent="menu_resource_root"/>-->
 
 
     </data>
diff --git a/addons/resource/security/ir.model.access.csv b/addons/resource/security/ir.model.access.csv
new file mode 100644
index 00000000000..0874bf97235
--- /dev/null
+++ b/addons/resource/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_timesheet_group","resource.calendar","model_resource_calendar","hr.group_hr_user",1,0,0,0
+"access_hr_timesheet","hr.timesheet","model_hr_timesheet","hr.group_hr_user",1,1,1,1
+"access_hr_timesheet_manager","hr.timesheet manager","model_hr_timesheet","hr.group_hr_manager",1,1,1,1
+"access_hr_timesheet_group_manager","hr.timesheet.group.manager","model_hr_timesheet_group","hr.group_hr_manager",1,1,1,1
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index 3dbc66170d0..bb873b9a524 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py
index 0b9e6ab4348..2abafb3e32b 100644
--- a/addons/sale/__terp__.py
+++ b/addons/sale/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale/mrp.py b/addons/sale/mrp.py
index b169f5cb85f..bb16a65425a 100644
--- a/addons/sale/mrp.py
+++ b/addons/sale/mrp.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 1c131c251ec..106bdd8793d 100755
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -75,7 +75,7 @@
         </record>
 
         <record id="process_node_packinglist0" model="process.node">
-            <field name="menu_id" ref="stock.menu_action_picking_tree"/>
+<!--            <field name="menu_id" ref="stock.menu_action_picking_tree"/>-->
             <field name="model_id" ref="stock.model_stock_picking"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Pick List&quot;&quot;&quot;" name="name"/>
diff --git a/addons/sale/product.py b/addons/sale/product.py
index 8002668a79b..ab28e693524 100644
--- a/addons/sale/product.py
+++ b/addons/sale/product.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale/report/__init__.py b/addons/sale/report/__init__.py
index ba5fcc3d481..60b6a2999fc 100644
--- a/addons/sale/report/__init__.py
+++ b/addons/sale/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale/report/order.py b/addons/sale/report/order.py
index 039c26fbe00..dcd6f54e047 100644
--- a/addons/sale/report/order.py
+++ b/addons/sale/report/order.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale/report/sale_prepare_allot.py b/addons/sale/report/sale_prepare_allot.py
index 557edcd3675..d5292b6d515 100644
--- a/addons/sale/report/sale_prepare_allot.py
+++ b/addons/sale/report/sale_prepare_allot.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 5389c944b73..5f6e0db3448 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -148,7 +148,7 @@ class sale_order(osv.osv):
                 res[sale.id] = False
         return res
 
-    def _invoiced_search(self, cursor, user, obj, name, args):
+    def _invoiced_search(self, cursor, user, obj, name, args, context):
         if not len(args):
             return []
         clause = ''
@@ -453,7 +453,23 @@ class sale_order(osv.osv):
                 self.pool.get('sale.order.line').write(cr, uid, [line.id], {'invoiced': invoiced})
         self.write(cr, uid, ids, {'state': 'invoice_except', 'invoice_ids': False})
         return True
-
+    
+    def action_invoice_end(self, cr, uid, ids, context={}):
+        for order in self.browse(cr, uid, ids):
+            val = {'invoiced': True}
+            if order.state == 'invoice_except':
+                val['state'] = 'progress'
+                
+            for line in order.order_line:
+                towrite = []
+                if line.state == 'exception':
+                    towrite.append(line.id)
+                if towrite:
+                    self.pool.get('sale.order.line').write(cr, uid, towrite, {'state': 'confirmed'}, context=context)
+            self.write(cr, uid, [order.id], val)
+            
+        return True
+    
     def action_cancel(self, cr, uid, ids, context={}):
         ok = True
         sale_order_line_obj = self.pool.get('sale.order.line')
@@ -517,25 +533,9 @@ class sale_order(osv.osv):
         notcanceled = False
         write_done_ids = []
         write_cancel_ids = []
-        stock_move_obj = self.pool.get('stock.move')
         for order in self.browse(cr, uid, ids, context={}):
-
-            #check for pending deliveries
-            pending_deliveries = False
-            # check => if order_lines do not exist,don't proceed for any mode.
-            if not order.order_line:
-                return False
             for line in order.order_line:
-                move_ids = stock_move_obj.search(cr, uid, [('sale_line_id','=', line.id)])
-                for move in stock_move_obj.browse( cr, uid, move_ids ):
-                    #if one of the related order lines is in state draft, auto or confirmed
-                    #this order line is not yet delivered
-                    if move.state in ('draft', 'waiting', 'confirmed'):
-                        pending_deliveries = True
-                # Reason => if there are no move lines,the following condition will always set to be true,and will set SO to 'DONE'.
-                # Added move_ids check to SOLVE.
-                if move_ids and ((not line.procurement_id) or (line.procurement_id.state=='done')) and not pending_deliveries:
-#                    finished = True
+                if (not line.procurement_id) or (line.procurement_id.state=='done'):
                     if line.state != 'done':
                         write_done_ids.append(line.id)
                 else:
@@ -1062,6 +1062,8 @@ sale_order_line()
 
 class sale_config_picking_policy(osv.osv_memory):
     _name = 'sale.config.picking_policy'
+    _inherit = 'res.config'
+
     _columns = {
         'name': fields.char('Name', size=64),
         'picking_policy': fields.selection([
@@ -1087,7 +1089,7 @@ class sale_config_picking_policy(osv.osv_memory):
         'step': lambda *a: 'one'
     }
 
-    def set_default(self, cr, uid, ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         for o in self.browse(cr, uid, ids, context=context):
             ir_values_obj = self.pool.get('ir.values')
             ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], o.picking_policy)
@@ -1104,23 +1106,5 @@ class sale_config_picking_policy(osv.osv_memory):
                 location_id = md._get_id(cr, uid, 'stock', 'stock_location_output')
                 location_id = md.browse(cr, uid, location_id, context).res_id
                 self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-         }
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-         }
-
 sale_config_picking_policy()
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 8a1c7095db5..6a3d7af6423 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management"
-            groups="group_sale_user"/>
+<!--        <menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management"-->
+<!--            groups="group_sale_user"/>-->
+		<menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
+
+		<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
+		<menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 
         <record id="view_shop_form" model="ir.ui.view">
             <field name="name">sale.shop</field>
@@ -41,8 +45,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_shop_tree"/>
         </record>
-        <menuitem id="menu_shop_configuration" name="Configuration" parent="sale.menu_sale_root" sequence="1"/>
-        <menuitem action="action_shop_form" id="menu_action_shop_form" parent="sale.menu_shop_configuration"/>
+        <menuitem action="action_shop_form" id="menu_action_shop_form" parent="base.menu_base_config" sequence="60"/>
 
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
@@ -252,7 +255,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
-        <menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sale_root"/>
+        <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3"/>
 
         <record id="action_order_tree2" model="ir.actions.act_window">
             <field name="name">Sales in Exception</field>
@@ -266,7 +269,7 @@
         </record>
 
         <record id="action_order_tree3" model="ir.actions.act_window">
-            <field name="name">Sales Order To Be Invoiced</field>
+            <field name="name">Sales To Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
@@ -416,8 +419,8 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_sales_order_line_filter"/>
         </record>
-        <menuitem action="action_order_line_tree1" id="menu_action_order_line_tree1" parent="sale.menu_sale_root"
-            groups="base.group_extended"/>
+        <menuitem action="action_order_line_tree1" id="menu_action_order_line_tree1" parent="base.menu_sales"
+            groups="base.group_extended" sequence="4"/>
 
         <record id="action_order_line_tree2" model="ir.actions.act_window">
             <field name="name">Uninvoiced Lines</field>
@@ -443,27 +446,36 @@
 
         <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/>
 
+		<menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="6"/>
+		<menuitem action="action_order_tree3" id="menu_invoicing_sales_order" parent="menu_invoiced" sequence="1"/>
+		<menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
         <!-- configartion view -->
 
         <record id="view_config_picking_policy" model="ir.ui.view">
             <field name="name">Configure Picking Policy for Sale Order </field>
             <field name="model">sale.config.picking_policy</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Sales Configuration">
-                    <separator colspan="4" string="Configure Sale Order Logistic"/>
-                    <newline/>
-                    <field name="picking_policy"/>
-                    <newline/>
-                    <field name="order_policy"/>
-                    <newline/>
-                    <field name="step"/>
-                    <separator string="" colspan="4"/>
-                    <group col="4" colspan="4">
-                        <button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" name="set_default" string="Set Default" type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Sales Configuration
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <label colspan="4" align="0.0" string="
+                    Set the policies selected by default when creating a new
+                    sale order."/>
+                  <separator colspan="4"
+                             string="Configure Sale Order Logistic"/>
+                  <newline/>
+                  <field name="picking_policy"/>
+                  <newline/>
+                  <field name="order_policy"/>
+                  <newline/>
+                  <field name="step"/>
+                </group>
+                <xpath expr='//button[@name="action_skip"]' position='replace'/>
+              </data>
             </field>
         </record>
 
@@ -471,6 +483,7 @@
             <field name="name">Configure Picking Policy for Sale Order</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.config.picking_policy</field>
+            <field name="view_id" ref="view_config_picking_policy"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
@@ -478,11 +491,8 @@
 
         <!-- register configuration wizard -->
         <record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo">
-            <field name="name">Select the default picking policy for Sale Order</field>
-            <field name="note">This Configuration step use to set default picking policy when make sale order</field>
             <field name="action_id" ref="action_config_picking_policy"/>
         </record>
 
-
     </data>
 </openerp>
diff --git a/addons/sale/sale_workflow.xml b/addons/sale/sale_workflow.xml
index 15b6f359175..6a7e7b6a8ee 100644
--- a/addons/sale/sale_workflow.xml
+++ b/addons/sale/sale_workflow.xml
@@ -75,7 +75,8 @@
         <record id="act_invoice_end" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">invoice_end</field>
-            <field name="kind">dummy</field>
+            <field name="kind">function</field>
+            <field name="action">action_invoice_end()</field>
         </record>
         <record id="act_invoice_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index cd95e9398bf..6f9bcc52bb1 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -10,7 +10,7 @@
     </record>
 
 
-    <record model='ir.ui.menu' id='menu_shop_configuration'>
+    <record model='ir.ui.menu' id='menu_action_shop_form'>
         <field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
     </record>
 
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index bd1b89dcaf0..e2f632bf711 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale/unit_test/__init__.py b/addons/sale/unit_test/__init__.py
index c193a98e39a..f96719c920e 100644
--- a/addons/sale/unit_test/__init__.py
+++ b/addons/sale/unit_test/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/sale/unit_test/test.py b/addons/sale/unit_test/test.py
index 05c5b875675..f1a90b4e2d9 100644
--- a/addons/sale/unit_test/test.py
+++ b/addons/sale/unit_test/test.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/sale/wizard/__init__.py b/addons/sale/wizard/__init__.py
index cb16937aac3..6141e90b83b 100644
--- a/addons/sale/wizard/__init__.py
+++ b/addons/sale/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale/wizard/make_invoice.py b/addons/sale/wizard/make_invoice.py
index b3c3e97cc93..7b190c3b2d6 100644
--- a/addons/sale/wizard/make_invoice.py
+++ b/addons/sale/wizard/make_invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale/wizard/make_invoice_advance.py b/addons/sale/wizard/make_invoice_advance.py
index 689cdc23bef..eaa1fc4a14b 100644
--- a/addons/sale/wizard/make_invoice_advance.py
+++ b/addons/sale/wizard/make_invoice_advance.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale/wizard/wizard_sale_line_invoice.py b/addons/sale/wizard/wizard_sale_line_invoice.py
index 2dcce07b073..8e1e49ab22d 100644
--- a/addons/sale/wizard/wizard_sale_line_invoice.py
+++ b/addons/sale/wizard/wizard_sale_line_invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_analytic_plans/__init__.py b/addons/sale_analytic_plans/__init__.py
index 9ecb3433634..8d09c9a356b 100644
--- a/addons/sale_analytic_plans/__init__.py
+++ b/addons/sale_analytic_plans/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_analytic_plans/__terp__.py b/addons/sale_analytic_plans/__terp__.py
index f3c6536ea9b..ef89b5743c3 100644
--- a/addons/sale_analytic_plans/__terp__.py
+++ b/addons/sale_analytic_plans/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index 370eeb6ef5c..df9eee3e316 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_crm/__init__.py b/addons/sale_crm/__init__.py
index d709f5e64d4..d36ce25fd33 100644
--- a/addons/sale_crm/__init__.py
+++ b/addons/sale_crm/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_crm/__terp__.py b/addons/sale_crm/__terp__.py
index c1b59468ce5..045afbbd82c 100644
--- a/addons/sale_crm/__terp__.py
+++ b/addons/sale_crm/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_crm/i18n/tr.po b/addons/sale_crm/i18n/tr.po
index 2fbea4c132f..b852191caf6 100644
--- a/addons/sale_crm/i18n/tr.po
+++ b/addons/sale_crm/i18n/tr.po
@@ -7,39 +7,39 @@ 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 20:54+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-24 18:09+0000\n"
+"Last-Translator: Oktay Altunergil <oktaya@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: 2009-12-16 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-01-25 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_crmopportunityquotation
 msgid "Crm opportunity quotation"
-msgstr ""
+msgstr "CRM Fırsat Teklifi"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityanalytic0
 msgid "Opportunity Analytic"
-msgstr ""
+msgstr "Fırsat Analitiği"
 
 #. module: sale_crm
 #: help:crm.case.make_order,init,partner_id:0
 msgid "Use this partner if there is no partner on the case"
-msgstr ""
+msgstr "Olaya bağlı ortak yoksa bu ortağı kullan"
 
 #. module: sale_crm
 #: wizard_button:sale_crm.make_case,init,create:0
 msgid "Create"
-msgstr ""
+msgstr "Oluştur"
 
 #. module: sale_crm
 #: selection:crm.case.make_order,init,picking_policy:0
 msgid "All at once"
-msgstr ""
+msgstr "Hepsi birden"
 
 #. module: sale_crm
 #: constraint:ir.ui.view:0
@@ -49,158 +49,158 @@ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_crmopportunityquotation
 msgid "Opportunity goes into the quotation"
-msgstr ""
+msgstr "Fırsat teklife gider"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractanalytic0
 msgid "Analytic account"
-msgstr ""
+msgstr "Analitik Hesap"
 
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_crmquotation0
 msgid "Convert opportunity to quotation"
-msgstr ""
+msgstr "Fırsatı teklife dönüştür"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,description:0
 msgid "Your action"
-msgstr ""
+msgstr "Eyleminiz"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,picking_policy:0
 msgid "Packing Policy"
-msgstr ""
+msgstr "Picking Policy"
 
 #. module: sale_crm
 #: wizard_button:crm.case.make_order,init,order:0
 msgid "Create Quote"
-msgstr ""
+msgstr "Teklif Oluştur"
 
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractpricelist0
 msgid "Contract Volume (pricelist)"
-msgstr ""
+msgstr "Sözleşme Miktarı (fiyat listesi)"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmopportunity0
 msgid "CRM Opportunity"
-msgstr ""
+msgstr "CRM Fırsatı"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Sale CRM Stuff"
-msgstr ""
+msgstr "Sale CRM Stuff"
 
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunityquotation0
 msgid "Opportunity convert into quotation"
-msgstr ""
+msgstr "Fırsatı teklife çevir"
 
 #. module: sale_crm
 #: selection:crm.case.make_order,init,picking_policy:0
 msgid "Direct Delivery"
-msgstr ""
+msgstr "Direk Teslim"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityquotation0
 msgid "Opportunity Quotation"
-msgstr ""
+msgstr "Fırsat Teklifi"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmquotation0
 msgid "Quotation"
-msgstr ""
+msgstr "Teklif"
 
 #. module: sale_crm
 #: view:crm.case:0
 #: wizard_view:crm.case.make_order,init:0
 msgid "Convert to Quote"
-msgstr ""
+msgstr "Teklife Dönüştür"
 
 #. module: sale_crm
 #: help:crm.case.make_order,init,close:0
 msgid "Check this to close the case after having created the sale order."
-msgstr ""
+msgstr "Satış emrini oluşturduktan sonra olayı kapatmak için seçiniz."
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Müşteri"
 
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunitypricelist0
 msgid "Opporunity convert to the Pricelist"
-msgstr ""
+msgstr "Fırsatı Fiyat Listesine çevir"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,user:0
 msgid "User Responsible"
-msgstr ""
+msgstr "Sorumlu Kullanıcı"
 
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractanalytic0
 msgid "Reflect the contract made with customer"
-msgstr ""
+msgstr "Müşteri ile yapılan sözleşmeye göre göster"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,products:0
 msgid "Products"
-msgstr ""
+msgstr "Ürünler"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,close:0
 msgid "Close Case"
-msgstr ""
+msgstr "Olay Kapat"
 
 #. module: sale_crm
 #: model:ir.actions.wizard,name:sale_crm.sale_crm_make_case_wizard
 #: wizard_view:sale_crm.make_case,init:0
 msgid "Make Case"
-msgstr ""
+msgstr "Olay Yap"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "Mağaza"
 
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_crmopportunity0
 msgid "The CRM Opportunity can lead to a quotation."
-msgstr ""
+msgstr "CRM Fırsatı teklifle sonuçlanabilir."
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunitypricelist0
 msgid "Opportunity Pricelist"
-msgstr ""
+msgstr "Fırsat Teklifi"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractpricelist0
 msgid "Contract Pricelist"
-msgstr ""
+msgstr "Sözleşme Fiyat Listesi"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,name:0
 msgid "Case Description"
-msgstr ""
+msgstr "Olay Tanımı"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,analytic_account:0
 #: model:process.transition,note:sale_crm.process_transition_opportunityanalytic0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitik Hesap"
 
 #. module: sale_crm
 #: model:ir.actions.wizard,name:sale_crm.sale_crm_wizard
 msgid "Make Quotation"
-msgstr ""
+msgstr "Teklif Ver"
 
 #. module: sale_crm
 #: wizard_button:crm.case.make_order,init,end:0
 #: wizard_button:sale_crm.make_case,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Vazgeç"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,section:0
 msgid "Case Section"
-msgstr ""
+msgstr "Olay Bölümü"
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 8c98b743d02..556ed90c2fd 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -30,7 +30,7 @@ class sale_order(osv.osv):
 
     def _get_section(self, cr, uid, context):
        user = self.pool.get('res.users').browse(cr,uid,uid,context=context)
-       return user.context_section_id
+       return int(user.context_section_id)
 
     _defaults = {
           'section_id':_get_section
diff --git a/addons/sale_crm/security/sale_crm_security.xml b/addons/sale_crm/security/sale_crm_security.xml
index 544fe1ab9a0..96fe3c63939 100644
--- a/addons/sale_crm/security/sale_crm_security.xml
+++ b/addons/sale_crm/security/sale_crm_security.xml
@@ -9,7 +9,7 @@
     </record>
     <record model="ir.rule" id="sale_order_comp_rule">
         <field name="rule_group" ref="sale_order_crm_rule_group"/>
-        <field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
     </record>
 
     <record model="ir.rule.group" id="sale_order_line_crm_rule_group">
@@ -19,7 +19,7 @@
     </record>
     <record model="ir.rule" id="sale_order_line_comp_rule">
         <field name="rule_group" ref="sale_order_line_crm_rule_group"/>
-        <field name="domain_force">['|',('order_id.section_id','=',False),('order_id.section_id','=',user.context_section_id)]</field>
+        <field name="domain_force">['|',('order_id.section_id','=',False),('order_id.section_id','in',[user.context_section_id])]</field>
     </record>
 
 
diff --git a/addons/sale_crm/wizard/__init__.py b/addons/sale_crm/wizard/__init__.py
index 53b36c394cc..87048a13fc4 100644
--- a/addons/sale_crm/wizard/__init__.py
+++ b/addons/sale_crm/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
index 3bcd77babca..c5ad6a92a72 100644
--- a/addons/sale_crm/wizard/makesale.py
+++ b/addons/sale_crm/wizard/makesale.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -25,6 +25,7 @@ import wizard
 import netsvc
 import ir
 import pooler
+from tools.translate import _
 
 sale_form = """<?xml version="1.0"?>
 <form string="Convert to Quote">
@@ -119,7 +120,7 @@ class make_sale(wizard.interface):
                 value['tax_id'] = [(6,0,value['tax_id'])]
                 sale_line_obj.create(cr, uid, value)
 
-            case_obj.write(cr, uid, case.id, {'ref': 'sale.order,%s' % new_id})
+            case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
             new_ids.append(new_id)
 
         if data['form']['close']:
diff --git a/addons/sale_delivery_report/__init__.py b/addons/sale_delivery_report/__init__.py
index 8747a7badac..7a3708accd9 100644
--- a/addons/sale_delivery_report/__init__.py
+++ b/addons/sale_delivery_report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_delivery_report/__terp__.py b/addons/sale_delivery_report/__terp__.py
index da20767e4ca..a5f6cc437fd 100644
--- a/addons/sale_delivery_report/__terp__.py
+++ b/addons/sale_delivery_report/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_delivery_report/report/__init__.py b/addons/sale_delivery_report/report/__init__.py
index 109021a336c..085fa3a3cdc 100644
--- a/addons/sale_delivery_report/report/__init__.py
+++ b/addons/sale_delivery_report/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_delivery_report/report/shipping.py b/addons/sale_delivery_report/report/shipping.py
index fa2bcf9aa91..d9fe87a7006 100644
--- a/addons/sale_delivery_report/report/shipping.py
+++ b/addons/sale_delivery_report/report/shipping.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_journal/__init__.py b/addons/sale_journal/__init__.py
index c19b13046cb..4cb6588ed18 100644
--- a/addons/sale_journal/__init__.py
+++ b/addons/sale_journal/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_journal/__terp__.py b/addons/sale_journal/__terp__.py
index 16853c72b2b..fab406b3bcc 100644
--- a/addons/sale_journal/__terp__.py
+++ b/addons/sale_journal/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
index ac6160d9c3d..c164f50a787 100644
--- a/addons/sale_journal/picking_journal_view.xml
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -87,8 +87,8 @@
 	</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"/>
+	<!--<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>
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index cdba7d031ee..c041a934274 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_journal/sale_journal_inherit.py b/addons/sale_journal/sale_journal_inherit.py
index e88c6b68a70..cae45519c16 100644
--- a/addons/sale_journal/sale_journal_inherit.py
+++ b/addons/sale_journal/sale_journal_inherit.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_journal/sale_journal_picking_report.py b/addons/sale_journal/sale_journal_picking_report.py
index d7735b2a29c..6b045ed556c 100644
--- a/addons/sale_journal/sale_journal_picking_report.py
+++ b/addons/sale_journal/sale_journal_picking_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_journal/sale_journal_report.py b/addons/sale_journal/sale_journal_report.py
index 2aee0ba09e9..e77d7569004 100644
--- a/addons/sale_journal/sale_journal_report.py
+++ b/addons/sale_journal/sale_journal_report.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 86212fc6591..7783f646292 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -31,7 +31,7 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/>
+<!--    <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="view_sale_journal_form">
         <field name="name">sale_journal.sale.journal.form</field>
@@ -118,7 +118,9 @@
         <field name="search_view_id" ref="view_sale_journal_search"/>
     </record>
 
-    <menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>
+<!--    <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.ui.view" id="sale_journal_sale_order">
         <field name="name">sale.order.journal.view.form</field>
@@ -321,7 +323,7 @@
         <field name="search_view_id" ref="view_sale_journal_sale_stats_search"/>
     </record>
 
-	<menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/>
+	<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"/>
 
     <act_window name="Monthly sales"
diff --git a/addons/scrum/__init__.py b/addons/scrum/__init__.py
index 28fd9b55eba..204f3abd3f8 100644
--- a/addons/scrum/__init__.py
+++ b/addons/scrum/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/scrum/__terp__.py b/addons/scrum/__terp__.py
index 7c6cd7fb0ff..130ada9dc41 100644
--- a/addons/scrum/__terp__.py
+++ b/addons/scrum/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/scrum/report/__init__.py b/addons/scrum/report/__init__.py
index 97109965c64..2e7bbe68cd0 100644
--- a/addons/scrum/report/__init__.py
+++ b/addons/scrum/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/scrum/report/_burndown.py b/addons/scrum/report/_burndown.py
index f0ccc51cc95..a1be43ef993 100644
--- a/addons/scrum/report/_burndown.py
+++ b/addons/scrum/report/_burndown.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/scrum/report/sprint_burndown.py b/addons/scrum/report/sprint_burndown.py
index 36e65d711e4..79a549ff81f 100644
--- a/addons/scrum/report/sprint_burndown.py
+++ b/addons/scrum/report/sprint_burndown.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/scrum/report/task_burndown.py b/addons/scrum/report/task_burndown.py
index 977d8fe9e6c..ddb3173c963 100644
--- a/addons/scrum/report/task_burndown.py
+++ b/addons/scrum/report/task_burndown.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py
index ed14304e080..b1740f433cf 100644
--- a/addons/scrum/scrum.py
+++ b/addons/scrum/scrum.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/scrum/wizard/__init__.py b/addons/scrum/wizard/__init__.py
index 1c04e78679f..3dcc246290a 100644
--- a/addons/scrum/wizard/__init__.py
+++ b/addons/scrum/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/scrum/wizard/backlog_to_task.py b/addons/scrum/wizard/backlog_to_task.py
index 47a640c7695..284d5b1a5f4 100644
--- a/addons/scrum/wizard/backlog_to_task.py
+++ b/addons/scrum/wizard/backlog_to_task.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/__init__.py b/addons/stock/__init__.py
index 4075fe65ea4..216fa82d01a 100644
--- a/addons/stock/__init__.py
+++ b/addons/stock/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index e4180cce0a8..7ddf97553de 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index 8ba706c49be..61e055a1404 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -658,6 +658,11 @@ msgstr "Erledigt am"
 msgid "Expected Shipping Date"
 msgstr "Erwartete Auslieferung"
 
+#. module: stock
+#: rml:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr "Lieferanschrift:"
+
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index 5210b7e2f92..22bca72c8ca 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -673,6 +673,11 @@ msgstr "Date de fin"
 msgid "Expected Shipping Date"
 msgstr "Date d'envoi prévue"
 
+#. module: stock
+#: rml:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr "Adresse de livraison :"
+
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"
diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po
index 1bacbeb6457..d12588ec13e 100644
--- a/addons/stock/i18n/pt.po
+++ b/addons/stock/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-12-09 01:29+0000\n"
+"PO-Revision-Date: 2010-01-22 00:53+0000\n"
 "Last-Translator: Paulino <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: 2009-12-16 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-01-23 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -39,7 +39,7 @@ msgstr "Sub Produtos"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-account"
-msgstr ""
+msgstr "terp-account"
 
 #. module: stock
 #: constraint:ir.actions.act_window:0
@@ -50,12 +50,12 @@ msgstr "Nome de modelo inválido na definição da acção"
 #: model:ir.module.module,shortdesc:stock.module_meta_information
 #: model:ir.ui.menu,name:stock.menu_stock_root
 msgid "Inventory Management"
-msgstr ""
+msgstr "Inventários"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SORT_ASCENDING"
-msgstr ""
+msgstr "STOCK_SORT_ASCENDING"
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
@@ -65,7 +65,7 @@ msgstr "Revisão"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_FORWARD"
-msgstr ""
+msgstr "STOCK_MEDIA_FORWARD"
 
 #. module: stock
 #: rml:lot.location:0
@@ -75,7 +75,7 @@ msgstr "Total:"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_100"
-msgstr ""
+msgstr "STOCK_ZOOM_100"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -86,7 +86,7 @@ msgstr "UdM"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.return_picking
 msgid "Return packing"
-msgstr "Retornar embalagens"
+msgstr "Embalagem de retorno"
 
 #. module: stock
 #: field:product.category,property_stock_journal:0
@@ -96,31 +96,31 @@ msgstr "Diário de stock"
 #. module: stock
 #: wizard_view:stock.fill_inventory,init:0
 msgid "Fill Inventory for specific location"
-msgstr ""
+msgstr "Preencha o inventário para a localização específica"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 #: view:stock.picking:0
 #: field:stock.picking.move.wizard,picking_id:0
 msgid "Packing list"
-msgstr "Lista de recolhas"
+msgstr "Lista de recolha"
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Amount"
-msgstr ""
+msgstr "Montante"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Received"
-msgstr ""
+msgstr "Artigos recebidos"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 msgid "Incoming Products"
-msgstr ""
+msgstr "Artigos a entrar"
 
 #. module: stock
 #: field:stock.picking,name:0
@@ -131,17 +131,17 @@ msgstr "Referência"
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,group:0
 msgid "Group by partner"
-msgstr "Agrupar por terceiros"
+msgstr "Agrupar por parceiro"
 
 #. module: stock
 #: field:stock.picking,address_id:0
 msgid "Partner"
-msgstr "Terceiro"
+msgstr "Parceiro"
 
 #. module: stock
 #: help:product.product,track_incoming:0
 msgid "Force to use a Production Lot during receptions"
-msgstr ""
+msgstr "Forçar o uso de lotes de produção nas recepções"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -159,12 +159,12 @@ msgstr "Lote de produção"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NEW"
-msgstr ""
+msgstr "STOCK_NEW"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CANCEL"
-msgstr ""
+msgstr "STOCK_CANCEL"
 
 #. module: stock
 #: selection:stock.location,usage:0
@@ -174,7 +174,7 @@ msgstr "Localização interna"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PRINT"
-msgstr ""
+msgstr "STOCK_PRINT"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -184,7 +184,7 @@ msgstr "Estado"
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
-msgstr ""
+msgstr "Valor Real do Stock"
 
 #. module: stock
 #: view:stock.move:0
@@ -196,7 +196,7 @@ msgstr "UdM"
 #: selection:stock.picking,state:0
 #: field:stock.production.lot,stock_available:0
 msgid "Available"
-msgstr ""
+msgstr "Disponível"
 
 #. module: stock
 #: view:stock.move:0
@@ -206,12 +206,12 @@ msgstr "Fazer Pacote"
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "Packing result"
-msgstr ""
+msgstr "Resultado do empacotamento"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_QUIT"
-msgstr ""
+msgstr "STOCK_QUIT"
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
@@ -221,70 +221,70 @@ msgstr "Localização de saída"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_TOP"
-msgstr ""
+msgstr "STOCK_GOTO_TOP"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ABOUT"
-msgstr ""
+msgstr "STOCK_ABOUT"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-hr"
-msgstr ""
+msgstr "terp-hr"
 
 #. module: stock
 #: field:stock.location,usage:0
 msgid "Location Type"
-msgstr ""
+msgstr "Tipo de Localização"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-purchase"
-msgstr ""
+msgstr "terp-purchase"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DND"
-msgstr ""
+msgstr "STOCK_DND"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Sent"
-msgstr ""
+msgstr "Artigos enviados"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_FIRST"
-msgstr ""
+msgstr "STOCK_GOTO_FIRST"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
 msgid "Internal Moves"
-msgstr ""
+msgstr "Movimentos internos"
 
 #. module: stock
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
-msgstr "Embalagem"
+msgstr "Empacotamento"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Order(Origin)"
-msgstr ""
+msgstr "Ordem (origem)"
 
 #. module: stock
 #: rml:lot.location:0
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Grand Total:"
-msgstr ""
+msgstr "Total global"
 
 #. module: stock
 #: view:stock.location:0
@@ -295,17 +295,17 @@ msgstr "Informação adicional"
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Nota de crédito a clientes"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FLOPPY"
-msgstr ""
+msgstr "STOCK_FLOPPY"
 
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
-msgstr "Revisões do lote de produção"
+msgstr "Revisões de lotes de produção"
 
 #. module: stock
 #: view:stock.location:0
@@ -321,7 +321,7 @@ msgstr "Nome da localização"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNINDENT"
-msgstr ""
+msgstr "STOCK_UNINDENT"
 
 #. module: stock
 #: view:stock.move:0
@@ -332,7 +332,7 @@ msgstr "Informação de movimentos"
 #. module: stock
 #: view:stock.picking:0
 msgid "Unreceived Products"
-msgstr ""
+msgstr "Artigos não recebidos"
 
 #. module: stock
 #: field:stock.inventory,state:0
@@ -349,22 +349,22 @@ msgstr "Clientes"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDERLINE"
-msgstr ""
+msgstr "STOCK_UNDERLINE"
 
 #. module: stock
 #: view:stock.picking.move.wizard:0
 msgid "Move Lines"
-msgstr "Linhas de movimentos"
+msgstr "Linhas de movimento"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
 msgid "Include all childs for the location"
-msgstr ""
+msgstr "Incluir todos os dependentes da localização"
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
-msgstr "Localizção de obtenção"
+msgstr "Localizção de aprovisionamento"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
@@ -375,12 +375,12 @@ msgstr "Lotes de produção"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Recipient"
-msgstr "Receptor"
+msgstr "Recipiente"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.track_line
 msgid "Track line"
-msgstr "Linha de procura"
+msgstr "Linha de rastreio"
 
 #. module: stock
 #: field:stock.location,child_ids:0
@@ -390,17 +390,17 @@ msgstr "Contém"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_BOLD"
-msgstr ""
+msgstr "STOCK_BOLD"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-graph"
-msgstr ""
+msgstr "terp-graph"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PREFERENCES"
-msgstr ""
+msgstr "STOCK_PREFERENCES"
 
 #. module: stock
 #: rml:lot.location:0
@@ -414,7 +414,7 @@ msgstr "Quantidade"
 #. module: stock
 #: view:stock.picking:0
 msgid "Process Now"
-msgstr ""
+msgstr "Processar agora"
 
 #. module: stock
 #: field:stock.location,address_id:0
@@ -424,17 +424,17 @@ msgstr "Endereço de localização"
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
-msgstr "Lote de produção é usado para inserir um numero de serie na produção"
+msgstr "Lote de produção é usado para atribuir um numero de serie à produção"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_13
 msgid "Stock Level 1"
-msgstr ""
+msgstr "Nivel de Stock 1"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_REWIND"
-msgstr ""
+msgstr "STOCK_MEDIA_REWIND"
 
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
@@ -454,33 +454,33 @@ msgstr "Fazer empacotamento"
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
 msgid "Procurements"
-msgstr "Obtenções"
+msgstr "Aprovisionamentos"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_3
 msgid "IT Suppliers"
-msgstr ""
+msgstr "Fornecedores de TI"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form3
 #: model:ir.ui.menu,name:stock.menu_action_move_form3
 msgid "Draft Moves"
-msgstr "Movimentos em rascunhos"
+msgstr "Movimentos rascunho"
 
 #. module: stock
 #: field:report.stock.lines.date,product_id:0
 msgid "Product Id"
-msgstr ""
+msgstr "ID do artigo"
 
 #. module: stock
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Vendas e compras"
+msgstr "Vendas & Compras"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Factura a Clientes"
 
 #. module: stock
 #: field:product.template,property_stock_inventory:0
@@ -495,7 +495,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CUT"
-msgstr ""
+msgstr "STOCK_CUT"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -504,7 +504,7 @@ msgid ""
 "instead of the default one, as the source location for stock moves generated "
 "when you do an inventory"
 msgstr ""
-"Para o actual produto (modelo), esta localização do stock será utilizado, em "
+"Para o artigo actual (modelo), esta localização do stock será utilizado, em "
 "vez do padrão, como o local de origem para o movimentos de stock gerados "
 "quando você faz um inventario"
 
@@ -516,7 +516,7 @@ msgstr "Esta conta será usada para validar o stock de saída"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_FIT"
-msgstr ""
+msgstr "STOCK_ZOOM_FIT"
 
 #. module: stock
 #: help:product.category,property_stock_journal:0
@@ -530,22 +530,22 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery
 #: model:ir.ui.menu,name:stock.menu_picking_calendar_delivery
 msgid "Calendar of Deliveries"
-msgstr ""
+msgstr "Calendário de Entregas"
 
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incomming Lots"
-msgstr ""
+msgstr "Rastrear lotes à entrada"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
 msgid "Stock by Location"
-msgstr ""
+msgstr "Stock por localização"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SAVE_AS"
-msgstr ""
+msgstr "STOCK_SAVE_AS"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
@@ -555,17 +555,17 @@ msgstr ""
 #. module: stock
 #: field:stock.location,stock_virtual:0
 msgid "Virtual Stock"
-msgstr ""
+msgstr "Stock virtual"
 
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "View"
-msgstr "Ver"
+msgstr "Vista"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_ERROR"
-msgstr ""
+msgstr "STOCK_DIALOG_ERROR"
 
 #. module: stock
 #: field:stock.location,parent_left:0
@@ -580,12 +580,12 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_INDEX"
-msgstr ""
+msgstr "STOCK_INDEX"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_BOTTOM"
-msgstr ""
+msgstr "STOCK_GOTO_BOTTOM"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_form
@@ -619,7 +619,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_FORWARD"
-msgstr ""
+msgstr "STOCK_GO_FORWARD"
 
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
@@ -629,31 +629,36 @@ msgstr "Autor"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDELETE"
-msgstr ""
+msgstr "STOCK_UNDELETE"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_EXECUTE"
-msgstr ""
+msgstr "STOCK_EXECUTE"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_QUESTION"
-msgstr ""
+msgstr "STOCK_DIALOG_QUESTION"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
-msgstr ""
+msgstr "Operação Manual"
 
 #. module: stock
 #: field:stock.picking,date_done:0
 msgid "Date Done"
-msgstr ""
+msgstr "Data de conclusão"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Expected Shipping Date"
+msgstr "Data esperada de envio"
+
+#. module: stock
+#: rml:stock.picking.list:0
+msgid "Shipping Address :"
 msgstr ""
 
 #. module: stock
@@ -664,23 +669,25 @@ msgstr "Rastrear/Serial"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_FONT"
-msgstr ""
+msgstr "STOCK_SELECT_FONT"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PASTE"
-msgstr ""
+msgstr "STOCK_PASTE"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr "Localizações do terceiro"
+msgstr "Localizações do parceiro"
 
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid ""
 "Tracking lot is the code that will be put on the logistical unit/pallet"
 msgstr ""
+"Rastreamento do lote é o código que será colocado na unidade /palete "
+"logística"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -690,12 +697,12 @@ msgstr "Numero de rastreio"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
 msgid "European Customers"
-msgstr ""
+msgstr "Clientes Europeus"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-stock"
-msgstr ""
+msgstr "Stock-terp"
 
 #. module: stock
 #: rml:stock.picking.list:0
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 0cb2bb5dc63..2d4c615b7c1 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -646,6 +646,11 @@ msgstr ""
 msgid "Expected Shipping Date"
 msgstr ""
 
+#. module: stock
+#: rml:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr ""
+
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"
diff --git a/addons/stock/partner.py b/addons/stock/partner.py
index 68f8221f58d..a2d96369615 100644
--- a/addons/stock/partner.py
+++ b/addons/stock/partner.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 44df90a3b3a..13131583a1c 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index f5b99ff97e6..5bad46baa07 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/report/lot_location.py b/addons/stock/report/lot_location.py
index 82715048e5f..c1b1ae9fe05 100644
--- a/addons/stock/report/lot_location.py
+++ b/addons/stock/report/lot_location.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/report/lot_overview.py b/addons/stock/report/lot_overview.py
index 97e7681d335..9fb88d01791 100644
--- a/addons/stock/report/lot_overview.py
+++ b/addons/stock/report/lot_overview.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/report/lot_overview_all.py b/addons/stock/report/lot_overview_all.py
index c1e8a8f7b61..5e6bba84d23 100644
--- a/addons/stock/report/lot_overview_all.py
+++ b/addons/stock/report/lot_overview_all.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index b17d21e2e4f..8ab08a5016c 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py
index fb615a2a3d2..79a6c91de22 100644
--- a/addons/stock/report/product_stock.py
+++ b/addons/stock/report/product_stock.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/report/stock_by_location.py b/addons/stock/report/stock_by_location.py
index 2499c28d759..2b019936100 100644
--- a/addons/stock/report/stock_by_location.py
+++ b/addons/stock/report/stock_by_location.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py
index 1049ecb210d..0fdf88da7ce 100644
--- a/addons/stock/report/stock_graph.py
+++ b/addons/stock/report/stock_graph.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/report/ups.py b/addons/stock/report/ups.py
index c4b26353af7..fb8483341ec 100644
--- a/addons/stock/report/ups.py
+++ b/addons/stock/report/ups.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/report_stock.py b/addons/stock/report_stock.py
index ca28ccf4ab4..15187b0e7e2 100644
--- a/addons/stock/report_stock.py
+++ b/addons/stock/report_stock.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/report_stock_view.xml b/addons/stock/report_stock_view.xml
index ba6cb865501..fd0cf3f60cd 100644
--- a/addons/stock/report_stock_view.xml
+++ b/addons/stock/report_stock_view.xml
@@ -16,7 +16,7 @@
             </field>
         </record>
         <record id="action_stock_report_prodlots_form" model="ir.actions.act_window">
-            <field name="name">Stock by Lots</field>
+            <field name="name">Locations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.report.prodlots</field>
             <field name="view_type">form</field>
@@ -43,17 +43,17 @@
         <menuitem
             id="next_id_61"
             name="Reporting"
-            parent="stock.menu_stock_root"/>
+            parent="stock.menu_stock_root" sequence="5"/>
 
-        <menuitem
-            id="next_id_62"
-            name="Traceability"
-            parent="next_id_61"/>
+<!--        <menuitem-->
+<!--            id="next_id_62"-->
+<!--            name="Traceability"-->
+<!--            parent="next_id_61"/>-->
 
         <menuitem
             action="action_stock_report_prodlots_form"
             id="menu_stock_report_prodlots"
-            parent="next_id_62"/>
+            parent="stock.menu_stock_inventory_control" sequence="1"/>
 
         <act_window
             context="{'product_id': active_id}"
@@ -116,13 +116,13 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_stock_line_date">
-            <field name="name">Dates of Inventories</field>
+            <field name="name">Latest Inventory Date by Product</field>
             <field name="res_model">report.stock.lines.date</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem parent="next_id_61" action="action_stock_line_date" id="menu_report_stock_line_date"/>
+        <menuitem parent="next_id_61" action="action_stock_line_date" id="menu_report_stock_line_date" sequence="2"/>
 
         <record id="view_location_tree_3" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
@@ -139,13 +139,13 @@
         </record>
 
         <record id="action_location_tree_3" model="ir.actions.act_window">
-            <field name="name">Locations' Values</field>
+            <field name="name">Inventory Valuation</field>
             <field name="res_model">stock.location</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_location_tree_3"/>
         </record>
-        <menuitem action="action_location_tree_3" id="menu_action_location_tree_3" parent="next_id_61" />
+        <menuitem action="action_location_tree_3" id="menu_action_location_tree_3" parent="next_id_61" sequence="1"/>
 
     <!-- end...  -->
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 13483900a1c..1ea6aa998b2 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -533,8 +533,8 @@ class stock_picking(osv.osv):
     def force_assign(self, cr, uid, ids, *args):
         wf_service = netsvc.LocalService("workflow")
         for pick in self.browse(cr, uid, ids):
-#           move_ids = [x.id for x in pick.move_lines if x.state == 'confirmed']
-            move_ids = [x.id for x in pick.move_lines]
+            move_ids = [x.id for x in pick.move_lines if x.state in ['confirmed','waiting']]
+#            move_ids = [x.id for x in pick.move_lines]
             self.pool.get('stock.move').force_assign(cr, uid, move_ids)
             wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
         return True
@@ -770,7 +770,7 @@ class stock_picking(osv.osv):
                 tax_ids = self._get_taxes_invoice(cursor, user, move_line, type)
                 account_analytic_id = self._get_account_analytic_invoice(cursor,
                         user, picking, move_line)
-                
+
                 #set UoS if it's a sale and the picking doesn't have one
                 uos_id = move_line.product_uos and move_line.product_uos.id or False
                 if not uos_id and type in ('out_invoice', 'out_refund'):
@@ -819,6 +819,18 @@ class stock_picking(osv.osv):
                     return False
         return True
 
+    def unlink(self, cr, uid, ids, context=None):
+        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,))
+            elif pick.state in ['confirmed','assigned']:
+                ids2 = [move.id for move in pick.move_lines]
+                context.update({'call_unlink':True})
+                self.pool.get('stock.move').action_cancel(cr, uid, ids2, context)
+            else:
+                continue
+        return super(stock_picking, self).unlink(cr, uid, ids, context=context)
+
 stock_picking()
 
 
@@ -864,7 +876,7 @@ class stock_production_lot(osv.osv):
             res.update(dict(cr.fetchall()))
         return res
 
-    def _stock_search(self, cr, uid, obj, name, args):
+    def _stock_search(self, cr, uid, obj, name, args, context):
         locations = self.pool.get('stock.location').search(cr, uid, [('usage', '=', 'internal')])
         cr.execute('''select
                 prodlot_id,
@@ -901,6 +913,71 @@ class stock_production_lot(osv.osv):
 
 stock_production_lot()
 
+class stock_split_production_lots(osv.osv_memory):
+    _name = "stock.split.production.lots"
+    _description = "Split Production Lots"
+    
+    def _quantity_default_get(self, cr, uid, object=False, field=False, context=None):
+        cr.execute("select %s from %s where id=%s" %(field,object,context.get('active_id')))
+        res = cr.fetchone()[0]
+        return res
+    
+    _columns = {
+        'name': fields.char('Lot Number/Prefix', size=64, required=True),
+        'qty': fields.float('Total Quantity'),
+        'action': fields.selection([('split','Split'),('keepinone','Keep in one lot')],'Action'),
+    }
+    _defaults = {
+                 'qty': lambda self,cr,uid,c: self.pool.get('stock.split.production.lots')._quantity_default_get(cr, uid, 'stock_move', 'product_qty',context=c) or 1,
+    }
+    
+    def split_lines(self, cr, uid, ids, context={}):
+        data = self.read(cr, uid, ids[0])
+        prodlot_obj = self.pool.get('stock.production.lot')
+        move_obj = self.pool.get('stock.move')
+        move_browse = move_obj.browse(cr, uid, context['active_id'])
+        
+        quantity = data['qty']
+        if quantity <= 0 or move_browse.product_qty == 0:
+            return {}
+        uos_qty = quantity/move_browse.product_qty*move_browse.product_uos_qty
+
+        quantity_rest = move_browse.product_qty%quantity
+        uos_qty_rest = quantity_rest/move_browse.product_qty*move_browse.product_uos_qty
+    
+        update_val = {
+            'product_qty': quantity,
+            'product_uos_qty': uos_qty,
+        }
+        
+        new_move = []
+        for idx in range(int(move_browse.product_qty//quantity)):
+            if idx:
+                current_move = move_obj.copy(cr, uid, move_browse.id, {'state': move_browse.state})
+                new_move.append(current_move)
+            else:
+                current_move = move_browse.id
+            new_prodlot = prodlot_obj.create(cr, uid, {'name': data['name'], 'ref': '%d'%idx}, {'product_id': move_browse.product_id.id})
+            update_val['prodlot_id'] = new_prodlot
+            move_obj.write(cr, uid, [current_move], update_val)
+        
+        if quantity_rest > 0:
+            idx = int(move_browse.product_qty//quantity)
+            update_val['product_qty'] = quantity_rest
+            update_val['product_uos_qty'] = uos_qty_rest
+            if idx:
+                current_move = move_obj.copy(cr, uid, move_browse.id, {'state': move_browse.state})
+                new_move.append(current_move)
+            else:
+                current_move = move_browse.id
+            new_prodlot = prodlot_obj.create(cr, uid, {'name': data['name'], 'ref': '%d'%idx}, {'product_id': move_browse.product_id.id})
+            update_val['prodlot_id'] = new_prodlot
+            move_obj.write(cr, uid, [current_move], update_val)
+        
+        return {}
+
+stock_split_production_lots()
+
 
 class stock_production_lot_revision(osv.osv):
     _name = 'stock.production.lot.revision'
@@ -951,8 +1028,8 @@ class stock_move(osv.osv):
                ( \
                    (move.product_id.track_production and move.location_id.usage=='production') or \
                    (move.product_id.track_production and move.location_dest_id.usage=='production') or \
-                   (move.product_id.track_incoming and move.location_id.usage=='supplier') or \
-                   (move.product_id.track_outgoing and move.location_dest_id.usage=='customer') \
+                   (move.product_id.track_incoming and move.location_id.usage in ('supplier','internal')) or \
+                   (move.product_id.track_outgoing and move.location_dest_id.usage in ('customer','internal')) \
                )):
                 return False
         return True
@@ -1070,7 +1147,7 @@ class stock_move(osv.osv):
             cursor.commit()
         return res
 
-    def onchange_lot_id(self, cr, uid, ids, prodlot_id=False, product_qty=False, loc_id=False, context=None):
+    def onchange_lot_id(self, cr, uid, ids, prodlot_id=False, product_qty=False, loc_id=False, product_id=False, context=None):
         if not prodlot_id or not loc_id:
             return {}
         ctx = context and context.copy() or {}
@@ -1084,25 +1161,25 @@ class stock_move(osv.osv):
                 'message': 'You are moving %.2f products but only %.2f available in this lot.' % (product_qty, prodlot.stock_available or 0.0)
             }
         return {'warning': warning}
-    
+
     def onchange_quantity(self, cr, uid, ids, product_id, product_qty, product_uom, product_uos):
         result = {
                   'product_uos_qty': 0.00
           }
-        
+
         if (not product_id) or (product_qty <=0.0):
             return {'value': result}
-            
+
         product_obj = self.pool.get('product.product')
         uos_coeff = product_obj.read(cr, uid, product_id, ['uos_coeff'])
-        
+
         if product_uos and product_uom and (product_uom != product_uos):
             result['product_uos_qty'] = product_qty * uos_coeff['uos_coeff']
         else:
             result['product_uos_qty'] = product_qty
-        
+
         return {'value': result}
-    
+
     def onchange_product_id(self, cr, uid, ids, prod_id=False, loc_id=False, loc_dest_id=False):
         if not prod_id:
             return {}
@@ -1115,7 +1192,7 @@ class stock_move(osv.osv):
             'product_qty': 1.00,
             'product_uos_qty' : self.pool.get('stock.move').onchange_quantity(cr, uid, ids, prod_id, 1.00, product.uom_id.id, uos_id)['value']['product_uos_qty']
         }
-        
+
         if loc_id:
             result['location_id'] = loc_id
         if loc_dest_id:
@@ -1258,14 +1335,14 @@ class stock_move(osv.osv):
                     pickings[move.picking_id.id] = True
             if move.move_dest_id and move.move_dest_id.state == 'waiting':
                 self.write(cr, uid, [move.move_dest_id.id], {'state': 'assigned'})
-                if move.move_dest_id.picking_id:
+                if context.get('call_unlink',False) and move.move_dest_id.picking_id:
                     wf_service = netsvc.LocalService("workflow")
                     wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr)
         self.write(cr, uid, ids, {'state': 'cancel', 'move_dest_id': False})
-
-        for pick in self.pool.get('stock.picking').browse(cr, uid, pickings.keys()):
-            if all(move.state == 'cancel' for move in pick.move_lines):
-                self.pool.get('stock.picking').write(cr, uid, [pick.id], {'state': 'cancel'})
+        if not context.get('call_unlink',False):
+            for pick in self.pool.get('stock.picking').browse(cr, uid, pickings.keys()):
+                if all(move.state == 'cancel' for move in pick.move_lines):
+                    self.pool.get('stock.picking').write(cr, uid, [pick.id], {'state': 'cancel'})
 
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
@@ -1275,7 +1352,9 @@ class stock_move(osv.osv):
 
     def action_done(self, cr, uid, ids, context=None):
         track_flag = False
+        picking_ids = []
         for move in self.browse(cr, uid, ids):
+            if move.picking_id: picking_ids.append(move.picking_id.id)
             if move.move_dest_id.id and (move.state != 'done'):
                 cr.execute('insert into stock_move_history_ids (parent_id,child_id) values (%s,%s)', (move.id, move.move_dest_id.id))
                 if move.move_dest_id.state in ('waiting', 'confirmed'):
@@ -1373,7 +1452,11 @@ class stock_move(osv.osv):
                         'line_id': lines,
                         'ref': ref,
                     })
-        self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')})
+        self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')})        
+        for pick in self.pool.get('stock.picking').browse(cr, uid, picking_ids):
+            if all(move.state == 'done' for move in pick.move_lines):
+                self.pool.get('stock.picking').action_done(cr, uid, [pick.id])
+        
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_trigger(uid, 'stock.move', id, cr)
@@ -1397,7 +1480,7 @@ class stock_inventory(osv.osv):
         'name': fields.char('Inventory', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date': fields.datetime('Date create', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_done': fields.datetime('Date done'),
-        'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=True, states={'draft': [('readonly', False)]}),
+        'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', states={'done': [('readonly', True)]}),
         'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
         'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('cancel','Cancelled')), 'State', readonly=True),
         'company_id': fields.many2one('res.company','Company',required=True,select=1),
@@ -1420,12 +1503,14 @@ class stock_inventory(osv.osv):
                 price = line.product_id.standard_price or 0.0
                 amount = self.pool.get('stock.location')._product_get(cr, uid, line.location_id.id, [pid], {'uom': line.product_uom.id})[pid]
                 change = line.product_qty - amount
+                lot_id = line.prod_lot_id.id
                 if change:
                     location_id = line.product_id.product_tmpl_id.property_stock_inventory.id
                     value = {
                         'name': 'INV:' + str(line.inventory_id.id) + ':' + line.inventory_id.name,
                         'product_id': line.product_id.id,
                         'product_uom': line.product_uom.id,
+                        'prodlot_id': lot_id, 
                         'date': inv.date,
                         'date_planned': inv.date,
                         'state': 'assigned'
@@ -1442,6 +1527,11 @@ class stock_inventory(osv.osv):
                             'location_id': line.location_id.id,
                             'location_dest_id': location_id,
                         })
+                    if lot_id:
+                        value.update({
+                            'prodlot_id': lot_id,
+                            'product_qty': line.product_qty 
+                        })
                     move_ids.append(self.pool.get('stock.move').create(cr, uid, value))
             if len(move_ids):
                 self.pool.get('stock.move').action_done(cr, uid, move_ids,
@@ -1473,9 +1563,9 @@ class stock_inventory_line(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'product_qty': fields.float('Quantity'),
-        'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
+        'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
+        'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]")
     }
-
     def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False):
         if not product:
             return {}
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 1bd15c68ce1..2dae9d23d5c 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        
+
         <!--
 	Resource: stock.location
 	-->
@@ -51,21 +51,21 @@
             <field name="name">Components</field>
             <field name="location_id" ref="stock_location_workshop"/>
         </record>
-        
+
         <!--
 	Resource: stock.inventory
 	-->
-        
+
         <record id="stock_inventory_0" model="stock.inventory">
             <field name="name">Starting Inventory</field>
             <field name="date_done">2005-08-02 13:42:43</field>
             <field name="state">done</field>
         </record>
-        
+
         <!--
 	Resource: stock.inventory.line
 	-->
-        
+
         <record id="stock_inventory_line_0" model="stock.inventory.line">
             <field name="product_id" ref="product.product_product_pc1"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -73,7 +73,7 @@
             <field name="product_qty">14.0</field>
             <field name="location_id" ref="stock_location_14"/>
         </record>
-        
+
         <record id="stock_inventory_line_1" model="stock.inventory.line">
             <field name="product_id" ref="product.product_product_24"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -179,13 +179,13 @@
             <field name="product_qty">80.0</field>
             <field name="location_id" ref="stock_location_components"/>
         </record>
-        
+
         <function model="stock.inventory" name="action_done">
             <function eval="[[]]" model="stock.inventory" name="search"/>
         </function>
-        
+
         <!--  Multi Company -->
-        
+
          <record id="res_partner_tinyshop0" model="res.partner">
             <field eval="0" name="customer"/>
             <field eval="0" name="supplier"/>
@@ -246,7 +246,7 @@
             <field eval="1" name="active"/>
             <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
         </record>
-        <record id="res_users_shopuser0" model="res.users">
+        <!--<record id="res_users_shopuser0" model="res.users">
             <field model="ir.actions.actions" name="menu_id" search="[('name','=','Menu')]"/>
             <field eval="[(6,0,[ref('base.group_user'),ref('stock.group_stock_user')])]" name="groups_id"/>
             <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
@@ -269,7 +269,7 @@
             <field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
             <field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
         </record>
-        <record id="stock_location_intermediatelocation0" model="stock.location">
+        --><record id="stock_location_intermediatelocation0" model="stock.location">
             <field name="address_id" ref="base.main_address"/>
             <field name="location_id" ref="stock.stock_location_company"/>
             <field eval="&quot;&quot;&quot;procurement&quot;&quot;&quot;" name="usage"/>
@@ -292,7 +292,7 @@
             <field name="company_id" ref="res_company_tinyshop0"/>
             <field name="lot_input_id" ref="stock_location_shop1"/>
         </record>
-        
-        
+
+
     </data>
 </openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 22641471060..9d0c9016e05 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-stock" id="menu_stock_root" name="Inventory Management"/>
-        <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="1"/>
+        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"/>
+        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
+        <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="3"/>
+   		<menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
+        <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="6"/>
+        <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="2"/>
 
         =============================
         Inventory Line
@@ -13,10 +17,11 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Stock Inventory Lines">
-                    <field name="location_id"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
+                    <field name="prod_lot_id"/>
+                    <field name="location_id"/>
                 </tree>
             </field>
         </record>
@@ -26,10 +31,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Inventory Lines">
-                    <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
                     <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
+                    <field name="prod_lot_id"/>
+                    <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
+                    <button name="%(split_inventory_lots)d" string="Split Inventory Lines" type="action" icon="gtk-justify-fill"/>
                 </form>
             </field>
         </record>
@@ -60,7 +67,26 @@
                     <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     <notebook colspan="4">
                     <page string="General Informations">
-                        <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list"/>
+                        <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
+                            <tree string="Inventory Lines" editable="bottom">
+                                <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
+                                <field name="product_qty"/>
+                                <field name="product_uom"/>
+                                <field name="prod_lot_id"/>                                
+                                <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
+                            </tree>
+                            <form string="Inventory Lines">
+                                <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
+                                <field name="product_qty"/>
+                                <field name="product_uom"/>
+                                <field  domain="[('usage','=','internal')]" name="location_id" select="1"/>
+                                <group colspan="2" col="3">
+	                                <field name="prod_lot_id"/>
+	                                <button name="%(split_inventory_lots)d" string="Split in Production Lots" type="action" icon="gtk-justify-fill"/>
+                                </group>
+                                
+                            </form>
+                        </field>
                     </page><page string="Posted Inventory">
                         <field colspan="4" name="move_ids" nolabel="1"/>
                     </page>
@@ -82,7 +108,7 @@
             <field name="view_id" ref="view_inventory_tree"/>
             <field name="context">{'full':'1'}</field>
         </record>
-        <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_root"/>
+        <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_inventory_control" sequence="2"/>
 
         <record id="action_inventory_form_draft" model="ir.actions.act_window">
             <field name="name">Draft Periodical Inventories</field>
@@ -130,7 +156,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_tracking_tree"/>
         </record>
-        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="2"/>
+        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="4"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form" parent="menu_traceability"/>
 
         <record id="lot_line_tree" model="ir.ui.view">
@@ -233,7 +259,7 @@
                     <field name="product_qty" select="1"/>
                     <field name="product_uom" select="1" string="UOM"/>
                     <field name="prodlot_id" select="1"/>
-                    <field name="product_packaging"/>
+                    <field name="product_packaging" domain="[('product_id','=',product_id)]"/>
                     <field name="picking_id"/>
                     <field name="location_id" select="1"/>
                     <field name="location_dest_id" select="1"/>
@@ -255,7 +281,7 @@
                     <field name="product_qty" select="1"/>
                     <field name="product_uom" select="1" string="UOM"/>
                     <field name="prodlot_id" select="1"/>
-                    <field name="product_packaging"/>
+                    <field name="product_packaging" domain="[('product_id','=',product_id)]"/>
                     <field name="picking_id"/>
                     <field name="location_id" select="1"/>
                     <field name="location_dest_id" select="1"/>
@@ -402,7 +428,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_location_tree"/>
         </record>
-        <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_root"/>
+<!--        <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_root"/>-->
 
         =============================
         Warehouse
@@ -481,6 +507,32 @@
         =============================
         Picking
         =============================
+    	<record id="view_stock_split_production_lots" model="ir.ui.view">
+            <field name="name">Split Production Lots</field>
+            <field name="model">stock.split.production.lots</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Split Production Lots">
+                	<group col="4" colspan="4">
+	                   <field name="name"/>
+	                   <field name="qty" attrs="{'readonly':[('action','!=','split')]}"/>
+	                   <field name="action" colspan="4"/>
+                    </group>
+                    <newline/>
+                    <button name="split_lines" string="Ok" type="object" icon="gtk-go-forward"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_stock_split_production_lots" model="ir.actions.act_window">
+            <field name="name">Split Production Lots</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.split.production.lots</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
         <record model="ir.ui.view" id="stock_picking_calendar">
             <field name="name">stock.picking.calendar</field>
             <field name="model">stock.picking</field>
@@ -563,7 +615,7 @@
 		                                <page string="Return Packing History">
                         					<field name="move_stock_return_history" nolabel="1"/>
                         				</page>
-                        			</notebook>	
+                        			</notebook>
                                 </form>
                             </field>
                             <group col="7" colspan="4">
@@ -686,7 +738,7 @@
 		                                <page string="Return Packing History">
                         					<field name="move_stock_return_history" nolabel="1"/>
                         				</page>
-                        			</notebook>    
+                        			</notebook>
                                 </form>
                             </field>
                             <group col="7" colspan="4">
@@ -776,7 +828,7 @@
             <field name="context">{'contact_display': 'partner'}</field>
         </record>
 
-        <menuitem action="action_picking_tree_delivery" groups="base.group_extended" id="menu_action_picking_tree_delivery" parent="menu_stock_root" sequence="20"/>
+        <menuitem action="action_picking_tree_delivery" groups="base.group_extended" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="20"/>
         <menuitem action="action_picking_calendar_delivery" id="menu_action_picking_calendar_delivery" parent="menu_action_picking_tree_delivery"/>
 
         #
@@ -930,7 +982,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree"/>
         </record>
-        <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_root" sequence="19"/>
+<!--        <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_root" sequence="19"/>-->
 
         #
         # Reception of Products
@@ -1015,7 +1067,7 @@
 		                                <page string="Return Packing History">
                         					<field name="move_stock_return_history" nolabel="1"/>
                         				</page>
-		                            </notebook>        
+		                            </notebook>
                                 </form>
                             </field>
                             <group col="7" colspan="4">
@@ -1060,7 +1112,7 @@
 
 
         <record id="action_picking_tree4" model="ir.actions.act_window">
-            <field name="name">Incoming Products</field>
+            <field name="name">Incoming shipments</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1086,7 +1138,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree4"/>
         </record>
-        <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_root" sequence="17"/>
+        <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="1"/>
 
 	<record id="view_picking_internal_search" model="ir.ui.view">
             <field name="name">stock.picking.internal.search</field>
@@ -1116,8 +1168,7 @@
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
-        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_root" sequence="18"/>
-
+		<menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
         =============================
         Move Tracking
         =============================
@@ -1148,7 +1199,7 @@
             </field>
         </record>
 
-        <menuitem id="menu_traceability_low" name="Low Level" parent="menu_traceability"/>
+<!--        <menuitem id="menu_traceability_low" name="Low Level" parent="menu_traceability"/> -->
 
         <record id="view_move_form" model="ir.ui.view">
             <field name="name">stock.move.form</field>
@@ -1195,7 +1246,7 @@
 		                <page string="Return Packing History">
 							<field name="move_stock_return_history" nolabel="1"/>
  						</page>
-		            </notebook>        
+		            </notebook>
                 </form>
             </field>
         </record>
@@ -1220,14 +1271,14 @@
         </record>
 
         <record id="action_move_form2" model="ir.actions.act_window">
-            <field name="name">Stock Moves</field>
+            <field name="name">All Moves</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_move_search"/>
         </record>
-        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability_low"/>
+        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="1"/>
 
         <record id="action_picking_all" model="ir.actions.act_window">
             <field name="name">Picking</field>
@@ -1238,13 +1289,13 @@
             <field name="search_view_id" ref="view_stock_picking_filter"/>
             <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <menuitem action="action_picking_all" id="menu_action_picking_all" parent="menu_traceability_low"/>
+        <menuitem action="action_picking_all" id="menu_action_picking_all" parent="menu_stock_warehouse_mgmt" sequence="3"/>
 
-	====================================
+	    ====================================
         Reception Picking (By Stock Move)
         ====================================
 
-	<record id="view_move_tree_reception_picking" model="ir.ui.view">
+	    <record id="view_move_tree_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.tree2</field>
             <field name="model">stock.move</field>
             <field name="type">tree</field>
@@ -1260,33 +1311,65 @@
                     <field name="prodlot_id" string="Lot"/>
                     <field name="date_planned"/>
                     <field name="backorder_id"/>
-                    <field name="state"/>
-                    <button name="action_done" states="done" string="Done" type="object" icon="gtk-close"/>
-                    <button name="%(partial_move)d" string="Partial" type="action" icon="gtk-justify-fill"/>
+                    <field name="state"/>                    
+                    <button name="%(partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
                     <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
                 </tree>
             </field>
         </record>
 
-	<record id="view_move_form_reception_picking" model="ir.ui.view">
+	    <record id="view_move_form_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.form2</field>
             <field name="model">stock.move</field>
             <field name="type">form</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Moves">
-                	<field name="picking_id"/>
-                	<field name="product_id"/>
-                	<field name="product_qty" />
-                    <field name="product_uom" string="UOM"/>
-                    <field name="prodlot_id"/>
-                    <field name="date_planned"/>
-                    <field name="state"/>
+                	<notebook colspan="4">
+                		<page string="General Information">
+		                    <separator colspan="4" string="Move Information"/>
+		                    <field name="location_id" select="1"/>
+		                    <field name="location_dest_id" select="1"/>
+		                    <field colspan="4" name="product_id" select="1"/>
+		                    <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+		                    <field name="product_uom" select="2"/>
+		                    <field name="product_uos" select="2"/>
+		                    <field colspan="4" name="name" select="2"/>
+		                    <field name="date"/>
+		                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+		                    <field name="date_planned"/>
+		                    <field name="priority"/>
+		                    <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
+		                    <newline/>
+		                    <field name="picking_id" select="2"/>
+		                    <newline/>
+		                    <field name="prodlot_id" select="2"
+		                        context="{'location_id':location_id, 'product_id':product_id}"
+		                        domain="[('product_id','=?',product_id)]"
+		                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+		                    <field name="tracking_id" select="2"/>
+		                    <newline/>
+		                    <label/>
+		                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+		                    <separator colspan="4" string="Move State"/>
+		                    <field name="state" select="1"/>
+		                    <group col="5" colspan="2">
+		                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
+		                        <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+		                        <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
+                                <button name="%(partial_move)d" states="assigned" string="Partial" type="action" icon="gtk-justify-fill"/>
+		                        <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
+		                    </group>
+		                </page>
+		                <page string="Return Packing History">
+							<field name="move_stock_return_history" nolabel="1"/>
+ 						</page>
+		            </notebook>
                 </form>
             </field>
         </record>
 
-	<record id="view_move_search_reception_picking" model="ir.ui.view">
+	    <record id="view_move_search_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.search2</field>
             <field name="model">stock.move</field>
             <field name="type">search</field>
@@ -1304,19 +1387,32 @@
                     </group>
             	</search>
             </field>
-        </record>
+        </record>        
 
-	<record id="action_reception_picking_move" model="ir.actions.act_window">
-            <field name="name">Reception Picking Stock Moves</field>
+    	<record id="action_reception_picking_move" model="ir.actions.act_window">
+            <field name="name">Reception Picking Stock Move</field>
             <field name="res_model">stock.move</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">[('picking_id.type','=','in')]</field>
+            <field name="domain">[('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="search_view_id" ref="view_move_search_reception_picking"/>
         </record>
-        <menuitem action="action_reception_picking_move" id="menu_action_reception_picking_move" parent="menu_stock_root"/>
+
+        <record model="ir.actions.act_window.view" id="action_move_reception_picking_tree">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="view_move_tree_reception_picking"/>
+	        <field name="act_window_id" ref="action_reception_picking_move"/>
+	    </record>
+        <record model="ir.actions.act_window.view" id="action_move_reception_picking_form">
+	        <field name="sequence" eval="2"/>
+	        <field name="view_mode">form</field>
+	        <field name="view_id" ref="view_move_form_reception_picking"/>
+	        <field name="act_window_id" ref="action_reception_picking_move"/>
+	    </record>
+        <menuitem action="action_reception_picking_move" id="menu_action_reception_picking_move" parent="menu_stock_warehouse_mgmt" sequence="4"/>
 
 
         # -------------------------------------------------------------
@@ -1352,7 +1448,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_stock_configuration"/>
+<!--        <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_stock_configuration"/>-->
 
         <act_window
             context="{'location': active_id}"
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index 2c1fc950f34..b5b0d7ce303 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -34,6 +34,13 @@
         multi="True"
         name="stock.move.track"
         string="Track line"/>
+        
+    <wizard
+        id="split_inventory_lots"
+        model="stock.inventory.line"
+        multi="True"
+        name="stock.inventory.line.split"
+        string="Split inventory lines"/>
 
     <wizard id="make_picking" model="stock.picking" multi="True" name="stock.picking.make" string="Make picking"/>
 
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 1f6fca8d7ca..e918e030721 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -31,6 +31,7 @@ import wizard_ups
 import wizard_invoice_onshipping
 import wizard_location_product
 import wizard_inventory
+import wizard_split_inventory_lots
 import inventory_merge_zero
 import inventory_merge
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/inventory_merge.py b/addons/stock/wizard/inventory_merge.py
index bde59141aa1..784aa21d550 100644
--- a/addons/stock/wizard/inventory_merge.py
+++ b/addons/stock/wizard/inventory_merge.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/wizard/inventory_merge_zero.py b/addons/stock/wizard/inventory_merge_zero.py
index 76091b3a77a..890deb786e6 100644
--- a/addons/stock/wizard/inventory_merge_zero.py
+++ b/addons/stock/wizard/inventory_merge_zero.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index c44ef548d5b..58cc26a3224 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/wizard/wizard_inventory.py b/addons/stock/wizard/wizard_inventory.py
index faa43813fb1..19f24f4ab1d 100644
--- a/addons/stock/wizard/wizard_inventory.py
+++ b/addons/stock/wizard/wizard_inventory.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/wizard/wizard_invoice_onshipping.py b/addons/stock/wizard/wizard_invoice_onshipping.py
index 61cd1176973..6ebb4b75142 100644
--- a/addons/stock/wizard/wizard_invoice_onshipping.py
+++ b/addons/stock/wizard/wizard_invoice_onshipping.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/wizard/wizard_location_product.py b/addons/stock/wizard/wizard_location_product.py
index 2339697125a..873f1b7a6a5 100755
--- a/addons/stock/wizard/wizard_location_product.py
+++ b/addons/stock/wizard/wizard_location_product.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/wizard/wizard_partial_move.py b/addons/stock/wizard/wizard_partial_move.py
index 66e426c1e18..87fe7af2e9f 100644
--- a/addons/stock/wizard/wizard_partial_move.py
+++ b/addons/stock/wizard/wizard_partial_move.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index 416558735ff..d9a40cc8690 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -58,6 +58,8 @@ def _get_moves(self, cr, uid, data, context):
     _moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Make picking">']
 
     for m in pick.move_lines:
+        if m.state in ('done', 'cancel'):
+            continue
         quantity = m.product_qty
         if m.state<>'assigned':
             quantity = 0
diff --git a/addons/stock/wizard/wizard_picking_make.py b/addons/stock/wizard/wizard_picking_make.py
index 42b2f2f1d96..e57439e9186 100644
--- a/addons/stock/wizard/wizard_picking_make.py
+++ b/addons/stock/wizard/wizard_picking_make.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/wizard/wizard_replacement.py b/addons/stock/wizard/wizard_replacement.py
index 721d4688cbc..5b066aaab9f 100644
--- a/addons/stock/wizard/wizard_replacement.py
+++ b/addons/stock/wizard/wizard_replacement.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/wizard/wizard_return.py b/addons/stock/wizard/wizard_return.py
index e4150553be5..d00800b4131 100644
--- a/addons/stock/wizard/wizard_return.py
+++ b/addons/stock/wizard/wizard_return.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/wizard/wizard_split_inventory_lots.py b/addons/stock/wizard/wizard_split_inventory_lots.py
new file mode 100644
index 00000000000..138419f45eb
--- /dev/null
+++ b/addons/stock/wizard/wizard_split_inventory_lots.py
@@ -0,0 +1,98 @@
+import wizard
+import netsvc
+import pooler
+
+import time
+from osv import osv
+from tools.translate import _
+
+inv_form = '''<?xml version="1.0"?>
+<form string="Split Inventory Line">
+ <field name="prefix"/>
+ <newline/>
+ <field name="quantity"/>
+</form>
+'''
+inv_fields = {
+        'prefix': {
+            'string': 'Prefix',
+            'type': 'char',
+            'size': 64,
+        },
+        'quantity': {
+            'string': 'Quantity per lot',
+            'type': 'float',
+            'default': 1,
+        }
+}
+
+def _check_production_lot(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    inv_obj = pool.get('stock.inventory.line').browse(cr, uid, data['id'])
+    if not inv_obj.prod_lot_id:
+        raise wizard.except_wizard(_('Caution!'), _('Before splitting the inventory lines, make sure the production lot is assigned to this product.'))
+    return data['form']
+
+def _split_lines(self, cr, uid, data, context):
+    inv_id = data['id']
+
+    pool = pooler.get_pool(cr.dbname)
+    inv_line_obj = pool.get('stock.inventory.line')
+    prodlot_obj = pool.get('stock.production.lot')
+
+    ir_sequence_obj = pool.get('ir.sequence')
+
+    sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+    if not sequence:
+        raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
+    if data['form']['prefix']:
+        sequence=data['form']['prefix']+'/'+(sequence or '')
+        
+    inv = inv_line_obj.browse(cr, uid, [inv_id])[0]
+    quantity=data['form']['quantity']
+    prodlot_obj.write(cr, uid, inv.prod_lot_id.id, {'name':sequence})
+    
+    if quantity <= 0 or inv.product_qty == 0:
+        return {}
+
+    quantity_rest = inv.product_qty%quantity
+
+    update_val = {
+        'product_qty': quantity,
+    }
+
+    new_line = []
+    for idx in range(int(inv.product_qty//quantity)):
+        if idx:
+            current_line = inv_line_obj.copy(cr, uid, inv.id, {'prod_lot_id': inv.prod_lot_id.id})
+            new_line.append(current_line)
+        else:
+            current_line = inv.id
+        inv_line_obj.write(cr, uid, [current_line], update_val)
+    
+    if quantity_rest > 0:
+        idx = int(inv.product_qty//quantity)
+        update_val['product_qty']=quantity_rest
+        
+        if idx:
+            current_line = inv_line_obj.copy(cr, uid, inv.id, {'prod_lot_id': inv.prod_lot_id.id})
+            new_line.append(current_line)
+        else:
+            current_line = inv.id
+        inv_line_obj.write(cr, uid, [current_line], update_val)
+        
+    return {}
+
+class wizard_split_inventory_lots(wizard.interface):
+    states = {
+        'init': {
+            'actions': [_check_production_lot],
+            'result': {'type': 'form', 'arch': inv_form, 'fields': inv_fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('split', 'Ok', 'gtk-ok')]},
+            },
+        'split': {
+            'actions': [_split_lines],
+            'result': {'type':'state', 'state':'end'}
+        }
+    }
+
+wizard_split_inventory_lots('stock.inventory.line.split')
\ No newline at end of file
diff --git a/addons/stock/wizard/wizard_split_lot_line.py b/addons/stock/wizard/wizard_split_lot_line.py
index cbb7792afbd..15c3790494e 100644
--- a/addons/stock/wizard/wizard_split_lot_line.py
+++ b/addons/stock/wizard/wizard_split_lot_line.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/wizard/wizard_track_line.py b/addons/stock/wizard/wizard_track_line.py
index 5b95249a2b7..64a869758ce 100644
--- a/addons/stock/wizard/wizard_track_line.py
+++ b/addons/stock/wizard/wizard_track_line.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock/wizard/wizard_ups.py b/addons/stock/wizard/wizard_ups.py
index 07d3e36a2c9..f57128c78fc 100644
--- a/addons/stock/wizard/wizard_ups.py
+++ b/addons/stock/wizard/wizard_ups.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock_invoice_directly/__init__.py b/addons/stock_invoice_directly/__init__.py
index 1fb7e40fa94..1631b934faf 100644
--- a/addons/stock_invoice_directly/__init__.py
+++ b/addons/stock_invoice_directly/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock_invoice_directly/__terp__.py b/addons/stock_invoice_directly/__terp__.py
index c90d2d0f032..f24603672c9 100644
--- a/addons/stock_invoice_directly/__terp__.py
+++ b/addons/stock_invoice_directly/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock_invoice_directly/wizard/__init__.py b/addons/stock_invoice_directly/wizard/__init__.py
index 18e485ad675..a175e30ec03 100644
--- a/addons/stock_invoice_directly/wizard/__init__.py
+++ b/addons/stock_invoice_directly/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock_invoice_directly/wizard/stock_invoice.py b/addons/stock_invoice_directly/wizard/stock_invoice.py
index b50b68b8dd7..ce468422b7f 100644
--- a/addons/stock_invoice_directly/wizard/stock_invoice.py
+++ b/addons/stock_invoice_directly/wizard/stock_invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock_location/__init__.py b/addons/stock_location/__init__.py
index c0ef8eb55b7..1b86a7eb0c3 100644
--- a/addons/stock_location/__init__.py
+++ b/addons/stock_location/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock_location/__terp__.py b/addons/stock_location/__terp__.py
index e53ebcc4121..7dd4e3facb9 100644
--- a/addons/stock_location/__terp__.py
+++ b/addons/stock_location/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock_location/stock.py b/addons/stock_location/stock.py
index 992248fc181..3249dbef255 100644
--- a/addons/stock_location/stock.py
+++ b/addons/stock_location/stock.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock_no_autopicking/__init__.py b/addons/stock_no_autopicking/__init__.py
index f1e1833b8b3..a7e0ad0c1e1 100644
--- a/addons/stock_no_autopicking/__init__.py
+++ b/addons/stock_no_autopicking/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock_no_autopicking/__terp__.py b/addons/stock_no_autopicking/__terp__.py
index 0b0ba57bae3..202b05cac86 100644
--- a/addons/stock_no_autopicking/__terp__.py
+++ b/addons/stock_no_autopicking/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/stock_no_autopicking/i18n/ar.po b/addons/stock_no_autopicking/i18n/ar.po
index e4df7090b00..1c4674aeeb4 100644
--- a/addons/stock_no_autopicking/i18n/ar.po
+++ b/addons/stock_no_autopicking/i18n/ar.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 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-01-13 23:50+0000\n"
+"Last-Translator: AhmedQatar <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: 2009-12-16 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-01-15 04:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
@@ -24,12 +24,12 @@ msgstr ""
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
 msgid "Auto Picking"
-msgstr ""
+msgstr "اختيار آلي"
 
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
 msgid "Auto picking for raw materials of production orders."
-msgstr ""
+msgstr "اختيار آلي للمواد الخام من قائمة الانتاج."
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
diff --git a/addons/stock_no_autopicking/stock_no_autopicking.py b/addons/stock_no_autopicking/stock_no_autopicking.py
index 10eaa09f8a0..e0bf3cffec2 100644
--- a/addons/stock_no_autopicking/stock_no_autopicking.py
+++ b/addons/stock_no_autopicking/stock_no_autopicking.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/subscription/__init__.py b/addons/subscription/__init__.py
index a237c9fc557..b00780f370a 100644
--- a/addons/subscription/__init__.py
+++ b/addons/subscription/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/subscription/__terp__.py b/addons/subscription/__terp__.py
index c92ed4e2983..c67ba98d454 100644
--- a/addons/subscription/__terp__.py
+++ b/addons/subscription/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index dc07453959c..e9899156326 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 3bfc3feebf8..0466d4501cf 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
-        <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>
-        <menuitem id="next_id_45" name="Subscriptions" parent="subscription.menu_tools"/><menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/>
+        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
+       <!-- <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>-->
+        <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="2"/>
+<!--        <menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/>-->
         <!--
 	=======================================================
 	Subscription Views
@@ -46,7 +47,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_subscription_tree" model="ir.ui.view">
             <field name="name">subscription.subscription.tree</field>
             <field name="model">subscription.subscription</field>
@@ -61,7 +62,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="action_subscription_form" model="ir.actions.act_window">
             <field name="name">All Subscriptions</field>
             <field name="type">ir.actions.act_window</field>
@@ -70,7 +71,7 @@
             <field name="view_id" ref="view_subscription_tree"/>
         </record>
         <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="subscription.next_id_45"/>
-        
+
         <record id="subscription_subscription_history_tree" model="ir.ui.view">
             <field name="name">subscription.subscription.history.tree</field>
             <field name="model">subscription.subscription.history</field>
@@ -81,7 +82,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="subscription_subscription_history_form" model="ir.ui.view">
             <field name="name">subscription.subscription.history.form</field>
             <field name="model">subscription.subscription.history</field>
@@ -93,7 +94,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="document_form" model="ir.ui.view">
             <field name="name">subscription.document.form</field>
             <field name="model">subscription.document</field>
@@ -107,7 +108,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="document_tree" model="ir.ui.view">
             <field name="name">subscription.document.tree</field>
             <field name="model">subscription.document</field>
@@ -120,7 +121,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="document_fields_form" model="ir.ui.view">
             <field name="name">subscription.document.fields.form</field>
             <field name="model">subscription.document.fields</field>
@@ -132,7 +133,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="document_fields_tree" model="ir.ui.view">
             <field name="name">subscription.document.fields.tree</field>
             <field name="model">subscription.document.fields</field>
@@ -144,7 +145,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="action_document_form" model="ir.actions.act_window">
             <field name="name">Document Types</field>
             <field name="type">ir.actions.act_window</field>
@@ -152,6 +153,6 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="document_tree"/>
         </record>
-        <menuitem action="action_document_form" id="menu_action_document_form" parent="subscription.menu_subscription_config"/>
+        <menuitem action="action_document_form" id="menu_action_document_form" parent="subscription.next_id_45"/>
     </data>
 </openerp>
diff --git a/addons/survey/__init__.py b/addons/survey/__init__.py
new file mode 100644
index 00000000000..6ff3c246165
--- /dev/null
+++ b/addons/survey/__init__.py
@@ -0,0 +1,27 @@
+# -*- 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 survey
+import wizard
+import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/__terp__.py b/addons/survey/__terp__.py
new file mode 100644
index 00000000000..0a0e2af1bb9
--- /dev/null
+++ b/addons/survey/__terp__.py
@@ -0,0 +1,40 @@
+# -*- 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/>.
+#
+##############################################################################
+
+{
+    'name': 'Survey Module',
+    'version': '1.0',
+    'category': 'Tools',
+    'description': """
+    This module is used for surveing. It depends on the answers or reviews of some questions by different users.
+    A survey may have multiple pages. Each page may contain multiple questions and each question may have multiple answers.
+    Different users may give different answers of question and according to that survey is done. 
+    Partners are also sent mails with user name and password for the invitation of the survey
+    """,
+    'author': 'Tiny',
+    'depends': ['base'],
+    'update_xml': ['survey_report.xml','survey_data.xml','survey_que_wizard.xml','survey_wizard.xml','survey_view.xml','security/ir.model.access.csv'],
+    'demo_xml': ['survey_demo.xml'],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/i18n/fr_BE.po b/addons/survey/i18n/fr_BE.po
new file mode 100644
index 00000000000..126ce0a52e2
--- /dev/null
+++ b/addons/survey/i18n/fr_BE.po
@@ -0,0 +1,688 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* survey
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 06:01:25+0000\n"
+"PO-Revision-Date: 2009-11-26 06:01:25+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_survey_form
+msgid "Surveys"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey
+msgid "Survey Analysis Report"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_page_question
+#: model:ir.ui.menu,name:survey.menu_survey_question_form1
+msgid "Survey Questions"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.response:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr ""
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr ""
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail:0
+msgid "Body"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Give Survey Response"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_question
+msgid "All Questions"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Users Details"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr ""
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if  you require only one response per user"
+msgstr ""
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,comment:0
+#: field:survey.response.answer,comment:0
+msgid "Notes"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Response"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+#: wizard_field:wizard.send.invitation,init,send_mail_existing:0
+msgid "Send reminder for existing user"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_question_form
+#: model:ir.ui.menu,name:survey.menu_new_survey_question_form1
+msgid "New Survey Question"
+msgstr ""
+
+#. module: survey
+#: view:survey.response:0
+msgid "Skip"
+msgstr ""
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,partner_ids:0
+msgid "Partner"
+msgstr ""
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail_subject:0
+#: wizard_field:wizard.send.invitation,init,mail_subject_existing:0
+msgid "Subject"
+msgstr ""
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Response Limit"
+msgstr ""
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail_from:0
+msgid "From"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Response Type"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.response,question_id:0
+msgid "Question"
+msgstr ""
+
+#. module: survey
+#: wizard_button:wizard.send.invitation,init,send:0
+msgid "Send"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Response"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,response_answer_ids:0
+msgid "Response Answer"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Summary"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+#: wizard_field:wizard.send.invitation,init,send_mail:0
+msgid "Send mail for new user"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Skipped Question"
+msgstr ""
+
+#. module: survey
+#: wizard_button:wizard.send.invitation,send,end:0
+msgid "_Ok"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_survey_config
+msgid "Configuration"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.response.answer:0
+msgid "Survey Response Answer"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Page :-"
+msgstr ""
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Response per User"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Total Started Survey :-"
+msgstr ""
+
+#. module: survey
+#: view:survey.response:0
+msgid "Comment"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,date_modify:0
+msgid "Modify Date"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Answered Question"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+msgid "All Surveys"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,users:0
+msgid "Users"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Message"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr ""
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,send,note:0
+msgid "Log"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "All Survey Questions"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr ""
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: selection:survey.response,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.response.answer,answer_id:0
+msgid "Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+msgid "All Survey Pages"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+msgid "Status"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,shortdesc:survey.module_meta_information
+msgid "Survey Module"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,description:survey.module_meta_information
+msgid "\n"
+"    This module is used for surveing. It depends on the answers or reviews of some questions by different users.\n"
+"    A survey may have multiple pages. Each page may contain multiple questions and each question may have multiple answers.\n"
+"    Different users may give different answers of question and according to that survey is done. \n"
+"    Partners are also sent mails with user name and password for the invitation of the survey\n"
+"    "
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: field:survey.response,response_id:0
+msgid "User"
+msgstr ""
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,response_ids:0
+#: view:survey.response:0
+#: field:survey.response.answer,response_id:0
+msgid "Response"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_form1
+#: model:ir.ui.menu,name:survey.menu_new_survey_form
+msgid "New Survey"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.main_menu_survey
+msgid "Survey Management"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Skiped"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: view:survey.answer:0
+msgid "Survey Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/wizard_survey.py:0
+#, python-format
+msgid "Attention!"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey
+#: view:res.users:0
+#: view:survey:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: field:survey.page,survey_id:0
+#: field:survey.question,survey:0
+msgid "Survey"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Total Completed Survey :-"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Percentage"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Survey Title :-"
+msgstr ""
+
+#. module: survey
+#: view:survey.response:0
+msgid "Done"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+#: wizard_button:wizard.send.invitation,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+#: view:survey.response:0
+msgid "Survey Response"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr ""
+
+#. module: survey
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Answered"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.wizard,name:survey.wizard_send_invitation
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Send Invitation"
+msgstr ""
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "%"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response:0
+msgid "Description"
+msgstr ""
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_page_form
+#: model:ir.ui.menu,name:survey.menu_new_survey_page_form1
+msgid "New Survey Page"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Survey Answers"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Que:"
+msgstr ""
+
+#. module: survey
+#: field:survey,page_ids:0
+msgid "Page"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,send:0
+msgid "User creation"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.page,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,send:0
+msgid "Results :"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/wizard_survey.py:0
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Select Partner"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,date_create:0
+msgid "Create Date"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+msgid "Survey Pages"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Count"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr ""
+
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
new file mode 100644
index 00000000000..126ce0a52e2
--- /dev/null
+++ b/addons/survey/i18n/survey.pot
@@ -0,0 +1,688 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* survey
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 06:01:25+0000\n"
+"PO-Revision-Date: 2009-11-26 06:01:25+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_survey_form
+msgid "Surveys"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey
+msgid "Survey Analysis Report"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_page_question
+#: model:ir.ui.menu,name:survey.menu_survey_question_form1
+msgid "Survey Questions"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.response:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr ""
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr ""
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail:0
+msgid "Body"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Give Survey Response"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_question
+msgid "All Questions"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Users Details"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr ""
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if  you require only one response per user"
+msgstr ""
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,comment:0
+#: field:survey.response.answer,comment:0
+msgid "Notes"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Response"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+#: wizard_field:wizard.send.invitation,init,send_mail_existing:0
+msgid "Send reminder for existing user"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_question_form
+#: model:ir.ui.menu,name:survey.menu_new_survey_question_form1
+msgid "New Survey Question"
+msgstr ""
+
+#. module: survey
+#: view:survey.response:0
+msgid "Skip"
+msgstr ""
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,partner_ids:0
+msgid "Partner"
+msgstr ""
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail_subject:0
+#: wizard_field:wizard.send.invitation,init,mail_subject_existing:0
+msgid "Subject"
+msgstr ""
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Response Limit"
+msgstr ""
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail_from:0
+msgid "From"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Response Type"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.response,question_id:0
+msgid "Question"
+msgstr ""
+
+#. module: survey
+#: wizard_button:wizard.send.invitation,init,send:0
+msgid "Send"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Response"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,response_answer_ids:0
+msgid "Response Answer"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Summary"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+#: wizard_field:wizard.send.invitation,init,send_mail:0
+msgid "Send mail for new user"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Skipped Question"
+msgstr ""
+
+#. module: survey
+#: wizard_button:wizard.send.invitation,send,end:0
+msgid "_Ok"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_survey_config
+msgid "Configuration"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.response.answer:0
+msgid "Survey Response Answer"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Page :-"
+msgstr ""
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Response per User"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Total Started Survey :-"
+msgstr ""
+
+#. module: survey
+#: view:survey.response:0
+msgid "Comment"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,date_modify:0
+msgid "Modify Date"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Answered Question"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+msgid "All Surveys"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,users:0
+msgid "Users"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Message"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr ""
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,send,note:0
+msgid "Log"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "All Survey Questions"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr ""
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: selection:survey.response,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.response.answer,answer_id:0
+msgid "Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+msgid "All Survey Pages"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+msgid "Status"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,shortdesc:survey.module_meta_information
+msgid "Survey Module"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,description:survey.module_meta_information
+msgid "\n"
+"    This module is used for surveing. It depends on the answers or reviews of some questions by different users.\n"
+"    A survey may have multiple pages. Each page may contain multiple questions and each question may have multiple answers.\n"
+"    Different users may give different answers of question and according to that survey is done. \n"
+"    Partners are also sent mails with user name and password for the invitation of the survey\n"
+"    "
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: field:survey.response,response_id:0
+msgid "User"
+msgstr ""
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,response_ids:0
+#: view:survey.response:0
+#: field:survey.response.answer,response_id:0
+msgid "Response"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_form1
+#: model:ir.ui.menu,name:survey.menu_new_survey_form
+msgid "New Survey"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.main_menu_survey
+msgid "Survey Management"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Skiped"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: view:survey.answer:0
+msgid "Survey Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/wizard_survey.py:0
+#, python-format
+msgid "Attention!"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey
+#: view:res.users:0
+#: view:survey:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: field:survey.page,survey_id:0
+#: field:survey.question,survey:0
+msgid "Survey"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Total Completed Survey :-"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Percentage"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Survey Title :-"
+msgstr ""
+
+#. module: survey
+#: view:survey.response:0
+msgid "Done"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+#: wizard_button:wizard.send.invitation,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+#: view:survey.response:0
+msgid "Survey Response"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr ""
+
+#. module: survey
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Answered"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.wizard,name:survey.wizard_send_invitation
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Send Invitation"
+msgstr ""
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "%"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response:0
+msgid "Description"
+msgstr ""
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_page_form
+#: model:ir.ui.menu,name:survey.menu_new_survey_page_form1
+msgid "New Survey Page"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Survey Answers"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Que:"
+msgstr ""
+
+#. module: survey
+#: field:survey,page_ids:0
+msgid "Page"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,send:0
+msgid "User creation"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.page,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,send:0
+msgid "Results :"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/wizard_survey.py:0
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Select Partner"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,date_create:0
+msgid "Create Date"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+msgid "Survey Pages"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Count"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr ""
+
diff --git a/addons/survey/report/__init__.py b/addons/survey/report/__init__.py
new file mode 100755
index 00000000000..710de5e7999
--- /dev/null
+++ b/addons/survey/report/__init__.py
@@ -0,0 +1,27 @@
+# -*- 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 survey_analysis_report
+import survey_form
+import survey_browse_response
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
new file mode 100755
index 00000000000..b7b2dad634f
--- /dev/null
+++ b/addons/survey/report/survey_analysis_report.py
@@ -0,0 +1,370 @@
+# -*- 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 pooler
+from report.interface import report_rml
+from tools import to_xml
+import tools
+
+class survey_analysis(report_rml):
+    def create(self, cr, uid, ids, datas, context):
+        rml ="""<document filename="Survey Analysis Report.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="Table1">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                      <lineStyle kind="LINEBELOW" colorName="#e6e6e6"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table2">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table3">
+                      <blockAlignment value="LEFT"/>
+                      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="2,-1"/>
+                      <blockValign value="TOP"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table4">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="1,-1"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table5">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                      <lineStyle kind="LINEBELOW" colorName="#8f8f8f" start="0,-1" stop="1,-1"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table_heading">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table_head_2">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                    </blockTableStyle>
+                    <initialize>
+                      <paraStyle name="all" alignment="justify"/>
+                    </initialize>
+                    <paraStyle name="answer_right" alignment="RIGHT" fontName="helvetica" fontSize="09.0" leftIndent="2.0"/>
+                    <paraStyle name="Standard1" fontName="helvetica-bold" alignment="RIGHT" fontSize="09.0"/>
+                    <paraStyle name="Standard" alignment="LEFT" fontName="Helvetica-Bold" fontSize="11.0"/>
+                    <paraStyle name="header1" fontName="Helvetica" fontSize="11.0"/>
+                    <paraStyle name="response" fontName="Helvetica-oblique" fontSize="9.5"/>
+                    <paraStyle name="page" fontName="helvetica" fontSize="11.0" leftIndent="0.0"/>
+                    <paraStyle name="question" fontName="helvetica-boldoblique" fontSize="10.0" leftIndent="3.0"/>
+                    <paraStyle name="answer_bold" fontName="Helvetica-Bold" fontSize="09.0" leftIndent="2.0"/>
+                    <paraStyle name="answer" fontName="helvetica" fontSize="09.0" leftIndent="2.0"/>
+                    <paraStyle name="Title" fontName="helvetica" fontSize="20.0" leading="15" spaceBefore="6.0" spaceAfter="6.0" alignment="CENTER"/>
+                    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+                    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+                    <paraStyle name="P2" fontName="Helvetica" fontSize="14.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+                  </stylesheet>
+                  <images/>
+                  <story>
+                    <para style="Title"><u>Response Summary</u></para>
+                    <para style="Standard"><font></font></para>
+                    <para style="P2">
+                      <font color="white"> </font>
+                    </para>"""
+        surv_obj = pooler.get_pool(cr.dbname).get('survey')
+        for survey in surv_obj.browse(cr, uid, ids):
+            if survey.question_prefix:
+                prefix = survey.question_prefix + " : "
+            else:
+                prefix = ''
+            rml += """<blockTable colWidths="280.0,100.0,120.0" style="Table_heading">
+                          <tr>
+                            <td>
+                              <para style="terp_tblheader_General_Centre">Survey Title </para>
+                            </td>
+                            <td>
+                              <para style="terp_tblheader_General_Centre">Total Started Survey </para>
+                            </td>
+                            <td>
+                              <para style="terp_tblheader_General_Centre">Total Completed Survey </para>
+                            </td>
+                          </tr>
+                          </blockTable>
+                          <blockTable colWidths="280.0,100.0,120.0" style="Table_head_2">
+                          <tr>
+                            <td>
+                              <para style="terp_default_Centre_8">""" + to_xml(tools.ustr(survey.title)) + """</para>
+                            </td>
+                            <td>
+                              <para style="terp_default_Centre_8">""" + str(survey.tot_start_survey) + """</para>
+                            </td>
+                            <td>
+                              <para style="terp_default_Centre_8">""" + str(survey.tot_comp_survey) + """</para>
+                            </td>
+                          </tr>
+                        </blockTable>"""
+            for page in survey.page_ids:
+                rml += """ <blockTable colWidths="500" style="Table4">
+#                              <tr>
+#                                <td><para style="page">Page :- """ + to_xml(tools.ustr(page.title)) + """</para></td>
+#                              </tr>
+#                           </blockTable>"""
+                for que in page.question_ids:
+                    rml +="""<blockTable colWidths="500" style="Table5">
+                              <tr>
+                                <td><para style="question">""" + to_xml(tools.ustr(prefix)) + to_xml(tools.ustr(que.question)) + """</para></td>
+                              </tr>
+                             </blockTable>"""
+                    cols_widhts = []
+                    if que.type in ['matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans']:
+                        cols_widhts.append(200)
+                        for col in range(0, len(que.column_heading_ids) + 1):
+                            cols_widhts.append(float(300 / (len(que.column_heading_ids) + 1)))
+                        colWidths = ",".join(map(tools.ustr, cols_widhts))
+                        matrix_ans = ['',]
+                        for col in que.column_heading_ids:
+                            if col.title not in matrix_ans:
+                                matrix_ans.append(col.title)
+                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
+                        for mat_col in matrix_ans:
+                            rml+="""<td><para style="response">""" + to_xml(tools.ustr(mat_col)) + """</para></td>"""
+                        rml+="""<td><para style="response">Response Count</para></td>
+                                </tr>"""
+                        last_col = cols_widhts[-1]
+                        for ans in que.answer_choice_ids:
+                            rml+="""<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
+                            cr.execute("select count(id) from survey_response_answer sra where sra.answer_id = %d"%(ans.id))
+                            tot_res = cr.fetchone()[0]
+                            cr.execute("select count(id) ,sra.answer from survey_response_answer sra where sra.answer_id = %d group by sra.answer" % ans.id)
+                            calc_res = cr.dictfetchall()
+                            for mat_col in range(1, len(matrix_ans)):
+                                percantage = 0
+                                cal_count = 0
+                                for cal in calc_res:
+                                    if cal['answer'] == matrix_ans[mat_col]:
+                                        cal_count = cal['count']
+                                if tot_res:
+                                    percantage = float(cal_count)*100 / tot_res
+                                if percantage:
+                                    rml += """<td color="#FFF435"><para style="answer_bold">""" + tools.ustr(percantage) +"% (" + tools.ustr(cal_count) + """)</para></td>"""
+                                else:
+                                    rml += """<td color="#FFF435"><para style="answer">""" + tools.ustr(percantage) +"% (" + tools.ustr(cal_count) + """)</para></td>"""
+                            rml+="""<td><para style="response">""" + tools.ustr(tot_res) + """</para></td>
+                                </tr>"""
+                        rml+="""</blockTable>"""
+                        if que.comment_field_type:
+                            cr.execute("select count(id) from survey_response_line where question_id = %d and comment != ''"% que.id)
+                            tot_res = cr.fetchone()[0]
+                            rml+="""<blockTable colWidths=" """+ str(500 - last_col) +"," + str(last_col) + """ " style="Table1"><tr><td><para style="answer_right">""" + to_xml(tools.ustr(que.comment_label)) + """</para></td>
+                                    <td><para style="answer">""" + tools.ustr(tot_res) + """</para></td></tr></blockTable>"""
+
+                    elif que.type in['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'multiple_textboxes','date_and_time','date']:
+                        rml +="""<blockTable colWidths="280.0,120,100.0" style="Table1">"""
+                        rml += """ <tr>
+                             <td> <para style="Standard"> </para></td>
+                             <td> <para style="response">Response Percentage </para></td>
+                             <td> <para style="response">Response Count</para></td>
+                         </tr>"""
+                        for ans in que.answer_choice_ids:
+                            rml+="""<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>
+                                    <td><para style="answer">""" + tools.ustr(ans.average) + """%</para></td>
+                                    <td><para style="answer">""" + tools.ustr(ans.response) + """</para></td></tr>"""
+                        rml+="""</blockTable>"""
+                        if que.comment_field_type:
+                            if que.make_comment_field:
+                                cr.execute("select count(id) from survey_response_line where question_id = %d and comment != ''"% que.id)
+                                tot_res = cr.fetchone()[0]
+                                tot_avg = 0.00
+                                if que.tot_resp:
+                                    tot_avg = round(float(tot_res * 100)/ que.tot_resp,2)
+                                rml+="""<blockTable colWidths="280.0,120,100.0" style="Table1"><tr><td><para style="answer">""" +to_xml(tools.ustr(que.comment_label)) + """</para></td>
+                                        <td><para style="answer">""" + str(tot_avg) + """%</para></td>
+                                        <td><para style="answer">""" + tools.ustr(tot_res) + """</para></td></tr></blockTable>"""
+                            else:
+                                cr.execute("select count(id) from survey_response_line where question_id = %d and comment != ''"% que.id)
+                                tot_res = cr.fetchone()[0]
+                                rml+="""<blockTable colWidths="400.0,100.0" style="Table1"><tr><td><para style="answer_right">""" + to_xml(tools.ustr(que.comment_label)) + """</para></td>
+                                        <td><para style="answer">""" + tools.ustr(tot_res) + """</para></td></tr></blockTable>"""
+
+                    elif que.type in['single_textbox']:
+                        cr.execute("select count(id) from survey_response_line where question_id = %d and single_text!=''" % que.id)
+                        rml +="""<blockTable colWidths="400.0,100.0" style="Table1">
+                             <tr>
+                                 <td> <para style="Standard"> </para></td>
+                                 <td> <para style="response">Response Count</para></td>
+                             </tr>
+                            <tr><td><para style="answer"></para></td>
+                                <td><para style="answer">""" + tools.ustr(cr.fetchone()[0]) + """ </para></td></tr>
+                            </blockTable>"""
+                    elif que.type in['comment']:
+                        cr.execute("select count(id) from survey_response_line where question_id = %d and comment !=''" % que.id)
+                        rml +="""<blockTable colWidths="400.0,100.0" style="Table1">
+                             <tr>
+                                 <td> <para style="Standard"> </para></td>
+                                 <td> <para style="response">Response Count</para></td>
+                             </tr>
+                            <tr><td><para style="answer"></para></td>
+                                <td><para style="answer">""" + tools.ustr(cr.fetchone()[0]) + """ </para></td></tr>
+                            </blockTable>"""
+                    elif que.type in['rating_scale']:
+                        cols_widhts.append(200)
+                        for col in range(0,len(que.column_heading_ids) + 2):
+                            cols_widhts.append(float(300 / (len(que.column_heading_ids) + 2)))
+                        colWidths = ",".join(map(tools.ustr, cols_widhts))
+                        matrix_ans = ['',]
+                        for col in que.column_heading_ids:
+                            if col.title not in matrix_ans:
+                                matrix_ans.append(col.title)
+                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
+                        for mat_col in matrix_ans:
+                            rml+="""<td><para style="response">""" + to_xml(tools.ustr(mat_col)) + """</para></td>"""
+                        rml+="""<td><para style="response">Rating Average</para></td>
+                                <td><para style="response">Response Count</para></td>
+                                </tr>"""
+                        for ans in que.answer_choice_ids:
+                            rml+="""<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
+                            res_count = 0
+                            rating_weight_sum = 0
+                            for mat_col in range(1, len(matrix_ans)):
+                                cr.execute("select count(sra.answer_id) from survey_response_line sr, survey_response_answer sra\
+                                     where sr.id = sra.response_id and  sra.answer_id = %d and sra.answer ='%s'" % (ans.id,matrix_ans[mat_col]))
+                                tot_res = cr.fetchone()[0]
+                                cr.execute("select count(sra.answer_id),sqc.rating_weight from survey_response_line sr, survey_response_answer sra ,\
+                                        survey_question_column_heading sqc where sr.id = sra.response_id and \
+                                        sqc.question_id = sr.question_id  and sra.answer_id = %d and sqc.title ='%s'\
+                                        group by sra.answer_id,sqc.rating_weight" % (ans.id,matrix_ans[mat_col]))
+                                col_weight =  cr.fetchone()
+                                res_count = col_weight[0]
+                                if tot_res:
+                                    rating_weight_sum += col_weight[1] * tot_res
+                                    tot_per = round((float(tot_res) * 100) / int(res_count), 2)
+                                else:
+                                    tot_res = 0
+                                    tot_per = 0.0
+                                if tot_res:
+                                    rml += """<td><para style="answer_bold">""" + tools.ustr(tot_per) + "%(" + tools.ustr(tot_res) + """)</para></td>"""
+                                else:
+                                    rml += """<td><para style="answer">""" + tools.ustr(tot_per)+"%(" + tools.ustr(tot_res) + """)</para></td>"""
+                            percantage = 0.00
+                            if res_count:
+                                percantage = round((float(rating_weight_sum)/res_count), 2)
+                            rml+="""<td><para style="answer">""" + tools.ustr(percantage) + """</para></td>
+                                <td><para style="answer">""" + tools.ustr(res_count) + """</para></td></tr>"""
+                        rml+="""</blockTable>"""
+                    elif que.type in['matrix_of_drop_down_menus']:
+                        for column in que.column_heading_ids:
+                            rml += """<blockTable colWidths="500" style="Table1"><tr>
+                                <td><para style="answer">""" + to_xml(tools.ustr(column.title)) + """</para></td></tr></blockTable>"""
+                            menu_choices = column.menu_choice.split('\n')
+                            cols_widhts = []
+                            cols_widhts.append(200)
+                            for col in range(0, len(menu_choices) + 1):
+                                cols_widhts.append(float(300 / (len(menu_choices) + 1)))
+                            colWidths = ",".join(map(tools.ustr, cols_widhts))
+                            rml +="""<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>
+                                <td><para style="response"></para></td>"""
+                            for menu in menu_choices:
+                                rml += """<td><para style="response">""" + to_xml(tools.ustr(menu)) + """</para></td>"""
+                            rml += """<td><para style="response">Response Count</para></td></tr>"""
+                            cr.execute("select count(id), sra.answer_id from survey_response_answer sra \
+                                     where sra.answer='%s' group by sra.answer_id "  % (column.title))
+                            res_count = cr.dictfetchall()
+                            cr.execute("select count(sra.id),sra.value_choice, sra.answer_id, sra.answer from survey_response_answer sra \
+                                 where sra.answer='%s'  group by sra.value_choice ,sra.answer_id, sra.answer" % (column.title))
+                            calc_percantage = cr.dictfetchall()
+                            for ans in que.answer_choice_ids:
+                                rml+="""<tr><td><para style="answer_right">""" + tto_xml(tools.ustr(ans.answer)) + """</para></td>"""
+                                for mat_col in range(0, len(menu_choices)):
+                                    calc = 0
+                                    response = 0
+                                    for res in res_count:
+                                        if res['answer_id'] == ans.id: response = res['count']
+                                    for per in calc_percantage:
+                                        if ans.id == per['answer_id'] and menu_choices[mat_col] == per['value_choice']:
+                                            calc = per['count']
+                                    percantage = 0.00
+                                    if calc and response:
+                                        percantage = (float(calc)* 100) / response
+                                    if calc:
+                                        rml+="""<td><para style="answer_bold">""" +tools.ustr(percantage)+"% (" +  tools.ustr(calc) + """)</para></td>"""
+                                    else:
+                                        rml+="""<td><para style="answer">""" +tools.ustr(percantage)+"% (" +  tools.ustr(calc) + """)</para></td>"""
+                                response = 0
+                                for res in res_count:
+                                    if res['answer_id'] == ans.id: response = res['count']
+                                rml += """<td><para style="response">""" + tools.ustr(response) + """</para></td></tr>"""
+                            rml += """</blockTable>"""
+                    elif que.type in['numerical_textboxes']:
+                        rml +="""<blockTable colWidths="240.0,20,100.0,70,70.0" style="Table1">
+                             <tr>
+                             <td> <para style="Standard"> </para></td>
+                             <td> <para style="Standard"> </para></td>
+                             <td> <para style="response">Response Average</para></td>
+                             <td> <para style="response">Response Total</para></td>
+                             <td> <para style="response">Response Count</para></td>
+                         </tr>"""
+                        for ans in que.answer_choice_ids:
+                            cr.execute("select answer from survey_response_answer where answer_id=%d group by answer" % ans.id)
+                            tot_res = cr.dictfetchall()
+                            total = 0
+                            for  tot in tot_res:
+                                total += int(tot['answer'])
+                            per = 0.00
+                            if len(tot_res):
+                                per = round((float(total) / len(tot_res)),2)
+                            rml+="""<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>
+                                    <td> <para style="Standard"> </para></td>
+                                    <td> <para style="answer">""" + tools.ustr(per) +"""</para></td>
+                                    <td><para style="answer">""" + tools.ustr(total) + """</para></td>
+                                    <td><para style="answer">""" + tools.ustr(len(tot_res)) + """</para></td></tr>"""
+                        rml+="""</blockTable>"""
+
+                    rml +="""<blockTable colWidths="300,100,100.0" style="Table3">
+                        <tr>
+                              <td><para style="Standard1"></para></td>
+                              <td><para style="Standard1">Answered Question</para></td>
+                              <td><para style="Standard1">""" + tools.ustr(que.tot_resp) + """</para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="Standard1"></para></td>
+                            <td><para style="Standard1">Skipped Question</para></td>
+                            <td><para style="Standard1">""" + tools.ustr(survey.tot_start_survey - que.tot_resp) + """</para></td>
+                        </tr>
+                        </blockTable>"""
+            rml += """<pageBreak/>"""
+        rml += """</story></document>"""
+        report_type = datas.get('report_type', 'pdf')
+        create_doc = self.generators[report_type]
+        pdf = create_doc(rml, title=self.title)
+        return (pdf, report_type)
+
+survey_analysis('report.survey.analysis', 'survey','','')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
new file mode 100644
index 00000000000..93b9ec011f6
--- /dev/null
+++ b/addons/survey/report/survey_browse_response.py
@@ -0,0 +1,361 @@
+# -*- 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 pooler
+from report.interface import report_rml
+from tools import to_xml
+import tools
+import time
+
+class survey_browse_response(report_rml):
+    def create(self, cr, uid, ids, datas, context):
+        rml ="""<document filename="Survey Analysis Report.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="ans_tbl_white">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="ans_tbl_gainsboro">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                      <blockBackground colorName="gainsboro" start="0,0" stop="-1,-1"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table1">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                      <lineStyle kind="LINEBELOW" colorName="#e6e6e6"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table2">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table3">
+                      <blockAlignment value="LEFT"/>
+                      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="2,-1"/>
+                      <blockValign value="TOP"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table4">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="1,-1"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table5">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                      <lineStyle kind="LINEBELOW" colorName="#8f8f8f" start="0,-1" stop="1,-1"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table41">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEBEFORE" colorName="#777777" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEAFTER" colorName="#777777" start="0,0" stop="-1,-1"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table51">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEBEFORE" colorName="#777777" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEAFTER" colorName="#777777" start="0,0" stop="-1,-1"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table_heading">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                    </blockTableStyle>
+                    <blockTableStyle id="Table_head_2">
+                      <blockAlignment value="LEFT"/>
+                      <blockValign value="TOP"/>
+                      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+                    </blockTableStyle>
+                    <initialize>
+                      <paraStyle name="all" alignment="justify"/>
+                    </initialize>
+                    <paraStyle name="answer_right" alignment="RIGHT" fontName="helvetica" fontSize="09.0" leftIndent="2.0"/>
+                    <paraStyle name="Standard1" fontName="helvetica-bold" alignment="RIGHT" fontSize="09.0"/>
+                    <paraStyle name="Standard" alignment="LEFT" fontName="Helvetica-Bold" fontSize="11.0"/>
+                    <paraStyle name="header1" fontName="Helvetica" fontSize="11.0"/>
+                    <paraStyle name="response" fontName="Helvetica-oblique" fontSize="9.5"/>
+                    <paraStyle name="page" fontName="helvetica" fontSize="11.0" leftIndent="0.0"/>
+                    <paraStyle name="question" fontName="helvetica-boldoblique" fontSize="10.0" leftIndent="3.0"/>
+                    <paraStyle name="answer_bold" fontName="Helvetica-Bold" fontSize="09.0" leftIndent="2.0"/>
+                    <paraStyle name="answer" fontName="helvetica" fontSize="09.0" leftIndent="2.0"/>
+                    <paraStyle name="answer1" fontName="helvetica" fontSize="09.0" leftIndent="2.0"/>
+                    <paraStyle name="Title" fontName="helvetica" fontSize="20.0" leading="15" spaceBefore="6.0" spaceAfter="6.0" alignment="CENTER"/>
+                    <paraStyle name="P2" fontName="Helvetica" fontSize="14.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+                    <paraStyle name="comment" fontName="Helvetica" fontSize="14.0" leading="50" spaceBefore="0.0" spaceAfter="0.0"/>
+                    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="12" spaceBefore="0.0" spaceAfter="1.0"/>
+                    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.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_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+                    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+                  </stylesheet>
+                  <images/>
+                  <story>
+                    <para style="Title"><u>Browse Responses </u></para>
+                    <para style="Standard"><font></font></para>
+                    <para style="P2">
+                      <font color="white"> </font>
+                    </para>
+                    """
+        surv_resp_obj = pooler.get_pool(cr.dbname).get('survey.response')
+        surv_resp_line_obj = pooler.get_pool(cr.dbname).get('survey.response.line')
+        surv_obj = pooler.get_pool(cr.dbname).get('survey')
+        for id in ids:
+            for survey in surv_obj.browse(cr, uid, [id]):
+                if context.has_key('response_id'):
+                    s_id = [int(context['response_id'])]
+                else:
+                    s_id = surv_resp_obj.search(cr,uid, [('survey_id','=',[survey.id])])
+                for response in surv_resp_obj.browse(cr,uid,s_id): #surv_resp_obj.search(cr,uid, [('survey_id','=',ids[0])])
+                    if survey.question_prefix:
+                        prefix = survey.question_prefix + " : "
+                    else:
+                        prefix = ''
+                    rml += """<blockTable colWidths="230.0,150.0,120.0" style="Table_heading">
+                              <tr>
+                                <td>
+                                  <para style="terp_tblheader_General_Centre">Survey Title </para>
+                                </td>
+                                <td>
+                                  <para style="terp_tblheader_General_Centre">Response Create Date </para>
+                                </td>
+                                <td>
+                                  <para style="terp_tblheader_General_Centre">Respose By </para>
+                                </td>
+                              </tr>
+                              </blockTable>
+                              <blockTable colWidths="230.0,150.0,120.0" style="Table_head_2">
+                              <tr>
+                                <td>
+                                  <para style="terp_default_Centre_8">""" + to_xml(tools.ustr(survey.title)) + """</para>
+                                </td>
+                                <td>
+                                  <para style="terp_default_Centre_8">""" + 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_default_Centre_8">""" + to_xml(response.user_id.name) + """</para>
+                                </td>
+                              </tr>
+                            </blockTable>"""
+                    for page in survey.page_ids:
+                        rml += """<para style="P2"></para>
+                                 <blockTable colWidths="500" style="Table4">
+                                      <tr>
+                                        <td><para style="page">Page :- """ + to_xml(tools.ustr(page.title)) + """</para></td>
+                                      </tr>
+                                   </blockTable>"""
+                        for que in page.question_ids:
+                            rml += """<para style="P2"></para>
+                                    <blockTable colWidths="500" style="Table5">
+                                      <tr>
+                                        <td><para style="question">""" + to_xml(tools.ustr(prefix)) + to_xml(to_xml(que.question)) + """</para></td>
+                                      </tr>
+                                     </blockTable>"""
+                            answer = surv_resp_line_obj.browse(cr,uid, surv_resp_line_obj.search(cr, uid, [('question_id','=',que.id),('response_id','=',response.id)]))
+                            if que.type in ['descriptive_text']:
+                                rml +="""<blockTable colWidths="500" style="Table1">
+                                 <tr>  <td> <para style="response">""" + to_xml(tools.ustr(que.descriptive_text)) + """</para></td> </tr>
+                                </blockTable>"""
+                            elif que.type in ['table']:
+                                if len(answer) and answer[0].state == "done":
+                                    col_heading = pooler.get_pool(cr.dbname).get('survey.tbl.column.heading')
+                                    cols_widhts = []
+                                    for col in range(0, len(que.column_heading_ids)):
+                                        cols_widhts.append(float(500 / (len(que.column_heading_ids))))
+                                    colWidths = ",".join(map(tools.ustr, cols_widhts))
+                                    matrix_ans = []
+                                    rml +="""<para style="P2"></para><blockTable colWidths=" """ + str(colWidths) + """ " style="Table41"><tr>"""
+                                    for col in que.column_heading_ids:
+                                        if col.title not in matrix_ans:
+                                            matrix_ans.append(col.title)
+                                            rml +="""<td> <para style="terp_tblheader_Details">""" + to_xml(tools.ustr(col.title)) +"""</para></td>"""
+                                    rml += """</tr></blockTable>"""
+                                    for row in range(0, que.no_of_rows):
+                                        rml +="""<blockTable colWidths=" """ + str(colWidths) + """ " style="Table51"><tr>"""
+                                        table_data = col_heading.browse(cr, uid, col_heading.search(cr, uid, [('response_table_id', '=', answer[0].id),('name','=',row)]))
+                                        for column in matrix_ans:
+                                            value = """<font color="white"> </font>"""
+                                            for col in table_data:
+                                                if column == col.column_id.title:
+                                                    value = col.value
+                                            rml += """<td> <para style="terp_default_9">""" + to_xml(tools.ustr(value)) +"""</para></td>"""
+                                        rml += """</tr></blockTable>"""
+                                else:
+                                    rml +="""<blockTable colWidths="500" style="Table1">
+                                     <tr>  <td> <para style="response">No Response</para></td> </tr>
+                                    </blockTable>"""
+                            elif que.type in ['multiple_choice_only_one_ans','multiple_choice_multiple_ans']:
+                                if len(answer) and answer[0].state == "done":
+                                    for ans in answer[0].response_answer_ids:
+                                        rml +="""<blockTable colWidths="500" style="Table1">
+                                             <tr> <td> <para style="response">""" + to_xml(tools.ustr(ans.answer_id.answer)) + """</para></td></tr>
+                                            </blockTable>"""
+                                    if que.comment_field_type:
+                                        if answer[0].comment:
+                                            rml+="""<blockTable colWidths="500" style="Table1"><tr>
+                                                    <td><para style="answer">""" + to_xml(tools.ustr(answer[0].comment)) + """</para></td></tr></blockTable>"""
+                                else:
+                                    rml +="""<blockTable colWidths="500" style="Table1">
+                                     <tr>  <td> <para style="response">No Response</para></td> </tr>
+                                    </blockTable>"""
+                            elif que.type in ['multiple_textboxes','date','date_and_time','numerical_textboxes']:
+                                if len(answer) and answer[0].state == "done":
+                                    for ans in answer[0].response_answer_ids:
+                                        rml +="""<blockTable colWidths="200,300" style="Table1">
+                                             <tr> <td> <para style="response">""" + to_xml(tools.ustr(ans.answer_id.answer)) + """</para></td>
+                                             <td> <para style="response">""" + to_xml(tools.ustr(ans.answer)) + """</para></td></tr>
+                                            </blockTable>"""
+                                else:
+                                    rml +="""<blockTable colWidths="500" style="Table1">
+                                     <tr>  <td> <para style="response">No Response</para></td> </tr>
+                                    </blockTable>"""
+                            elif que.type in ['single_textbox']:
+                                if len(answer) and answer[0].state == "done":
+                                    rml +="""<blockTable colWidths="500" style="Table1">
+                                         <tr> <td> <para style="response">""" + to_xml(tools.ustr(answer[0].single_text)) + """</para></td></tr>
+                                        </blockTable>"""
+                                else:
+                                    rml +="""<blockTable colWidths="500" style="Table1">
+                                     <tr>  <td> <para style="response">No Response</para></td> </tr>
+                                    </blockTable>"""
+                            elif que.type in ['comment']:
+                                if len(answer) and answer[0].state == "done":
+                                    rml +="""<blockTable colWidths="500" style="Table1">
+                                         <tr> <td> <para style="response">""" + to_xml(tools.ustr(answer[0].comment)) + """</para></td></tr>
+                                        </blockTable>"""
+                                else:
+                                    rml +="""<blockTable colWidths="500" style="Table1">
+                                     <tr>  <td> <para style="response">No Response</para></td> </tr>
+                                    </blockTable>"""
+                            elif que.type in ['matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','rating_scale','matrix_of_drop_down_menus']:
+                                if len(answer) and answer[0].state == "done":
+                                    if que.comment_column:
+                                        pass
+                                    cols_widhts = []
+                                    cols_widhts.append(200)
+                                    len_col_heading = len(que.column_heading_ids)
+                                    for col in range(0, len_col_heading):
+                                        cols_widhts.append(float(300 / len_col_heading))
+                                    tmp=0.0
+                                    sum = 0.0
+                                    i = 0
+                                    if que.comment_column:
+                                        for col in cols_widhts:
+                                            if i==0:
+                                                cols_widhts[i] = cols_widhts[i]/2.0
+                                                tmp = cols_widhts[i]
+                                            sum += col
+                                            i+=1
+                                        cols_widhts.append(round(tmp,2))
+                                    colWidths = ",".join(map(tools.ustr, cols_widhts))
+                                    matrix_ans = ['',]
+                                    for col in que.column_heading_ids:
+                                        if col.title not in matrix_ans:
+                                            matrix_ans.append(col.title)
+                                    len_matrix = len(matrix_ans)
+                                    if que.comment_column:
+                                        matrix_ans.append(que.column_name)
+                                    rml+="""<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
+                                    for mat_col in matrix_ans:
+                                        rml+="""<td><para style="response">""" + to_xml(tools.ustr(mat_col)) + """</para></td>"""
+                                    rml +="""</tr>"""
+                                    rml+="""</blockTable>"""
+                                    i=0
+                                    for ans in que.answer_choice_ids:
+                                        if i%2!=0:
+                                            style='ans_tbl_white'
+                                        else:
+                                            style='ans_tbl_gainsboro'
+                                        i+=1
+                                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style='"""+style+"""'>
+                                        <tr><td><para style="response">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
+                                        comment_value = ""
+                                        for mat_col in range(1, len_matrix):
+                                            value = """"""
+                                            for res_ans in answer[0].response_answer_ids:
+                                                if res_ans.answer_id.id == ans.id and res_ans.answer == matrix_ans[mat_col]:
+                                                    comment_value =  to_xml(tools.ustr(res_ans.comment_field))
+                                                    if que.type in ['matrix_of_drop_down_menus']:
+                                                        value = """<para style="response">""" + to_xml(tools.ustr(res_ans.value_choice)) + """</para>"""
+                                                    elif que.type in ['matrix_of_choices_only_one_ans','rating_scale']:
+                                                        value = """<illustration><fill color="white"/>
+                                                                <circle x="0.3cm" y="-0.18cm" radius="0.22 cm" fill="yes" stroke="yes"/>
+                                                                <fill color="gray"/>
+                                                                <circle x="0.3cm" y="-0.18cm" radius="0.10 cm" fill="yes" stroke="no"/>
+                                                            </illustration>"""
+                                                    elif que.type in ['matrix_of_choices_only_multi_ans']:
+                                                        value = """<illustration>
+                                                            <fill color="white"/>
+                                                            <rect x="0.1cm" y="-0.45cm" width="0.5 cm" height="0.5cm" fill="yes" stroke="yes"  round="0.1cm"/>
+                                                            <fill color="gray"/>
+                                                            <rect x="0.2cm" y="-0.35cm" width="0.3 cm" height="0.3cm" fill="yes" stroke="no"  round="0.1cm"/>
+                                                            </illustration>"""
+                                                    break
+                                                else:
+                                                    if que.type in ['matrix_of_drop_down_menus']:
+                                                        value = """"""
+                                                    elif que.type in ['matrix_of_choices_only_one_ans','rating_scale']:
+                                                        value = """<illustration><fill color="white"/>
+                                                                <circle x="0.3cm" y="-0.18cm" radius="0.22 cm" fill="yes" stroke="yes"  round="0.1cm"/>
+                                                            </illustration>"""
+                                                    elif que.type in ['matrix_of_choices_only_multi_ans']:
+                                                        value = """<illustration><fill color="white"/>
+                                                            <rect x="0.1cm" y="-0.45cm" width="0.5 cm" height="0.5cm" fill="yes" stroke="yes"  round="0.1cm"/>
+                                                            </illustration>"""
+                                            rml+= """<td>""" + value + """</td>"""
+                                        if que.comment_column:
+                                            if comment_value=='False':
+                                                comment_value = ''
+                                            rml+= """<td><para style="response">"""+ to_xml(tools.ustr(comment_value)) + """</para></td>"""
+                                        rml+="""  </tr></blockTable>"""
+                                    if que.comment_field_type:
+                                        rml+="""<blockTable colWidths="500" style="Table1"><tr>
+                                                <td><para style="answer">""" + to_xml(tools.ustr(answer[0].comment)) + """</para></td></tr></blockTable>"""
+                                else:
+                                    rml +="""<blockTable colWidths="500" style="Table1">
+                                     <tr>  <td> <para style="response">No Response</para></td> </tr>
+                                    </blockTable>"""
+                    rml += """<pageBreak/>"""
+        rml += """</story></document>"""
+        report_type = datas.get('report_type', 'pdf')
+        create_doc = self.generators[report_type]
+        pdf = create_doc(rml, title=self.title)
+        return (pdf, report_type)
+
+survey_browse_response('report.survey.browse.response', 'survey','','')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
new file mode 100644
index 00000000000..9994a47e3e5
--- /dev/null
+++ b/addons/survey/report/survey_form.py
@@ -0,0 +1,372 @@
+# -*- 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 pooler
+from report.interface import report_rml
+from tools import to_xml
+import tools
+
+class survey_form(report_rml):
+    def create(self, cr, uid, ids, datas, context):
+        _divide_columns_for_matrix = 0.7
+        _display_ans_in_rows = 5
+        _pageSize = ('29.7cm','21.1cm')
+        if datas.has_key('form') and datas['form']['orientation']=='vertical':
+            if datas['form']['paper_size']=='letter':
+                _pageSize = ('21.6cm','27.9cm')
+            elif datas['form']['paper_size']=='legal':
+                _pageSize = ('21.6cm','35.6cm')
+            elif datas['form']['paper_size']=='a4':
+                _pageSize = ('21.1cm','29.7cm')
+        elif datas.has_key('form') and datas['form']['orientation']=='horizontal':
+            if datas['form']['paper_size']=='letter':
+                _pageSize = ('27.9cm','21.6cm')
+            elif datas['form']['paper_size']=='legal':
+                _pageSize = ('35.6cm','21.6cm')
+            elif datas['form']['paper_size']=='a4':
+                _pageSize = ('29.7cm','21.1cm')
+
+        _frame_width = tools.ustr(_pageSize[0])
+        _frame_height = tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.90))+'cm'
+        _tbl_widths = tools.ustr(float(_pageSize[0].replace('cm','')) - float(2.10))+'cm'
+        rml="""<document filename="Survey Form.pdf">
+            <template pageSize="("""+_pageSize[0]+""","""+_pageSize[1]+""")" title='Survey Form.pdf' author="Martin Simon" allowSplitting="20" >
+                <pageTemplate id="first">
+                    <frame id="first" x1="0.0cm" y1="1.0cm" width='"""+_frame_width+"""' height='"""+_frame_height+"""'/>
+                    <pageGraphics>
+                        <lineMode width="1.0"/>
+                        <lines>1.0cm """+tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00))+'cm'+"""</lines>
+                        <lines>1.0cm """+tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00))+'cm'+""" 1.0cm 1.00cm</lines>
+                        <lines>"""+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" 1.00cm</lines>
+                        <lines>1.0cm 1.00cm """+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" 1.00cm</lines>"""
+        if datas.has_key('form') and datas['form']['page_number']:
+            rml +="""
+                    <fill color="gray"/>
+                    <setFont name="Helvetica" size="10"/>
+                    <drawRightString x='"""+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+"""' y="0.6cm">Page : <pageNumber/> </drawRightString>"""
+        rml +="""</pageGraphics>
+                </pageTemplate>
+            </template>
+            <stylesheet>
+            <blockTableStyle id="ans_tbl">
+              <blockAlignment value="LEFT"/>
+              <blockValign value="TOP"/>
+              <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+            </blockTableStyle>
+            <blockTableStyle id="ans_tbl_white">
+              <blockAlignment value="LEFT"/>
+              <blockValign value="TOP"/>
+              <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+            </blockTableStyle>
+            <blockTableStyle id="ans_tbl_gainsboro">
+              <blockAlignment value="LEFT"/>
+              <blockValign value="TOP"/>
+              <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+              <blockBackground colorName="gainsboro" start="0,0" stop="-1,-1"/>
+            </blockTableStyle>
+            <blockTableStyle id="page_tbl">
+              <blockAlignment value="LEFT"/>
+              <blockValign value="TOP"/>
+              <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="1,-1"/>
+              <blockBackground colorName="gray" start="0,0" stop="-1,-1"/>
+              <blockTextColor colorName="white" start="0,0" stop="0,0"/>
+            </blockTableStyle>
+            <blockTableStyle id="title_tbl">
+              <blockAlignment value="LEFT"/>
+              <blockValign value="TOP"/>
+              <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="1,-1"/>
+              <blockBackground colorName="black" start="0,0" stop="-1,-1"/>
+              <blockTextColor colorName="white" start="0,0" stop="0,0"/>
+            </blockTableStyle>
+            <blockTableStyle id="question_tbl">
+              <blockAlignment value="LEFT"/>
+              <blockValign value="TOP"/>
+              <lineStyle kind="LINEBELOW" colorName="#8f8f8f" start="0,-1" stop="1,-1"/>
+            </blockTableStyle>
+            <blockTableStyle id="Table4">
+              <blockAlignment value="LEFT"/>
+              <blockValign value="TOP"/>
+              <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
+              <lineStyle kind="LINEBEFORE" colorName="#777777" start="0,0" stop="-1,-1"/>
+              <lineStyle kind="LINEAFTER" colorName="#777777" start="0,0" stop="-1,-1"/>
+            </blockTableStyle>
+            <blockTableStyle id="Table5">
+              <blockAlignment value="LEFT"/>
+              <blockValign value="TOP"/>
+              <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+              <lineStyle kind="LINEBEFORE" colorName="#777777" start="0,0" stop="-1,-1"/>
+              <lineStyle kind="LINEAFTER" colorName="#777777" start="0,0" stop="-1,-1"/>
+            </blockTableStyle>
+            <initialize>
+              <paraStyle name="all" alignment="justify"/>
+            </initialize>
+            <paraStyle name="response" fontName="Helvetica-oblique" fontSize="9.5"/>
+            <paraStyle name="page" fontName="helvetica-bold" fontSize="15.0" leftIndent="0.0" textColor="white"/>
+            <paraStyle name="title" fontName="helvetica-bold" fontSize="18.0" leftIndent="0.0" textColor="white"/>
+            <paraStyle name="question" fontName="helvetica-boldoblique" fontSize="10.0" leftIndent="3.0"/>
+            <paraStyle name="answer" fontName="helvetica" fontSize="09.0" leftIndent="0.0"/>
+            <paraStyle name="descriptive_text" fontName="helvetica" fontSize="10.0" leftIndent="0.0"/>
+            <paraStyle name="answer_left" alignment="LEFT" fontName="helvetica-bold" fontSize="8.0" leftIndent="0.0"/>
+            <paraStyle name="P2" fontName="Helvetica" fontSize="14.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+            <paraStyle name="comment" fontName="Helvetica" fontSize="14.0" leading="50" spaceBefore="0.0" spaceAfter="0.0"/>
+            <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="12" spaceBefore="0.0" spaceAfter="1.0"/>
+            <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+            <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+        </stylesheet>
+        <story>"""
+        surv_obj = pooler.get_pool(cr.dbname).get('survey')
+        for survey in surv_obj.browse(cr,uid,ids):
+            if survey.question_prefix:
+                prefix = survey.question_prefix + " : "
+            else:
+                prefix = ''
+            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>"""
+            seq = 0
+            for page in survey.page_ids:
+                seq+=1
+                rml += """
+                <blockTable colWidths='"""+_tbl_widths+"""' style="page_tbl">
+                    <tr><td><para style="page">"""+ tools.ustr(seq) + """. """ + to_xml(tools.ustr(page.title)) + """</para></td></tr>
+                </blockTable>"""
+                for que in page.question_ids:
+                    cols_widhts=[]
+                    rml +="""
+                    <para style="P2"><font></font></para>
+                    <blockTable colWidths='"""+_tbl_widths+"""' style="question_tbl">
+                        <tr><td><para style="question">""" + to_xml(tools.ustr(prefix)) + to_xml(tools.ustr(que.question)) + """</para></td></tr>
+                    </blockTable>
+                    <para style="P2"><font></font></para>"""
+                    if que.type in ['descriptive_text']:
+                        cols_widhts.append(float(_tbl_widths.replace('cm','')))
+                        colWidths = "cm,".join(map(tools.ustr, cols_widhts))
+                        colWidths = colWidths+'cm'
+                        rml+="""
+                        <blockTable colWidths=" """ + colWidths + """ " style="ans_tbl">
+                            <tr>
+                                <td>
+                                <para style="descriptive_text">""" + to_xml(tools.ustr(que.descriptive_text)) + """</para>
+                                </td>
+                            </tr>
+                        </blockTable>"""
+                    elif que.type in ['multiple_choice_multiple_ans','multiple_choice_only_one_ans']:
+                        answer=[]
+                        for ans in que.answer_choice_ids:
+                            answer.append(to_xml(tools.ustr((ans.answer))))
+
+                        def divide_list(lst, n):
+                            return [lst[i::n] for i in range(n)]
+
+                        divide_list = divide_list(answer,_display_ans_in_rows)
+                        for lst in divide_list:
+                            if que.type == 'multiple_choice_multiple_ans':
+                                if len(lst)<>0 and len(lst)<>int(round(float(len(answer))/_display_ans_in_rows,0)):
+                                   lst.append('')
+                            if not lst:
+                               del divide_list[divide_list.index(lst):]
+                        for divide in divide_list:
+                            a = _divide_columns_for_matrix*len(divide)
+                            b = float(_tbl_widths.replace('cm','')) - float(a)
+                            cols_widhts=[]
+                            for div in range(0,len(divide)):
+                                cols_widhts.append(float(a/len(divide)))
+                                cols_widhts.append(float(b/len(divide)))
+                            colWidths = "cm,".join(map(tools.ustr, cols_widhts))
+                            colWidths = colWidths+'cm'
+                            rml+="""<blockTable colWidths=" """ + colWidths + """ " style="ans_tbl">
+                                        <tr>"""
+                            for div in range(0,len(divide)):
+                               if divide[div]!='':
+                                   if que.type == 'multiple_choice_multiple_ans':
+                                           rml+="""
+                                           <td>
+                                               <illustration>
+                                                   <rect x="0.1cm" y="-0.4cm" width="0.5 cm" height="0.5cm" fill="no" stroke="yes"/>
+                                                </illustration>
+                                           </td>
+                                           <td><para style="answer">""" + divide[div] + """</para></td>"""
+                                   else:
+                                       rml+="""
+                                       <td>
+                                           <illustration>
+                                               <circle x="0.3cm" y="-0.18cm" radius="0.23 cm" fill="no" stroke="yes"/>
+                                            </illustration>
+                                       </td>
+                                       <td><para style="answer">""" + divide[div] + """</para></td>"""
+                               else:
+                                   rml+="""
+                                   <td></td>
+                                   <td></td>"""
+                            rml+="""
+                            </tr></blockTable>"""
+                    elif que.type in ['matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus']:
+                        if len(que.column_heading_ids):
+                            cols_widhts.append(float(_tbl_widths.replace('cm',''))/float(2.0))
+                            for col in que.column_heading_ids:
+                                cols_widhts.append(float((float(_tbl_widths.replace('cm',''))/float(2.0))/len(que.column_heading_ids)))
+                        else:
+                            cols_widhts.append(float(_tbl_widths.replace('cm','')))
+                        tmp=0.0
+                        sum = 0.0
+                        i = 0
+                        if que.comment_column:
+                            for col in cols_widhts:
+                                if i==0:
+                                    cols_widhts[i] = cols_widhts[i]/2.0
+                                    tmp = cols_widhts[i]
+                                sum += col
+                                i+=1
+                            cols_widhts.append(round(tmp,2))
+                        colWidths = "cm,".join(map(tools.ustr, cols_widhts))
+                        colWidths = colWidths+'cm'
+                        matrix_ans = ['',]
+                        for col in que.column_heading_ids:
+                            if col.title not in matrix_ans:
+                                matrix_ans.append(col.title)
+                        if que.comment_column:
+                            matrix_ans.append(to_xml(tools.ustr(que.column_name)))
+
+                        rml+="""
+                        <blockTable colWidths=" """ + colWidths + """ " style="ans_tbl">
+                            <tr>"""
+                        for mat_col in matrix_ans:
+                            rml+="""
+                            <td><para style="response">""" + to_xml(tools.ustr(mat_col)) + """</para></td>"""
+                        rml+="""</tr></blockTable>"""
+                        i=0
+                        for ans in que.answer_choice_ids:
+                            if i%2!=0:
+                                style='ans_tbl_white'
+                            else:
+                                style='ans_tbl_gainsboro'
+                            i+=1
+                            rml+="""
+                            <blockTable colWidths=" """ + colWidths + """ " style='"""+style+"""'>
+                            <tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
+                            rec_width = float((sum-tmp)*10+100)
+                            value = ""
+                            if que.type in ['matrix_of_drop_down_menus']:
+                                value = """ <fill color="white"/>
+                                    <rect x="-0.1cm" y="-0.45cm" width='""" + tools.ustr(cols_widhts[-1] - 0.5) +"cm" + """' height="0.5cm" fill="yes" stroke="yes" round="0.1cm"/>"""
+                            elif que.type in ['matrix_of_choices_only_one_ans']:
+                                value = """ <fill color="white"/>
+                                    <!--rect x="0.25cm" y="-0.5cm" width="0.8 cm" height="0.5cm" fill="yes" stroke="yes" round="0.1cm"/-->
+                                    <circle x="0.35cm" y="-0.18cm" radius="0.25 cm" fill="yes" stroke="yes"/>"""
+                            else:
+                                value = """ <fill color="white"/>
+                                    <rect x="0.1cm" y="-0.4cm" width="0.5 cm" height="0.5cm" fill="yes" stroke="yes" round="0.1cm"/>"""
+                            for mat_col in range(1,len(matrix_ans)):
+                                if matrix_ans[mat_col]==que.column_name:
+                                    if mat_col==1:
+                                        rml+="""
+                                            <td><para style="answer_left">""" + to_xml(tools.ustr(que.column_name)) + """</para></td>"""
+                                    else:
+                                      rml+="""<td></td>"""
+                                else:
+                                    rml+="""<td><illustration>""" + value + """</illustration></td>"""
+                            rml+= """</tr></blockTable>"""
+                    elif que.type in ['multiple_textboxes','numerical_textboxes', 'date_and_time','date']:
+                        cols_widhts.append(float(_tbl_widths.replace('cm',''))/2)
+                        cols_widhts.append(float(_tbl_widths.replace('cm',''))/2)
+                        colWidths = "cm,".join(map(tools.ustr, cols_widhts))
+                        colWidths = tools.ustr(colWidths) + 'cm'
+                        rect_len = ""
+                        if que.type in ['multiple_textboxes']:
+                            rect_len =  tools.ustr(cols_widhts[0] - 0.3) + "cm"
+                        else:
+                            rect_len = "6cm"
+                        for ans in que.answer_choice_ids:
+                            rml +="""<para style="P1"></para>
+                            <blockTable colWidths=" """+ colWidths + """ " style="ans_tbl">
+                                <tr>
+                                <td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>
+                                    <td>
+                                    <illustration>
+                                        <rect x="0.0cm" y="-0.5cm" width='""" + tools.ustr(rect_len) + """' height="0.6cm" fill="no" stroke="yes"/>
+                                    </illustration>
+                                    </td>
+                                </tr>
+                            </blockTable>"""
+                    elif que.type in ['comment']:
+                        cols_widhts.append(float(_tbl_widths.replace('cm','')))
+                        colWidths = "cm,".join(map(tools.ustr, cols_widhts))
+                        colWidths = colWidths+'cm'
+                        rect_len = ""
+                        rect_len =  tools.ustr(cols_widhts[0] - 0.4) + "cm"
+                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="ans_tbl">
+                            <tr>
+                                <td><para style="comment"><font color="white"> </font></para>
+                                    <illustration>
+                                        <rect x="0.0cm" y="0.3cm" width='""" + tools.ustr(rect_len) + """' height="1.5cm" fill="no" stroke="yes"/>
+                                    </illustration>
+                                </td>
+                            </tr>
+                        </blockTable>"""
+                    elif que.type in ['single_textbox']:
+                        cols_widhts.append(float(_tbl_widths.replace('cm','')))
+                        colWidths = "cm,".join(map(tools.ustr, cols_widhts))
+                        colWidths = colWidths+'cm'
+                        rml+="""<para style="P2"><font color="white"> </font></para>
+                        <blockTable colWidths=" """ + colWidths + """ " style="ans_tbl">
+                            <tr>
+                                <td>
+                                    <illustration>
+                                        <rect x="0.2cm" y="0.3cm" width="15.0 cm" height="0.6cm" fill="no" stroke="yes"/>
+                                    </illustration>
+                                </td>
+                            </tr>
+                        </blockTable>"""
+                    elif que.type in ['table']:
+                        tbl_width = float(_tbl_widths.replace('cm',''))
+                        for i in range(0,len(que.column_heading_ids)):
+                            cols_widhts.append(tbl_width/float(len(que.column_heading_ids)))
+                        colWidths = "cm,".join(map(tools.ustr, cols_widhts))
+                        colWidths = colWidths+'cm'
+                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="Table4"><tr>"""
+                        for col in que.column_heading_ids:
+                            rml+="""<td><para style="terp_tblheader_Details">""" + to_xml(tools.ustr(col.title)) + """</para></td>"""
+                        rml+="""</tr></blockTable>
+                        <blockTable colWidths=" """ + colWidths + """ " style="Table5">"""
+                        for r in range(0,que.no_of_rows):
+                            rml+="""<tr>"""
+                            for c in que.column_heading_ids:
+                               rml+="""
+                                <td><para style="terp_default_9"><font color="white"> </font></para></td>"""
+                            rml+="""</tr>"""
+                        rml+="""</blockTable>"""
+                if datas.has_key('form') and not datas['form']['without_pagebreak']:
+                    rml+="""<pageBreak/>"""
+                elif not datas.has_key('form'):
+                    rml+="""<pageBreak/>"""
+                else:
+                    rml+="""<para style="P2"><font></font></para>"""
+        rml+="""</story></document>"""
+        report_type = datas.get('report_type', 'pdf')
+        create_doc = self.generators[report_type]
+        pdf = create_doc(rml, title=self.title)
+        return (pdf, report_type)
+survey_form('report.survey.form', 'survey','','')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
new file mode 100644
index 00000000000..f493078d3fb
--- /dev/null
+++ b/addons/survey/security/ir.model.access.csv
@@ -0,0 +1,26 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_survey_manager","survey","model_survey","group_survey_manager",1,1,1,1
+"access_survey_user","survey","model_survey","group_survey_user",1,1,0,0
+"access_survey_page_manager","survey.page","model_survey_page","group_survey_manager",1,1,1,1
+"access_survey_page_user","survey.page","model_survey_page","group_survey_user",1,0,0,0
+"access_survey_question_manager","survey.question","model_survey_question","group_survey_manager",1,1,1,1
+"access_survey_question_user","survey.question","model_survey_question","group_survey_user",1,0,0,0
+"access_survey_answer_manager","survey.answer","model_survey_answer","group_survey_manager",1,1,1,1
+"access_survey_answer_user","survey.answer","model_survey_answer","group_survey_user",1,0,0,0
+"access_survey_response_manager","survey.response","model_survey_response","group_survey_manager",1,1,1,1
+"access_survey_response_user","survey.response","model_survey_response","group_survey_user",1,1,1,1
+"access_survey_response_answer_manager","survey.response.answer","model_survey_response_answer","group_survey_manager",1,1,1,1
+"access_survey_response_answer_user","survey.response.answer","model_survey_response_answer","group_survey_user",1,1,1,1
+"access_survey_name_wiz_manager","survey.name.wiz","model_survey_name_wiz","group_survey_manager",1,1,1,1
+"access_survey_name_wiz_user","survey.name.wiz","model_survey_name_wiz","group_survey_user",1,0,0,0
+"access_survey_question_wiz_manager","survey.question.wiz","model_survey_question_wiz","group_survey_manager",1,1,1,1
+"access_survey_question_wiz_user","survey.question.wiz","model_survey_question_wiz","group_survey_user",1,0,0,0
+"access_survey_history","survey.history","model_survey_history","group_survey_user",1,1,1,0
+"access_survey_question_column_heading","survey.question.column.heading","model_survey_question_column_heading","group_survey_manager",1,1,1,1
+"access_survey_question_column_heading","survey.question.column.heading","model_survey_question_column_heading","group_survey_user",1,0,0,0
+"access_survey_request","survey.request","model_survey_request","group_survey_manager",1,1,1,1
+"access_survey_request","survey.request","model_survey_request","group_survey_user",1,0,0,0
+"access_survey_tbl_column_heading","survey.tbl.column.heading","model_survey_tbl_column_heading","group_survey_manager",1,1,1,1
+"access_survey_tbl_column_heading","survey.tbl.column.heading","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
+"access_survey_response_line","survey.response.line","model_survey_response_line","group_survey_manager",1,1,1,1
+"access_survey_response_line","survey.response.line","model_survey_response_line","group_survey_user",1,1,1,1
diff --git a/addons/survey/specification/final spec b/addons/survey/specification/final spec
new file mode 100644
index 00000000000..673ca5bad17
--- /dev/null
+++ b/addons/survey/specification/final spec	
@@ -0,0 +1,157 @@
+Date : 8th October, 2009
+Created by : Harshad Modi(hmo) and Yogesh(ysa)
+--------------------------------------------------------------------------------------
+
+                        ****  Specification of Survay module in OpenERP ****
+
+
+Basic Requirements :
+======================================================================================
+> Design own survey form
+> Desing own Questionaries
+> Collect Response
+> Analyze Result 
+
+Design own survey form:    
+---------------------------------------------------------------
+Allow to make multiple own survey pages with multiple questions with different question type.
+
+Note : After finish first Phase of Development, Allow to design page template to specify customize theme for bgcolor, bgimage, font style, font color
+
+
+Design Questinaries :
+-------------------------------------------------------
+Questinaries should has :
+* can specify question text
+* can make Answer sheet
+Question Type:
+* Survey Admin can able to  design answer option like:
+- Mutiple Choice with one answer 
+- Mutilpe Choice with multiple answer 
+
+
+Collect Response :
+---------------------------------------------------------
+Survey Admin can able to  :
+- Create a link
+- Send a survey invitation to others peple by mail
+- Allow to set max limit of  Response
+- Survey Admin can able to close survey
+
+Analyze Result :
+----------------------------------------------------------
+- Show Result with all Survey pages with total responses, responce count and calculate avarage response.
+
+
+
+
+
+
+
+
+OpenERP model Design :
+====================================================================
+survey :
+-------------------------------------------
+title - char(128)
+pages_ids   - one2many(survey_page)
+date_open
+date_close
+survey_link
+max_response_limit
+status (draft, open, close, cancel)
+resposible - many2one (res.user)
+
+survey_page:
+-------------------------------------------------------------------
+title - char(128)
+page_template_id - many2one( survey_page_template)
+survey_id - many2one(survey)
+question_ids  - one2many(survey_question)
+sequence - int
+note - char(256)
+
+survey_question:
+--------------------------------------------------------------
+page_id - many2one(survey_page)
+question  - char(128)
+answer_choice_ids - one2many(survey_answer)
+response_ids - one2many(survey_response)
+is_require_answer
+allow_comment
+sequence - int
+
+survey_answer:
+--------------------------------------------------------------------------
+question_id - many2one(survey_question)
+answer - char(128)
+sequence - int
+
+survey_response:
+--------------------------------------------------------------------
+date_create
+date_modify
+status (done, skip)
+response_by - many2one(res.users)
+question_id - many2one(survey_question)
+response_type ( from manual, link, mail)
+response_answer_ids - one2many(survey_response_answer)
+
+survey_response_answer:
+--------------------------------------------------------------------
+response_id - many2one(survey_response)
+question_id - many2one(survey_answer)
+comment
+
+
+OpenERP View Design:
+==================================================
+
+Survey View :
+
+see survey.png file
+
+Survey Pages  View:
+
+see survey_page.png file
+
+Survey Question View:
+
+see survey_qyestion.png file
+
+Survey Response View :
+
+see survey_response.png file
+
+
+
+OpenERP Report Design : 
+===================================================
+
+Design postgres view to display statistical information of response per question, response per user, etc..
+More detail will be provided later.
+
+
+OpenERP Menu Design : 
+=====================================================
+
+Survey Management :
+            > Surveys
+                > All Surveys
+                >  New Survey
+            > Survey Pages
+                > All Survey Pages
+                > New Survey Page
+            > Survey Response
+                > All Survey Responses
+                > New Survey Response
+            > Reports
+                > Response per Survey
+                > Response per Survey Page
+                > Response per Question
+                > Response per User
+
+References :
+===============================================
+http://www.surveymonkey.com/
+
diff --git a/addons/survey/specification/survey.png b/addons/survey/specification/survey.png
new file mode 100644
index 00000000000..84a4c40ed26
Binary files /dev/null and b/addons/survey/specification/survey.png differ
diff --git a/addons/survey/specification/survey_page.png b/addons/survey/specification/survey_page.png
new file mode 100644
index 00000000000..4fd45222793
Binary files /dev/null and b/addons/survey/specification/survey_page.png differ
diff --git a/addons/survey/specification/survey_question.png b/addons/survey/specification/survey_question.png
new file mode 100644
index 00000000000..a67c917a98c
Binary files /dev/null and b/addons/survey/specification/survey_question.png differ
diff --git a/addons/survey/specification/survey_response.png b/addons/survey/specification/survey_response.png
new file mode 100644
index 00000000000..a68c37742ce
Binary files /dev/null and b/addons/survey/specification/survey_response.png differ
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
new file mode 100644
index 00000000000..ffe21807603
--- /dev/null
+++ b/addons/survey/survey.py
@@ -0,0 +1,1426 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import datetime
+from time import strftime
+import datetime
+import copy
+from tools.translate import _
+from lxml import etree
+from tools import to_xml
+import tools
+from mx.DateTime import *
+import netsvc
+
+class survey(osv.osv):
+    _name = 'survey'
+    _description = 'Survey'
+    _rec_name = 'title'
+    _columns = {
+        'title' : fields.char('Survey Title', size=128, required=1),
+        'page_ids' : fields.one2many('survey.page', 'survey_id', 'Page'),
+        'date_open' : fields.datetime('Survey Open Date', readonly=1),
+        'date_close' : fields.datetime('Survey Close Date', readonly=1),
+        'max_response_limit' : fields.integer('Maximum Response Limit'),
+        'response_user' : fields.integer('Maximum Response per User',
+                     help="Set to one if  you require only one response per user"),
+        'state' : fields.selection([('draft', 'Draft'), ('open', 'Open'), ('close', 'Closed'), ('cancel', 'Cancelled')], 'Status', readonly=True),
+        'responsible_id' : fields.many2one('res.users', 'Responsible'),
+        'tot_start_survey' : fields.integer("Total Started Survey", readonly=1),
+        'tot_comp_survey' : fields.integer("Total Completed Survey", readonly=1),
+        'note' : fields.text('Description', size=128),
+        'history' : fields.one2many('survey.history', 'survey_id', 'History Lines', readonly=True),
+        'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
+        'question_prefix' : fields.char('Question Prefix', size=128),
+        'send_response' : fields.boolean('E-mail Notification on Response'),
+    }
+    _defaults = {
+        'state' : lambda * a: "draft",
+        'tot_start_survey' : lambda * a: 0,
+        'tot_comp_survey' : lambda * a: 0,
+        'send_response' : lambda * a: 1,
+    }
+
+    def survey_draft(self, cr, uid, ids, arg):
+        self.write(cr, uid, ids, { 'state' : 'draft'})
+        return True
+
+    def survey_open(self, cr, uid, ids, arg):
+        self.write(cr, uid, ids, { 'state' : 'open', 'date_open':strftime("%Y-%m-%d %H:%M:%S")})
+        return True
+
+    def survey_close(self, cr, uid, ids, arg):
+        self.write(cr, uid, ids, { 'state' : 'close', 'date_close':strftime("%Y-%m-%d %H:%M:%S") })
+        return True
+
+    def survey_cancel(self, cr, uid, ids, arg):
+        self.write(cr, uid, ids, { 'state' : 'cancel' })
+        return True
+
+survey()
+
+class survey_history(osv.osv):
+    _name = 'survey.history'
+    _description = 'Survey History'
+    _rec_name = 'date'
+    _columns = {
+        'survey_id' : fields.many2one('survey', 'Survey'),
+        'user_id' : fields.many2one('res.users', 'User', readonly=True),
+        'date' : fields.datetime('Date started', readonly=1),
+    }
+    _defaults = {
+         'date' : lambda * a: datetime.datetime.now()
+    }
+
+survey_history()
+
+class survey_page(osv.osv):
+    _name = 'survey.page'
+    _description = 'Survey Pages'
+    _rec_name = 'title'
+    _order = 'sequence'
+    _columns = {
+        'title' : fields.char('Page Title', size=128, required=1),
+        'survey_id' : fields.many2one('survey', 'Survey', ondelete='cascade'),
+        'question_ids' : fields.one2many('survey.question', 'page_id', 'Question'),
+        'sequence' : fields.integer('Page Nr'),
+        'note' : fields.text('Description'),
+    }
+    _defaults = {
+        'sequence' : lambda * a: 1
+    }
+
+    def default_get(self, cr, uid, fields, context={}):
+        data = super(survey_page, self).default_get(cr, uid, fields, context)
+        if context.has_key('line_order') and context['line_order']:
+            if len(context['line_order'][-1]) > 2 and context['line_order'][-1][2].has_key('sequence'):
+                data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
+        if context.has_key('survey_id'):
+            data['survey_id'] = context['survey_id']
+        return data
+
+    def survey_save(self, cr, uid, ids, context):
+        search_obj = self.pool.get('ir.ui.view')
+        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page_no' : context['page_number'] })
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question.wiz',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'search_view_id':search_id[0],
+                'context': context
+                }
+
+survey_page()
+
+class survey_question(osv.osv):
+    _name = 'survey.question'
+    _description = 'Survey Question'
+    _rec_name = 'question'
+    _order = 'sequence'
+
+    def _calc_response(self, cr, uid, ids, field_name, arg, context):
+        if len(ids) == 0:
+            return {}
+        val = {}
+        cr.execute("select question_id, count(id) as Total_response from survey_response_line where state='done' and question_id in (%s) group by question_id" % ",".join(map(str, map(int, ids))))
+        ids1 = copy.deepcopy(ids)
+        for rec in  cr.fetchall():
+            ids1.remove(rec[0])
+            val[rec[0]] = int(rec[1])
+        for id in ids1:
+            val[id] = 0
+        return val
+
+    _columns = {
+        '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'),
+        'response_ids' : fields.one2many('survey.response.line', 'question_id', 'Response', readonly=1),
+        'is_require_answer' : fields.boolean('Required Answer'),
+        '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'),
+        'minimum_req_ans' : fields.integer('Minimum Required Answer'),
+        'req_error_msg' : fields.text('Error Message'),
+        'allow_comment' : fields.boolean('Allow Comment Field'),
+        'sequence' : fields.integer('Sequence'),
+        'tot_resp' : fields.function(_calc_response, method=True, string="Total Response"),
+        'survey' : fields.related('page_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
+        'descriptive_text' : fields.text('Descriptive Text', size=255),
+        'column_heading_ids' : fields.one2many('survey.question.column.heading', 'question_id',' Column heading'),
+        'type' : fields.selection([('multiple_choice_only_one_ans','Multiple Choice (Only One Answer)'),
+                                     ('multiple_choice_multiple_ans','Multiple Choice (Multiple Answer)'),
+                                     ('matrix_of_choices_only_one_ans','Matrix of Choices (Only One Answers Per Row)'),
+                                     ('matrix_of_choices_only_multi_ans','Matrix of Choices (Multiple Answers Per Row)'),
+                                     ('matrix_of_drop_down_menus','Matrix of Drop-down Menus'),
+                                     ('rating_scale','Rating Scale'),('single_textbox','Single Textbox'),
+                                     ('multiple_textboxes','Multiple Textboxes'),('comment','Comment/Essay Box'),
+                                     ('numerical_textboxes','Numerical Textboxes'),('date','Date'),
+                                     ('date_and_time','Date and Time'),('descriptive_text','Descriptive Text'),
+                                     ('table','Table'),
+                                    ], 'Question Type',  required=1,),
+        '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.'''),
+                                                 ('must_be_specific_length', 'Must Be Specific Length'),
+                                                 ('must_be_whole_number', 'Must Be A Whole Number'),
+                                                 ('must_be_decimal_number', 'Must Be A Decimal Number'),
+                                                 ('must_be_date', 'Must Be A Date'),
+                                                 ('must_be_email_address', 'Must Be An Email Address'),
+                                                 ], 'Text Validation'),
+        'comment_minimum_no' : fields.integer('Minimum number'),
+        'comment_maximum_no' : fields.integer('Maximum number'),
+        'comment_minimum_float' : fields.float('Minimum decimal number'),
+        'comment_maximum_float' : fields.float('Maximum decimal number'),
+        'comment_minimum_date' : fields.date('Minimum date'),
+        'comment_maximum_date' : fields.date('Maximum date'),
+        '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'),
+        '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'),\
+                                                 ('must_be_decimal_number', 'Must Be A Decimal Number'),\
+                                                 ('must_be_date', 'Must Be A Date'),\
+                                                 ('must_be_email_address', 'Must Be An Email Address')\
+                                                 ], 'Text Validation'),
+        'validation_minimum_no' : fields.integer('Minimum number'),
+        'validation_maximum_no' : fields.integer('Maximum number'),
+        'validation_minimum_float' : fields.float('Minimum decimal number'),
+        'validation_maximum_float' : fields.float('Maximum decimal number'),
+        'validation_minimum_date' : fields.date('Minimum date'),
+        'validation_maximum_date' : fields.date('Maximum date'),
+        'validation_valid_err_msg' : fields.text('Error message'),
+        'numeric_required_sum' : fields.integer('Sum of all choices'),
+        'numeric_required_sum_err_msg' : fields.text('Error message'),
+        'rating_allow_one_column_require' : fields.boolean('Allow Only One Response per Column (Forced Ranking)'),
+        'in_visible_rating_weight':fields.boolean('Is Rating Scale Invisible?'),
+        'in_visible_menu_choice':fields.boolean('Is Menu Choice Invisible?'),
+        'comment_column':fields.boolean('Add comment column in matrix'),
+        'column_name':fields.char('Column Name',size=256),
+        'no_of_rows' : fields.integer('No of Rows'),
+    }
+    _defaults = {
+         'sequence' : lambda * a: 1,
+         'type' : lambda * a: 'multiple_choice_multiple_ans',
+         'req_error_msg' : lambda * a: 'This question requires an answer.',
+         'required_type' : lambda * a: '',
+         'comment_label' : lambda * a: 'Other',
+         'comment_valid_type' : lambda * a: 'do_not_validate',
+         'comment_valid_err_msg' : lambda * a : 'The comment you entered is in an invalid format.',
+         'validation_type' : lambda * a: 'do_not_validate',
+         'validation_valid_err_msg' : lambda * a : 'The comment you entered is in an invalid format.',
+         'numeric_required_sum_err_msg' : lambda * a :'The choices need to add up to [enter sum here].',
+         'make_comment_field_err_msg' : lambda * a : 'Please enter a comment.',
+    }
+
+    def on_change_type(self, cr, uid, ids, type, context=None):
+        if type in ['rating_scale']:
+            return {'value': {'in_visible_rating_weight':False,'in_visible_menu_choice':True}}
+        elif type in ['matrix_of_drop_down_menus']:
+            return {'value': {'in_visible_rating_weight':True,'in_visible_menu_choice':False}}
+        elif type in ['single_textbox']:
+            return {'value': {'in_visible_rating_weight':True,'in_visible_menu_choice':True}}
+        else:
+            return {'value': {'in_visible_rating_weight':True,'in_visible_menu_choice':True}}
+
+    def write(self, cr, uid, ids, vals, context=None):
+        questions = self.read(cr,uid, ids, ['answer_choice_ids', 'type', 'required_type','req_ans', 'minimum_req_ans', 'maximum_req_ans', 'column_heading_ids'])
+        for question in questions:
+            col_len = len(question['column_heading_ids'])
+            if vals.has_key('column_heading_ids'):
+                for col in vals['column_heading_ids']:
+                    if type(col[2]) == type({}):
+                        col_len += 1
+                    else:
+                        col_len -= 1
+            if vals.has_key('type'):
+                que_type = vals['type']
+            else:
+                que_type = question['type']
+            if que_type in ['matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale']:
+                if not col_len:
+                    raise osv.except_osv(_('Error !'),_("You must enter one or more column heading."))
+            ans_len = len(question['answer_choice_ids'])
+            if vals.has_key('answer_choice_ids'):
+                for ans in vals['answer_choice_ids']:
+                    if type(ans[2]) == type({}):
+                        ans_len += 1
+                    else:
+                        ans_len -= 1
+            if que_type not in ['descriptive_text', 'single_textbox', 'comment','table']:
+                if not ans_len:
+                    raise osv.except_osv(_('Error !'),_("You must enter one or more Answer."))
+            req_type = ""
+            if vals.has_key('required_type'):
+                req_type = vals['required_type']
+            else:
+                req_type = question['required_type']
+            if req_type in ['at least', 'at most', 'exactly']:
+                if vals.has_key('req_ans'):
+                    if not vals['req_ans'] or  vals['req_ans'] > ans_len:
+                        raise osv.except_osv(_('Error !'),_("#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
+                else:
+                    if not question['req_ans'] or  question['req_ans'] > ans_len:
+                        raise osv.except_osv(_('Error !'),_("#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
+            if req_type == 'a range':
+                minimum_ans = 0
+                maximum_ans = 0
+                if vals.has_key('minimum_req_ans'):
+                    minimum_ans = vals['minimum_req_ans']
+                    if not vals['minimum_req_ans'] or  vals['minimum_req_ans'] > ans_len:
+                        raise osv.except_osv(_('Error !'),_("Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
+                else:
+                    minimum_ans = question['minimum_req_ans']
+                    if not question['minimum_req_ans'] or  question['minimum_req_ans'] > ans_len:
+                        raise osv.except_osv(_('Error !'),_("Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
+                if vals.has_key('maximum_req_ans'):
+                    maximum_ans = vals['maximum_req_ans']
+                    if not vals['maximum_req_ans'] or vals['maximum_req_ans'] > ans_len:
+                        raise osv.except_osv(_('Error !'),_("Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
+                else:
+                    maximum_ans = question['maximum_req_ans']
+                    if not question['maximum_req_ans'] or question['maximum_req_ans'] > ans_len:
+                        raise osv.except_osv(_('Error !'),_("Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
+                if maximum_ans <= minimum_ans:
+                    raise osv.except_osv(_('Error !'),_("Maximum Required Answer is greater than Minimum Required Answer"))
+            if question['type'] ==  'matrix_of_drop_down_menus' and vals.has_key('column_heading_ids'):
+                for col in vals['column_heading_ids']:
+                    if col[2].has_key('menu_choice') and not col[2]['menu_choice']:
+                        raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading"))
+                    elif col[2].has_key('menu_choice') and col[2]['menu_choice'].strip() == '':
+                        raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading (white spaces not allowed)"))
+        return super(survey_question, self).write(cr, uid, ids, vals, context=context)
+
+    def create(self, cr, uid, vals, context):
+        minimum_ans = 0
+        maximum_ans = 0
+        if vals.has_key('answer_choice_ids') and  not len(vals['answer_choice_ids']):
+            if vals.has_key('type') and vals['type'] not in ['descriptive_text', 'single_textbox', 'comment','table']:
+                raise osv.except_osv(_('Error !'),_("You must enter one or more answer."))
+        if vals.has_key('column_heading_ids') and  not len(vals['column_heading_ids']):
+            if vals.has_key('type') and vals['type'] in ['matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale']:
+                raise osv.except_osv(_('Error !'),_("You must enter one or more column heading."))
+        if vals.has_key('required_type') and vals['required_type'] in ['at least', 'at most', 'exactly']:
+            if vals['req_ans'] > len(vals['answer_choice_ids']) or not vals['req_ans']:
+                raise osv.except_osv(_('Error !'),_("#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (len(vals['answer_choice_ids'])+1))
+        if vals.has_key('required_type') and vals['required_type'] == 'a range':
+            minimum_ans = vals['minimum_req_ans']
+            maximum_ans = vals['maximum_req_ans']
+            if vals['minimum_req_ans'] > len(vals['answer_choice_ids']) or not vals['minimum_req_ans']:
+                raise osv.except_osv(_('Error !'),_("Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (len(vals['answer_choice_ids'])+1))
+            if vals['maximum_req_ans'] > len(vals['answer_choice_ids']) or not vals['maximum_req_ans']:
+                raise osv.except_osv(_('Error !'),_("Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d.") % (len(vals['answer_choice_ids'])+1))
+            if maximum_ans <= minimum_ans:
+                raise osv.except_osv(_('Error !'),_("Maximum Required Answer is greater than Minimum Required Answer"))
+        if vals['type'] ==  'matrix_of_drop_down_menus':
+            for col in vals['column_heading_ids']:
+                if not col[2]['menu_choice']:
+                    raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading"))
+                elif col[2]['menu_choice'].strip() == '':
+                    raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading (white spaces not allowed)"))
+        res = super(survey_question, self).create(cr, uid, vals, context)
+        return res
+
+    def survey_save(self, cr, uid, ids, context):
+        search_obj = self.pool.get('ir.ui.view')
+        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page_no' : context['page_number'] })
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question.wiz',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'search_view_id':search_id[0],
+                'context': context
+                }
+
+    def default_get(self, cr, uid, fields, context={}):
+        data = super(survey_question, self).default_get(cr, uid, fields, context)
+        if context.has_key('line_order') and context['line_order']:
+            if len(context['line_order'][-1]) > 2 and context['line_order'][-1][2].has_key('sequence'):
+                data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
+        if context.has_key('page_id'):
+            data['page_id']= context['page_id']
+        return data
+
+survey_question()
+
+
+class survey_question_column_heading(osv.osv):
+    _name = 'survey.question.column.heading'
+    _description = 'Survey Question Column Heading'
+    _rec_name = 'title'
+
+    def _get_in_visible_rating_weight(self,cr, uid, context={}):
+        if context.get('in_visible_rating_weight',False):
+            return context['in_visible_rating_weight']
+        return False
+    def _get_in_visible_menu_choice(self,cr, uid, context={}):
+        if context.get('in_visible_menu_choice',False):
+            return context['in_visible_menu_choice']
+        return False
+
+    _columns = {
+        'title' : fields.char('Column Heading', size=128, required=1),
+        'menu_choice' : fields.text('Menu Choice'),
+        'rating_weight' : fields.integer('Weight'),
+        'question_id' : fields.many2one('survey.question', 'Question', ondelete='cascade'),
+        'in_visible_rating_weight':fields.boolean('Is Rating Scale Invisible ??'),
+        'in_visible_menu_choice':fields.boolean('Is Menu Choice Invisible??')
+    }
+    _defaults={
+       'in_visible_rating_weight':_get_in_visible_rating_weight,
+       'in_visible_menu_choice':_get_in_visible_menu_choice,
+    }
+
+survey_question_column_heading()
+
+class survey_answer(osv.osv):
+    _name = 'survey.answer'
+    _description = 'Survey Answer'
+    _rec_name = 'answer'
+    _order = 'sequence'
+
+    def _calc_response_avg(self, cr, uid, ids, field_name, arg, context):
+        val = {}
+        for rec in self.browse(cr, uid, ids):
+            cr.execute("select count(question_id) ,(select count(answer_id) \
+                from survey_response_answer sra, survey_response_line sa \
+                where sra.response_id = sa.id and sra.answer_id = %d \
+                and sa.state='done') as tot_ans from survey_response_line \
+                where question_id = %d and state = 'done'"\
+                     % (rec.id, rec.question_id.id))
+            res = cr.fetchone()
+            if res[0]:
+                avg = float(res[1]) * 100 / res[0]
+            else:
+                avg = 0.0
+            val[rec.id] = {
+                'response': res[1],
+                'average': round(avg, 2),
+            }
+        return val
+
+    _columns = {
+        'question_id' : fields.many2one('survey.question', 'Question', ondelete='cascade'),
+        'answer' : fields.char('Answer', size=128, required=1),
+        'sequence' : fields.integer('Sequence'),
+        'response' : fields.function(_calc_response_avg, method=True, string="#Response", multi='sums'),
+        'average' : fields.function(_calc_response_avg, method=True, string="#Avg", multi='sums'),
+    }
+    _defaults = {
+         'sequence' : lambda * a: 1
+    }
+
+    def default_get(self, cr, uid, fields, context={}):
+        data = super(survey_answer, self).default_get(cr, uid, fields, context)
+        if context.has_key('line_order') and context['line_order']:
+            if len(context['line_order'][-1]) > 2 and context['line_order'][-1][2].has_key('sequence'):
+                data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
+        return data
+
+survey_answer()
+
+class survey_response(osv.osv):
+    _name = "survey.response"
+    _rec_name = 'date_create'
+    _columns = {
+        'survey_id' : fields.many2one('survey', 'Survey', required=1, ondelete='cascade'),
+        'date_create' : fields.datetime('Create Date', required=1),
+        'user_id' : fields.many2one('res.users', 'User'),
+        'response_type' : fields.selection([('manually', 'Manually'), ('link', 'Link')], 'Response Type', required=1),
+        'question_ids' : fields.one2many('survey.response.line', 'response_id', 'Response Answer'),
+    }
+
+survey_response()
+
+class survey_response_line(osv.osv):
+    _name = 'survey.response.line'
+    _description = 'Survey Response Line'
+    _rec_name = 'date_create'
+    _columns = {
+        'response_id' : fields.many2one('survey.response', 'Response', ondelete='cascade'),
+        'date_create' : fields.datetime('Create Date', required=1),
+        'state' : fields.selection([('draft', 'Draft'), ('done', 'Answered'),('skip', 'Skiped')], 'Status', readonly=True),
+        'question_id' : fields.many2one('survey.question', 'Question', ondelete='cascade'),
+        'page_id' : fields.related('question_id', 'page_id', type='many2one', relation='survey.page', string='Page'),
+        'response_answer_ids' : fields.one2many('survey.response.answer', 'response_id', 'Response Answer'),
+        'response_table_ids' : fields.one2many('survey.tbl.column.heading', 'response_table_id', 'Response Answer'),
+        'comment' : fields.text('Notes'),
+        'single_text' : fields.char('Text', size=255),
+    }
+    _defaults = {
+        'state' : lambda * a: "draft",
+    }
+
+    def response_draft(self, cr, uid, ids, arg):
+        self.write(cr, uid, ids, { 'state' : 'draft' })
+        return True
+
+    def response_done(self, cr, uid, ids, arg):
+        self.write(cr, uid, ids, { 'state' : 'done' })
+        return True
+
+    def response_skip(self, cr, uid, ids, arg):
+        self.write(cr, uid, ids, { 'state' : 'skip' })
+        return True
+
+survey_response_line()
+
+class survey_tbl_column_heading(osv.osv):
+    _name = 'survey.tbl.column.heading'
+    _order = 'name'
+    _columns = {
+        'name' : fields.integer('Row Number'),
+        'column_id' : fields.many2one('survey.question.column.heading', 'Column', ondelete='cascade'),
+        'value' : fields.char('Value', size = 255),
+        'response_table_id' : fields.many2one('survey.response.line', 'Response', ondelete='cascade'),
+    }
+
+survey_tbl_column_heading()
+
+class survey_response_answer(osv.osv):
+    _name = 'survey.response.answer'
+    _description = 'Survey Response Answer'
+    _rec_name = 'response_id'
+    _columns = {
+        'response_id' : fields.many2one('survey.response.line', 'Response', ondelete='cascade'),
+        'answer_id' : fields.many2one('survey.answer', 'Answer', required=1, ondelete='cascade'),
+        'answer' : fields.char('Value', size =255),
+        'value_choice' : fields.char('Value Choice', size =255),
+        'comment' : fields.text('Notes'),
+        'comment_field' : fields.char('Comment', size = 255)
+    }
+
+survey_response_answer()
+
+class survey_name_wiz(osv.osv_memory):
+    _name = 'survey.name.wiz'
+
+    def _get_survey(self, cr, uid, context=None):
+        surv_obj = self.pool.get("survey")
+        result = []
+        if context.has_key('survey_id'):
+            for sur in surv_obj.browse(cr, uid, [context['survey_id']]):
+                result.append((sur.id, sur.title))
+            return result
+        group_id = self.pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / Manager')])
+        user_obj = self.pool.get('res.users')
+        user_rec = user_obj.read(cr, uid, uid)
+        for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
+            if sur.state == 'open':
+                if group_id[0]  in user_rec['groups_id']:
+                    result.append((sur.id, sur.title))
+                elif sur.id in user_rec['survey_id']:
+                    result.append((sur.id, sur.title))
+        return result
+
+    _columns = {
+        'survey_id': fields.selection(_get_survey, "Survey", required="1"),
+        'page_no' : fields.integer('Page Number'),
+        'note' : fields.text("Description"),
+        'page' : fields.char('Page Position',size = 12),
+        'transfer' : fields.boolean('Page Transfer'),
+        'store_ans' : fields.text('Store Answer'),
+        'response' : fields.char('Response',size=16)
+    }
+    _defaults = {
+        'page_no' : lambda * a: - 1,
+        'page' : lambda * a: 'next',
+        'transfer' : lambda * a: 1,
+        'response' : lambda * a: 0,
+    }
+
+    def action_next(self, cr, uid, ids, context=None):
+        sur_id = self.read(cr, uid, ids, [])[0]
+        survey_id = sur_id['survey_id']
+        context.update({'survey_id' : survey_id, 'sur_name_id' : sur_id['id']})
+        if not context.has_key('active'):
+            cr.execute('select count(id) from survey_history where user_id=%s\
+                        and survey_id=%s' % (uid,survey_id))
+            res = cr.fetchone()[0]
+            user_limit = self.pool.get('survey').read(cr, uid, survey_id, ['response_user'])['response_user']
+            if user_limit and res >= user_limit:
+                raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
+            his_id = self.pool.get('survey.history').create(cr, uid, {'user_id': uid, \
+                                              'date': strftime('%Y-%m-%d %H:%M:%S'), 'survey_id': survey_id})
+            survey_obj = self.pool.get('survey')
+            sur_rec = survey_obj.read(cr,uid,self.read(cr,uid,ids)[0]['survey_id'])
+            survey_obj.write(cr, uid, survey_id, {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
+        search_obj = self.pool.get('ir.ui.view')
+        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        return {
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'survey.question.wiz',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'search_view_id':search_id[0],
+            'context' : context
+         }
+
+    def on_change_survey(self, cr, uid, ids, survey_id, context=None):
+        notes = self.pool.get('survey').read(cr, uid, survey_id, ['note'])['note']
+        return {'value': {'note' : notes}}
+
+survey_name_wiz()
+
+class survey_question_wiz(osv.osv_memory):
+    _name = 'survey.question.wiz'
+    _columns = {
+        'name': fields.integer('Number'),
+    }
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+        result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        if view_type in ['form']:
+            sur_name_rec = surv_name_wiz.read(cr, uid, context['sur_name_id'])
+            survey_id = context['survey_id']
+            survey_obj = self.pool.get('survey')
+            sur_rec = survey_obj.read(cr, uid, survey_id, [])
+            page_obj = self.pool.get('survey.page')
+            que_obj = self.pool.get('survey.question')
+            ans_obj = self.pool.get('survey.answer')
+            response_obj = self.pool.get('survey.response.line')
+            que_col_head = self.pool.get('survey.question.column.heading')
+            p_id = sur_rec['page_ids']
+            total_pages = len(p_id)
+            pre_button = False
+            if not sur_name_rec['page_no'] + 1 :
+                surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':{}})
+            sur_name_read = surv_name_wiz.read(cr, uid, context['sur_name_id'])
+            page_number = int(sur_name_rec['page_no'])
+            if sur_name_read['transfer'] or not sur_name_rec['page_no'] + 1:
+                surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':False})
+                flag = False
+                if sur_name_read['page'] == "next" or sur_name_rec['page_no'] == - 1 :
+                    if len(p_id) > sur_name_rec['page_no'] + 1 :
+                        if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey'] and not sur_name_rec['page_no'] + 1:
+                            survey_obj.write(cr, uid, survey_id, {'state':'close', 'date_close':strftime("%Y-%m-%d %H:%M:%S")})
+                        p_id = p_id[sur_name_rec['page_no'] + 1]
+                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'page_no' : sur_name_rec['page_no'] + 1})
+                        flag = True
+                        page_number += 1
+                    if sur_name_rec['page_no'] > - 1:
+                        pre_button = True
+                else:
+                    if sur_name_rec['page_no'] != 0:
+                        p_id = p_id[sur_name_rec['page_no'] - 1]
+                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'page_no' : sur_name_rec['page_no'] - 1})
+                        flag = True
+                        page_number -= 1
+                    if sur_name_rec['page_no'] > 1:
+                        pre_button = True
+                if flag:
+                    fields = {}
+                    pag_rec = page_obj.read(cr, uid, p_id)
+                    xml_form = etree.Element('form', {'string': _(tools.ustr(pag_rec['title']))})
+                    etree.SubElement(xml_form, 'label', {'string': to_xml(tools.ustr(pag_rec['note'] or '')), 'align': '0.0', 'colspan':'4'})
+                    que_ids = pag_rec['question_ids']
+                    qu_no = 0
+                    for que in que_ids:
+                        qu_no += 1
+                        que_rec = que_obj.read(cr, uid, que)
+                        descriptive_text = ""
+                        separator_string = tools.ustr(qu_no) + "." + tools.ustr(que_rec['question'])
+                        if not context.has_key('active') and (que_rec['is_require_answer'] or que_rec['required_type'] != ''):
+                            star='*'
+                        else:
+                            star=''
+                        xml_group = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '4'})
+                        if context.has_key('active') and context.has_key('edit'):
+                            xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '2'})
+                            etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '3'})
+                            xml_group1 = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '2'})
+                            context.update({'question_id' : tools.ustr(que),'page_number' : sur_name_rec['page_no'] , 'transfer' : sur_name_read['transfer'], 'page_id' : p_id})
+                            etree.SubElement(xml_group1, 'button', {'string' :'','icon': "gtk-edit", 'type' :'object', 'name':"action_edit_question", 'context' : tools.ustr(context)})
+                            etree.SubElement(xml_group1, 'button', {'string' :'','icon': "gtk-delete", 'type' :'object','name':"action_delete_question", 'context' : tools.ustr(context)})
+                        else:
+                            xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
+                            etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '4'})
+                        ans_ids = ans_obj.read(cr, uid, que_rec['answer_choice_ids'], [])
+                        xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
+                        if que_rec['type'] == 'multiple_choice_only_one_ans':
+                            selection = []
+                            for ans in ans_ids:
+                                selection.append((tools.ustr(ans['id']), ans['answer']))
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '2', 'colspan': '2'})
+                            etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_selection"})
+                            fields[tools.ustr(que) + "_selection"] = {'type':'selection', 'selection' :selection, 'string':"Answer"}
+                        elif que_rec['type'] == 'multiple_choice_multiple_ans':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
+                            for ans in ans_ids:
+                                etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
+                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'boolean', 'string':ans['answer']}
+                        elif que_rec['type'] in ['matrix_of_choices_only_one_ans', 'rating_scale']:
+                            if que_rec['comment_column']:
+                                col = "4"
+                                colspan = "4"
+                            else:
+                               col = "2"
+                               colspan = "2"
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': tools.ustr(col), 'colspan': tools.ustr(colspan)})
+                            for row in ans_ids:
+                                etree.SubElement(xml_group, 'newline')
+                                etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_selection_" + tools.ustr(row['id']),'string':to_xml(tools.ustr(row['answer']))})
+                                selection = [('','')]
+                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
+                                    selection.append((col['title'], col['title']))
+                                fields[tools.ustr(que) + "_selection_" + tools.ustr(row['id'])] = {'type':'selection', 'selection' : selection, 'string': "Answer"}
+                                if que_rec['comment_column']:
+                                   fields[tools.ustr(que) + "_commentcolumn_"+tools.ustr(row['id']) + "_field"] = {'type':'char', 'size' : 255, 'string':tools.ustr(que_rec['column_name']), 'views':{}}
+                                   etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_commentcolumn_"+tools.ustr(row['id'])+ "_field"})
+                        elif que_rec['type'] == 'matrix_of_choices_only_multi_ans':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '2', 'colspan': '2'})
+                            for row in ans_ids:
+                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(row['answer'])) +' :-', 'align': '0.0'})
+                                etree.SubElement(xml_group, 'newline')
+                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
+                                    etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['title'])})
+                                    fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['title'])] = {'type':'boolean', 'string': col['title']}
+                        elif que_rec['type'] == 'matrix_of_drop_down_menus':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '2', 'colspan': '2'})
+                            for row in ans_ids:
+                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(row['answer']))+' :-', 'align': '0.0'})
+                                etree.SubElement(xml_group, 'newline')
+                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
+                                    selection = []
+                                    if col['menu_choice']:
+                                        for item in col['menu_choice'].split('\n'):
+                                            if item and not item.strip() == '': selection.append((item ,item))
+                                    etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['title'])})
+                                    fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['title'])] = {'type':'selection', 'string': col['title'], 'selection':selection}
+                        elif que_rec['type'] == 'multiple_textboxes':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '1', 'colspan': '4'})
+                            for ans in ans_ids:
+                                etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"})
+                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
+                        elif que_rec['type'] == 'numerical_textboxes':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '2', 'colspan': '2'})
+                            for ans in ans_ids:
+                                etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_numeric"})
+                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_numeric"] = {'type':'integer', 'string':ans['answer']}
+                        elif que_rec['type'] == 'date':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '2', 'colspan': '2'})
+                            for ans in ans_ids:
+                                etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
+                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'date', 'string':ans['answer']}
+                        elif que_rec['type'] == 'date_and_time':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '2', 'colspan': '2'})
+                            for ans in ans_ids:
+                                etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
+                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'datetime', 'string':ans['answer']}
+                        elif que_rec['type'] == 'descriptive_text':
+                            for que_test in que_rec['descriptive_text'].split('\n'):
+                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
+                        elif que_rec['type'] == 'single_textbox':
+                            etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_single", 'nolabel':"1" ,'colspan':"4"})
+                            fields[tools.ustr(que) + "_single"] = {'type':'char', 'size' : 255, 'string':"single_textbox", 'views':{}}
+                        elif que_rec['type'] == 'comment':
+                            etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_comment", 'nolabel':"1" ,'colspan':"4"})
+                            fields[tools.ustr(que) + "_comment"] = {'type':'text', 'string':"Comment/Eassy Box", 'views':{}}
+                        elif que_rec['type'] == 'table':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids'])), 'colspan': '4'})
+                            for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
+                                etree.SubElement(xml_group, 'separator', {'string': tools.ustr(col['title']),'colspan': '1'})
+                            for row in range(0,que_rec['no_of_rows']):
+                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
+                                    etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_table_" + tools.ustr(col['id']) +"_"+ tools.ustr(row), 'nolabel':"1"})
+                                    fields[tools.ustr(que) + "_table_" + tools.ustr(col['id']) +"_"+ tools.ustr(row)] = {'type':'char','size':255,'views':{}}
+                        if que_rec['type'] in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale']:
+                            if que_rec['type'] in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans'] and que_rec['comment_field_type'] in ['char','text'] and que_rec['make_comment_field']:
+                                etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_otherfield", 'colspan':"4"})
+                                fields[tools.ustr(que) + "_otherfield"] = {'type':'boolean', 'string':que_rec['comment_label'], 'views':{}}
+                                if que_rec['comment_field_type'] == 'char':
+                                    etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
+                                    fields[tools.ustr(que) + "_other"] = {'type': 'char', 'string': '', 'size':255, 'views':{}}
+                                elif que_rec['comment_field_type'] == 'text':
+                                    etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
+                                    fields[tools.ustr(que) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
+                            else:
+                                if que_rec['comment_field_type'] == 'char':
+                                    etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_rec['comment_label'])),'colspan':"4"})
+                                    etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
+                                    fields[tools.ustr(que) + "_other"] = {'type': 'char', 'string': '', 'size':255, 'views':{}}
+                                elif que_rec['comment_field_type'] == 'text':
+                                    etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_rec['comment_label'])),'colspan':"4"})
+                                    etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
+                                    fields[tools.ustr(que) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
+                    etree.SubElement(xml_form, 'separator', {'colspan': '4'})
+                    xml_group = etree.SubElement(xml_form, 'group', {'col': '6', 'colspan': '4'})
+                    etree.SubElement(xml_group, 'field', {'name': 'progress_bar_' + tools.ustr(page_number) , 'widget':'progressbar'})
+                    fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
+                    etree.SubElement(xml_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages)})
+                    etree.SubElement(xml_group, 'button', {'icon': "gtk-cancel", 'special': "cancel",'string':"Cancel"})
+                    if pre_button:
+                        etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_previous",'string':"Previous",'type':"object"})
+                    etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_next",'string':"Next",'type':"object"})
+                    if context.has_key('active') and context.has_key('edit'):
+                        etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
+                        context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec['page_no'] , 'transfer' : sur_name_read['transfer']})
+                        xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Add Page','icon': "gtk-new", 'type' :'object','name':"action_new_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Edit Page','icon': "gtk-edit", 'type' :'object','name':"action_edit_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Delete Page','icon': "gtk-delete", 'type' :'object','name':"action_delete_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Add Question','icon': "gtk-new", 'type' :'object','name':"action_new_question", 'context' : tools.ustr(context)})
+                    root = xml_form.getroottree()
+                    result['arch'] = etree.tostring(root)
+                    result['fields'] = fields
+                    result['context'] = context
+                else:
+                    if not context.has_key('active'):
+                        survey_obj.write(cr, uid, survey_id, {'tot_comp_survey' : sur_rec['tot_comp_survey'] + 1})
+                        if sur_rec['send_response']:
+                            user_obj = self.pool.get('res.users')
+                            survey_data = survey_obj.browse(cr, uid, int(survey_id))    
+                            response_id = surv_name_wiz.read(cr,uid,context['sur_name_id'])['response']
+                            context.update({'response_id':response_id})
+                            report = self.create_report(cr, uid, [int(survey_id)], 'report.survey.browse.response', survey_data.title,context)
+                            attachments = []
+                            file = open("/tmp/" + survey_data.title + ".pdf")
+                            file_data = ""
+                            while 1:
+                                line = file.readline()
+                                file_data += line
+                                if not line:
+                                    break
+                            attachments.append((survey_data.title + ".pdf",file_data))
+                            user_email = False
+                            resp_email = False
+                            if user_obj.browse(cr, uid, uid).address_id.id:
+                                cr.execute("select email from res_partner_address where id =%d" % user_obj.browse(cr, uid, uid).address_id.id)
+                                user_email = cr.fetchone()[0]
+                            resp_id = survey_data.responsible_id.address_id
+                            if resp_id:
+                                cr.execute("select email from res_partner_address where id =%d" % resp_id.id)
+                                resp_email = cr.fetchone()[0]
+                            if user_email and resp_email:
+                                mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_obj.browse(cr, uid, uid).name) + " Give Response Of " + survey_data.title + " Survey.\n\n Thanks," 
+                                tools.email_send(user_email, [resp_email], "Survey Response Of " + str(user_obj.browse(cr, uid, uid).name) , mail, attach = attachments)
+                        
+                    xml_form = etree.Element('form', {'string': _('Complete Survey Response')})
+                    etree.SubElement(xml_form, 'separator', {'string': 'Complete Survey', 'colspan': "4"})
+                    etree.SubElement(xml_form, 'label', {'string': 'Thanks for your response'})
+                    etree.SubElement(xml_form, 'newline')
+                    etree.SubElement(xml_form, 'button', {'icon': "gtk-go-forward", 'special':"cancel",'string':"OK",'colspan':"2"})
+                    root = xml_form.getroottree()
+                    result['arch'] = etree.tostring(root)
+                    result['fields'] = {}
+                    result['context'] = context
+        return result
+
+    def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
+        if not report_name or not res_ids:
+            return (False, Exception('Report name and Resources ids are required !!!'))
+        try:
+            ret_file_name = '/tmp/'+file_name+'.pdf'
+            service = netsvc.LocalService(report_name);
+            (result, format) = service.create(cr, uid, res_ids, {}, context)
+            fp = open(ret_file_name, 'wb+');
+            fp.write(result);
+            fp.close();
+        except Exception,e:
+            print 'Exception in create report:',e
+            return (False, str(e))
+        return (True, ret_file_name)
+
+    def default_get(self, cr, uid, fields_list, context=None):
+        value = {}
+        for field in fields_list:
+            if field.split('_')[0] == 'progress':
+                tot_page_id = self.pool.get('survey').browse(cr, uid, context['survey_id'])
+                tot_per = (float(100) * (int(field.split('_')[2]) + 1) / len(tot_page_id.page_ids))
+                value[field] = tot_per
+        if context.has_key('active') and context['active']:
+            return value
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        sur_name_read = surv_name_wiz.read(cr, uid, context['sur_name_id'])
+        ans_list = []
+        for key,val in sur_name_read['store_ans'].items():
+            for field in fields_list:
+                if field in list(val):
+                    value[field] = val[field]
+        return value
+
+    def create(self, cr, uid, vals, context=None):
+        if context.has_key('active') and context['active']:
+            return True
+        for key,val in vals.items():
+            if key.split('_')[0] == "progress":
+                vals.pop(key)
+                break
+        click_state = True
+        click_update = []
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        surv_all_resp_obj = self.pool.get('survey.response')
+        surv_tbl_column_obj = self.pool.get('survey.tbl.column.heading')
+        sur_name_read = surv_name_wiz.read(cr, uid, context['sur_name_id'])
+        response_id =  0
+        if not sur_name_read['response']:
+            response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context['survey_id']})
+            surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'response' : tools.ustr(response_id)})
+        else:
+            response_id = int(sur_name_read['response'])
+        for key,val in sur_name_read['store_ans'].items():
+            for field in vals:
+                if field.split('_')[0] == val['question_id']:
+                    click_state = False
+                    click_update.append(key)
+                    break
+        resp_obj = self.pool.get('survey.response.line')
+        res_ans_obj = self.pool.get('survey.response.answer')
+        que_obj = self.pool.get('survey.question')
+        if click_state:
+            que_li = []
+            resp_id_list = []
+            for key, val in vals.items():
+                que_id = key.split('_')[0]
+                if que_id not in que_li:
+                    que_li.append(que_id)
+                    que_rec = que_obj.read(cr, uid, [que_id], [])[0]
+                    resp_id = resp_obj.create(cr, uid, {'question_id':que_id, 'date_create':datetime.datetime.now(), \
+                         'state':'done','response_id' : response_id })
+                    resp_id_list.append(resp_id)
+                    sur_name_read['store_ans'].update({resp_id:{'question_id':que_id}})
+                    surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                    select_count = 0
+                    numeric_sum = 0
+                    selected_value = []
+                    matrix_list = []
+                    comment_field = False
+                    comment_value = False
+                    response_list = []
+                    for key1, val1 in vals.items():
+                        if val1 and key1.split('_')[1] == "table" and key1.split('_')[0] == que_id:
+                            surv_tbl_column_obj.create(cr, uid, {'response_table_id' : resp_id,'column_id':key1.split('_')[2], 'name':key1.split('_')[3], 'value' : val1})
+                            sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            select_count += 1
+                        elif val1 and key1.split('_')[1] == "otherfield" and key1.split('_')[0] == que_id:
+                            comment_field = True
+                            sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            select_count += 1
+                            surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                            continue
+                        elif val1 and key1.split('_')[1] == "selection" and key1.split('_')[0] == que_id:
+                            if len(key1.split('_')) > 2:
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[-1], 'answer' : val1})
+                                selected_value.append(val1)
+                                response_list.append(str(ans_create_id) + "_" + str(key1.split('_')[-1]))
+                            else:
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':val1})
+                            sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            select_count += 1
+                        elif key1.split('_')[1] == "other" and key1.split('_')[0] == que_id:
+                            if not val1:
+                                comment_value = True
+                            else:
+                                error = False
+                                if que_rec['comment_valid_type'] == 'must_be_specific_length':
+                                    if (not val1 and  que_rec['validation_minimum_no']) or len(val1) <  que_rec['validation_maximum_no'] or len(val1) > que_rec['comment_maximum_no']:
+                                        error = True
+                                elif que_rec['comment_valid_type'] in ['must_be_whole_number', 'must_be_decimal_number', 'must_be_date']:
+                                    error = False
+                                    try:
+                                        if que_rec['comment_valid_type'] == 'must_be_whole_number':
+                                            value = int(val1)
+                                            if value <  que_rec['validation_minimum_no'] or value > que_rec['validation_maximum_no']:
+                                                error = True
+                                        elif que_rec['comment_valid_type'] == 'must_be_decimal_number':
+                                            value = float(val1)
+                                            if value <  que_rec['comment_minimum_float'] or value > que_rec['comment_maximum_float']:
+                                                error = True
+                                        elif que_rec['comment_valid_type'] == 'must_be_date':
+                                            value = datetime.datetime.strptime(val1, "%Y-%m-%d")
+                                            if value <  datetime.datetime.strptime(que_rec['comment_minimum_date'], "%Y-%m-%d") or value >  datetime.datetime.strptime(que_rec['comment_maximum_date'], "%Y-%m-%d"):
+                                                error = True
+                                    except:
+                                        error = True
+                                elif que_rec['comment_valid_type'] == 'must_be_email_address':
+                                    import re
+                                    if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val1) == None:
+                                            error = True
+                                if error:
+                                    for res in resp_id_list:
+                                        sur_name_read['store_ans'].pop(res)
+                                    surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'response' :0})
+                                    raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['comment_valid_err_msg'])))
+                                resp_obj.write(cr, uid, resp_id, {'comment':val1})
+                                sur_name_read['store_ans'][resp_id].update({key1:val1})
+                        elif val1 and key1.split('_')[1] == "comment" and key1.split('_')[0] == que_id:
+                            resp_obj.write(cr, uid, resp_id, {'comment':val1})
+                            sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            select_count += 1
+                        elif val1 and key1.split('_')[0] == que_id and (key1.split('_')[1] == "single"  or (len(key1.split('_')) > 2 and key1.split('_')[2] == 'multi')):
+                            error = False
+                            if que_rec['validation_type'] == 'must_be_specific_length':
+                                if (not val1 and  que_rec['validation_minimum_no']) or len(val1) <  que_rec['validation_minimum_no'] or len(val1) > que_rec['validation_maximum_no']:
+                                    error = True
+                            elif que_rec['validation_type'] in ['must_be_whole_number', 'must_be_decimal_number', 'must_be_date']:
+                                error = False
+                                try:
+                                    if que_rec['validation_type'] == 'must_be_whole_number':
+                                        value = int(val1)
+                                        if value <  que_rec['validation_minimum_no'] or value > que_rec['validation_maximum_no']:
+                                            error = True
+                                    elif que_rec['validation_type'] == 'must_be_decimal_number':
+                                        value = float(val1)
+                                        if value <  que_rec['validation_minimum_float'] or value > que_rec['validation_maximum_float']:
+                                            error = True
+                                    elif que_rec['validation_type'] == 'must_be_date':
+                                        value = datetime.datetime.strptime(val1, "%Y-%m-%d")
+                                        if value <  datetime.datetime.strptime(que_rec['validation_minimum_date'], "%Y-%m-%d") or value >  datetime.datetime.strptime(que_rec['validation_maximum_date'], "%Y-%m-%d"):
+                                            error = True
+                                except:
+                                    error = True
+                            elif que_rec['validation_type'] == 'must_be_email_address':
+                                import re
+                                if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val1) == None:
+                                        error = True
+                            if error:
+                                for res in resp_id_list:
+                                    sur_name_read['store_ans'].pop(res)
+                                surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'response' :0})
+                                raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['validation_valid_err_msg'])))
+                            if key1.split('_')[1] == "single" :
+                                resp_obj.write(cr, uid, resp_id, {'single_text':val1})
+                            else:
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : val1})
+                            sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            select_count += 1
+                        elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) > 2 and key1.split('_')[2] == 'numeric':
+                            ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : val1})
+                            sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            select_count += 1
+                            numeric_sum += int(val1)
+                        elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) == 3:
+                            if type(val1) == type('') or type(val1) == type(u''):
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : key1.split('_')[2], 'value_choice' : val1})
+                                sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            else:
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : key1.split('_')[2]})
+                                sur_name_read['store_ans'][resp_id].update({key1:True})
+                            matrix_list.append(key1.split('_')[0] + '_' + key1.split('_')[1])
+                            select_count += 1
+                        elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) == 2:
+                            ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[-1], 'answer' : val1})
+                            sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            select_count += 1
+                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                    for key,val in vals.items():
+                        if val and key.split('_')[1] == "commentcolumn" and key.split('_')[0] == que_id:
+                            for res_id in response_list:
+                                if key.split('_')[2] in res_id.split('_')[1]:
+                                    a = res_ans_obj.write(cr, uid, [res_id.split('_')[0]], {'comment_field':val})
+                                    sur_name_read['store_ans'][resp_id].update({key:val})
+                    if comment_field and comment_value:
+                        for res in resp_id_list:
+                            sur_name_read['store_ans'].pop(res)
+                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'response' :0})
+                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question']  + "' " + tools.ustr(que_rec['make_comment_field_err_msg'])))
+                    if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
+                        for res in resp_id_list:
+                            sur_name_read['store_ans'].pop(res)
+                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'response' :0})
+                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "\n you cannot select same answer more than one times'"))
+                    if not select_count:
+                        resp_obj.write(cr, uid, resp_id, {'state':'skip'})
+                    if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
+                        for res in resp_id_list:
+                            sur_name_read['store_ans'].pop(res)
+                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'response' :0})
+                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
+                    if que_rec['type'] in ['multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['required_type']:
+                        if matrix_list:
+                            if (que_rec['required_type'] == 'all' and len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \
+                            (que_rec['required_type'] == 'at least' and len(list(set(matrix_list))) < que_rec['req_ans']) or \
+                            (que_rec['required_type'] == 'at most' and len(list(set(matrix_list))) > que_rec['req_ans']) or \
+                            (que_rec['required_type'] == 'exactly' and len(list(set(matrix_list))) != que_rec['req_ans']) or \
+                            (que_rec['required_type'] == 'a range' and (len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):
+                                for res in resp_id_list:
+                                    sur_name_read['store_ans'].pop(res)
+                                surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'response' :0})
+                                raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+                        elif (que_rec['required_type'] == 'all' and select_count < len(que_rec['answer_choice_ids'])) or \
+                            (que_rec['required_type'] == 'at least' and select_count < que_rec['req_ans']) or \
+                            (que_rec['required_type'] == 'at most' and select_count > que_rec['req_ans']) or \
+                            (que_rec['required_type'] == 'exactly' and select_count != que_rec['req_ans']) or \
+                            (que_rec['required_type'] == 'a range' and (select_count < que_rec['minimum_req_ans'] or select_count > que_rec['maximum_req_ans'])):
+                            for res in resp_id_list:
+                                sur_name_read['store_ans'].pop(res)
+                            surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'response' :0})
+                            raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+                    if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and  que_rec['is_require_answer'] and select_count <= 0:
+                        for res in resp_id_list:
+                            sur_name_read['store_ans'].pop(res)
+                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'response' :0})
+                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+        else:
+            resp_id_list = []
+            for update in click_update:
+                que_rec = que_obj.read(cr, uid , [sur_name_read['store_ans'][update]['question_id']], [])[0]
+                res_ans_obj.unlink(cr, uid,res_ans_obj.search(cr, uid, [('response_id', '=', update)]))
+                surv_tbl_column_obj.unlink(cr, uid,surv_tbl_column_obj.search(cr, uid, [('response_table_id', '=', update)]))
+                resp_id_list.append(update)
+                sur_name_read['store_ans'].update({update:{'question_id':sur_name_read['store_ans'][update]['question_id']}})
+                surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                select_count = 0
+                numeric_sum = 0
+                selected_value = []
+                matrix_list = []
+                comment_field = False
+                comment_value = False
+                response_list = []
+                for key, val in vals.items():
+                    ans_id_len = key.split('_')
+                    if ans_id_len[0] == sur_name_read['store_ans'][update]['question_id']:
+                        if val and key.split('_')[1] == "table":
+                            surv_tbl_column_obj.create(cr, uid, {'response_table_id' : update,'column_id':key.split('_')[2], 'name':key.split('_')[3], 'value' : val})
+                            sur_name_read['store_ans'][update].update({key:val})
+                            resp_obj.write(cr, uid, update, {'state': 'done'})
+                        elif val and key.split('_')[1] == "otherfield" :
+                            comment_field = True
+                            sur_name_read['store_ans'][update].update({key:val})
+                            select_count += 1
+                            surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                            continue
+                        elif val and key.split('_')[1] == "selection":
+                            if len(key.split('_')) > 2:
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':key.split('_')[-1], 'answer' : val})
+                                selected_value.append(val)
+                                response_list.append(str(ans_create_id) + "_" + str(key.split('_')[-1]))
+                            else:
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id': val})
+                            resp_obj.write(cr, uid, update, {'state': 'done'})
+                            sur_name_read['store_ans'][update].update({key:val})
+                            select_count += 1
+                        elif key.split('_')[1] == "other":
+                            if not val:
+                                comment_value = True
+                            else:
+                                error = False
+                                if que_rec['comment_valid_type'] == 'must_be_specific_length':
+                                    if (not val and  que_rec['comment_minimum_no']) or len(val) <  que_rec['comment_minimum_no'] or len(val) > que_rec['comment_maximum_no']:
+                                        error = True
+                                elif que_rec['comment_valid_type'] in ['must_be_whole_number', 'must_be_decimal_number', 'must_be_date']:
+                                    try:
+                                        if que_rec['comment_valid_type'] == 'must_be_whole_number':
+                                            value = int(val)
+                                            if value <  que_rec['comment_minimum_no'] or value > que_rec['comment_maximum_no']:
+                                                error = True
+                                        elif que_rec['comment_valid_type'] == 'must_be_decimal_number':
+                                            value = float(val)
+                                            if value <  que_rec['comment_minimum_float'] or value > que_rec['comment_maximum_float']:
+                                                error = True
+                                        elif que_rec['comment_valid_type'] == 'must_be_date':
+                                            value = datetime.datetime.strptime(val, "%Y-%m-%d")
+                                            if value <  datetime.datetime.strptime(que_rec['comment_minimum_date'], "%Y-%m-%d") or value >  datetime.datetime.strptime(que_rec['comment_maximum_date'], "%Y-%m-%d"):
+                                                error = True
+                                    except:
+                                        error = True
+                                elif que_rec['comment_valid_type'] == 'must_be_email_address':
+                                    import re
+                                    if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val) == None:
+                                            error = True
+                                if error:
+                                    raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['comment_valid_err_msg'])))
+                                resp_obj.write(cr, uid, update, {'comment':val,'state': 'done'})
+                                sur_name_read['store_ans'][update].update({key:val})
+                        elif val and key.split('_')[1] == "comment":
+                            resp_obj.write(cr, uid, update, {'comment':val,'state': 'done'})
+                            sur_name_read['store_ans'][update].update({key:val})
+                            select_count += 1
+                        elif val and (key.split('_')[1] == "single"  or (len(key.split('_')) > 2 and key.split('_')[2] == 'multi')):
+                            error = False
+                            if que_rec['validation_type'] == 'must_be_specific_length':
+                                if (not val and  que_rec['validation_minimum_no']) or len(val) <  que_rec['validation_minimum_no'] or len(val) > que_rec['validation_maximum_no']:
+                                    error = True
+                            elif que_rec['validation_type'] in ['must_be_whole_number', 'must_be_decimal_number', 'must_be_date']:
+                                error = False
+                                try:
+                                    if que_rec['validation_type'] == 'must_be_whole_number':
+                                        value = int(val)
+                                        if value <  que_rec['validation_minimum_no'] or value > que_rec['validation_maximum_no']:
+                                            error = True
+                                    elif que_rec['validation_type'] == 'must_be_decimal_number':
+                                        value = float(val)
+                                        if value <  que_rec['validation_minimum_float'] or value > que_rec['validation_maximum_float']:
+                                            error = True
+                                    elif que_rec['validation_type'] == 'must_be_date':
+                                        value = datetime.datetime.strptime(val, "%Y-%m-%d")
+                                        if value <  datetime.datetime.strptime(que_rec['validation_minimum_date'], "%Y-%m-%d") or value >  datetime.datetime.strptime(que_rec['validation_maximum_date'], "%Y-%m-%d"):
+                                            error = True
+                                except Exception ,e:
+                                    error = True
+                            elif que_rec['validation_type'] == 'must_be_email_address':
+                                import re
+                                if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val) == None:
+                                        error = True
+                            if error:
+                                raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['validation_valid_err_msg'])))
+                            if key.split('_')[1] == "single" :
+                                resp_obj.write(cr, uid, update, {'single_text':val,'state': 'done'})
+                            else:
+                                resp_obj.write(cr, uid, update, {'state': 'done'})
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'answer' : val})
+                            sur_name_read['store_ans'][update].update({key:val})
+                            select_count += 1
+                        elif val and len(key.split('_')) > 2 and key.split('_')[2] == 'numeric':
+                            resp_obj.write(cr, uid, update, {'state': 'done'})
+                            ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'answer' : val})
+                            sur_name_read['store_ans'][update].update({key:val})
+                            select_count += 1
+                            numeric_sum += int(val)
+                        elif val and len(key.split('_')) == 3:
+                            resp_obj.write(cr, uid, update, {'state': 'done'})
+                            if type(val) == type(''):
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'answer' : ans_id_len[2], 'value_choice' : val})
+                                sur_name_read['store_ans'][update].update({key:val})
+                            else:
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'answer' : ans_id_len[2]})
+                                sur_name_read['store_ans'][update].update({key:True})
+                            matrix_list.append(key.split('_')[0] + '_' + key.split('_')[1])
+                            select_count += 1
+                        elif val and len(key.split('_')) == 2:
+                            resp_obj.write(cr, uid, update, {'state': 'done'})
+                            ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[-1], 'answer' : val})
+                            sur_name_read['store_ans'][update].update({key:val})
+                            select_count += 1
+                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                for key,val in vals.items():
+                    if val and key.split('_')[1] == "commentcolumn" and key.split('_')[0] == sur_name_read['store_ans'][update]['question_id']:
+                        for res_id in response_list:
+                            if key.split('_')[2] in res_id.split('_')[1]:
+                                a = res_ans_obj.write(cr, uid, [res_id.split('_')[0]], {'comment_field':val})
+                                sur_name_read['store_ans'][update].update({key:val})
+                if comment_field and comment_value:
+                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question']  + "' " + tools.ustr(que_rec['make_comment_field_err_msg'])))
+                if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
+                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "\n you cannot select same answer more than one times'"))
+                if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
+                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
+                if not select_count:
+                    resp_obj.write(cr, uid, update, {'state': 'skip'})
+                if que_rec['type'] in ['multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['required_type']:
+                    if matrix_list:
+                        if (que_rec['required_type'] == 'all' and len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \
+                        (que_rec['required_type'] == 'at least' and len(list(set(matrix_list))) < que_rec['req_ans']) or \
+                        (que_rec['required_type'] == 'at most' and len(list(set(matrix_list))) > que_rec['req_ans']) or \
+                        (que_rec['required_type'] == 'exactly' and len(list(set(matrix_list))) != que_rec['req_ans']) or \
+                        (que_rec['required_type'] == 'a range' and (len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):
+                            raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+                    elif (que_rec['required_type'] == 'all' and select_count < len(que_rec['answer_choice_ids'])) or \
+                        (que_rec['required_type'] == 'at least' and select_count < que_rec['req_ans']) or \
+                        (que_rec['required_type'] == 'at most' and select_count > que_rec['req_ans']) or \
+                        (que_rec['required_type'] == 'exactly' and select_count != que_rec['req_ans']) or \
+                        (que_rec['required_type'] == 'a range' and (select_count < que_rec['minimum_req_ans'] or select_count > que_rec['maximum_req_ans'])):
+                            raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+                if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and  que_rec['is_require_answer'] and select_count <= 0:
+                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+        return True
+
+    def action_new_question(self,cr, uid, ids, context):
+        for key,val in context.items():
+            if type(key) == type(True):
+                context.pop(key)
+        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question'),('name','=','survey_question_wizard_test')])
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'view_id': view_id,
+                'context': context
+                }
+
+    def action_new_page(self, cr, uid, ids, context):
+        for key,val in context.items():
+            if type(key) == type(True):
+                context.pop(key)
+        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.page'),('name','=','survey_page_wizard_test')])
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.page',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'view_id': view_id,
+                'context': context
+                }
+
+    def action_edit_page(self,cr, uid, ids, context):
+        for key,val in context.items():
+            if type(key) == type(True):
+                context.pop(key)
+        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.page'),('name','=','survey_page_wizard_test')])
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.page',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'res_id' : int(context['page_id']),
+                'view_id': view_id,
+                'context': context
+                }
+
+    def action_delete_page(self,cr, uid, ids, context):
+        for key,val in context.items():
+            if type(key) == type(True):
+                context.pop(key)
+        self.pool.get('survey.page').unlink(cr, uid, [context['page_id']])
+        search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page_no' : context['page_number'] })
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question.wiz',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'search_view_id':search_id[0],
+                'context': context
+                }
+
+    def action_edit_question(self,cr, uid, ids, context):
+        for key,val in context.items():
+            if type(key) == type(True):
+                context.pop(key)
+        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question'),('name','=','survey_question_wizard_test')])
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'res_id' : int(context['question_id']),
+                'view_id': view_id,
+                'context': context
+                }
+
+    def action_delete_question(self,cr, uid, ids, context):
+        for key,val in context.items():
+            if type(key) == type(True):
+                context.pop(key)
+        que_obj = self.pool.get('survey.question')
+        que_obj.unlink(cr, uid, [context['question_id']])
+        search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page_no' : context['page_number'] })
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question.wiz',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'search_view_id':search_id[0],
+                'context': context
+                }
+
+    def action_next(self, cr, uid, ids, context=None):
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        search_obj = self.pool.get('ir.ui.view')
+        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page':'next'})
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question.wiz',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'search_view_id':search_id[0],
+                'context': context
+                }
+
+    def action_previous(self, cr, uid, ids, context=None):
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        search_obj = self.pool.get('ir.ui.view')
+        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page':'previous'})
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question.wiz',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'search_view_id':search_id[0],
+                'context': context
+                }
+
+survey_question_wiz()
+
+class res_users(osv.osv):
+    _inherit = "res.users"
+    _name = "res.users"
+    _columns = {
+        'survey_id': fields.many2many('survey', 'survey_users_rel', 'uid', 'sid', 'Groups'),
+    }
+
+res_users()
+
+class survey_request(osv.osv):
+    _name = "survey.request"
+    _order = 'date_deadline'
+    _rec_name = 'date_deadline'
+    _columns = {
+        'date_deadline' : fields.date("Deadline date"),
+        'user_id' : fields.many2one("res.users", "User"),
+        'email' : fields.char("E-mail", size=64),
+        'survey_id' : fields.many2one("survey", "Survey", required=1),
+        'answer_ids' : fields.one2many('survey.answer', 'question_id', 'Answer'),
+        'state' : fields.selection([('waiting_answer', 'Wating Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'State', readonly=1)
+    }
+    _defaults = {
+        'state' : lambda * a: 'waiting_answer',
+        'date_deadline' : lambda * a :  (now() + RelativeDateTime(months=+1)).strftime("%Y-%m-%d %H:%M:%S")
+    }
+    def survey_req_waiting_answer(self, cr, uid, ids, arg):
+        self.write(cr, uid, ids, { 'state' : 'waiting_answer'})
+        return True
+
+    def survey_req_done(self, cr, uid, ids, arg):
+        self.write(cr, uid, ids, { 'state' : 'done'})
+        return True
+
+    def survey_req_cancel(self, cr, uid, ids, arg):
+        self.write(cr, uid, ids, { 'state' : 'cancel'})
+        return True
+
+    def on_change_user(self, cr, uid, ids, user_id, context=None):
+        if user_id:
+            user_obj = self.pool.get('res.users')
+            user = user_obj.browse(cr, uid, user_id)
+            return {'value': {'email': user.address_id.email}}
+        return {}
+
+survey_request()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/survey_data.xml b/addons/survey/survey_data.xml
new file mode 100644
index 00000000000..e58448b3a81
--- /dev/null
+++ b/addons/survey/survey_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+   	    <record model="res.groups" id="group_survey_manager">
+        	<field name="name">Survey / Manager</field>
+   		</record>
+   	    <record model="res.groups" id="group_survey_user">
+        	<field name="name">Survey / User</field>
+   		</record>
+   	</data>
+</openerp>
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
new file mode 100644
index 00000000000..f540d30afec
--- /dev/null
+++ b/addons/survey/survey_demo.xml
@@ -0,0 +1,1933 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+    	<!--  Partner Feedback Demo data -->
+        <record model="survey" id="survey_partner_feedback">
+	        <field name="title">Open ERP Partner Feedback</field>
+	        <field name="user_id" ref="base.user_root"/>
+	        <field name="question_prefix">Que</field>
+	        <field name="max_response_limit">20</field>
+   		</record>
+
+        <record id="survey_page_who_are_you" model="survey.page">
+            <field name="title">Who are you?</field>
+            <field name="survey_id" ref="survey_partner_feedback" />
+            <field eval="1" name="sequence"/>
+        </record>
+
+        <record id="survey_question_company_name" model="survey.question">
+            <field name="question">What is your company's name?</field>
+            <field name="page_id" ref="survey_page_who_are_you" />
+            <field name="type">single_textbox</field>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field eval="1" name="sequence"/>
+        </record>
+
+        <record id="survey_question_company_size" model="survey.question">
+            <field name="question">What is your company's size?</field>
+            <field name="page_id" ref="survey_page_who_are_you" />
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field eval="2" name="sequence"/>
+        </record>
+
+        <record id="survey_question_company_size_1" model="survey.answer">
+            <field name="answer">1 - 10</field>
+            <field name="question_id" ref="survey_question_company_size" />
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_question_company_size_11" model="survey.answer">
+            <field name="answer">11 - 50</field>
+            <field name="question_id" ref="survey_question_company_size" />
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_question_company_size_51" model="survey.answer">
+            <field name="answer">51 - 100</field>
+            <field name="question_id" ref="survey_question_company_size" />
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_question_company_size_101" model="survey.answer">
+            <field name="answer">101 - 250</field>
+            <field name="question_id" ref="survey_question_company_size" />
+            <field name="sequence" eval="4"/>
+        </record>
+        <record id="survey_question_company_size_251" model="survey.answer">
+            <field name="answer">251 - 500</field>
+            <field name="question_id" ref="survey_question_company_size" />
+            <field name="sequence" eval="5"/>
+        </record>
+        <record id="survey_question_company_size_501" model="survey.answer">
+            <field name="answer">501 - 1000</field>
+            <field name="question_id" ref="survey_question_company_size" />
+            <field name="sequence" eval="6"/>
+        </record>
+        <record id="survey_question_company_size_1000" model="survey.answer">
+            <field name="answer">> 1000</field>
+            <field name="question_id" ref="survey_question_company_size" />
+            <field name="sequence" eval="7"/>
+        </record>
+        <record id="survey_question_company_size" model="survey.question">
+			<field eval="True" name="is_require_answer"/>
+        </record>
+
+        <record id="survey_question_located" model="survey.question">
+            <field name="question">Where are you located?</field>
+            <field name="page_id" ref="survey_page_who_are_you" />
+            <field name="type">multiple_choice_multiple_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_question_company_size_Europ" model="survey.answer">
+            <field name="answer">Europ</field>
+            <field name="question_id" ref="survey_question_located" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_question_company_size_North_America" model="survey.answer">
+            <field name="answer">North America</field>
+            <field name="question_id" ref="survey_question_located" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_question_company_size_Asia" model="survey.answer">
+            <field name="answer">Asia</field>
+            <field name="question_id" ref="survey_question_located" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_question_company_size_South_America" model="survey.answer">
+            <field name="answer">South America</field>
+            <field name="question_id" ref="survey_question_located" />
+            <field name="sequence" eval="4"/>
+        </record>
+        <record id="survey_question_company_size_Australia" model="survey.answer">
+            <field name="answer">Australia</field>
+            <field name="question_id" ref="survey_question_located" />
+            <field name="sequence" eval="5"/>
+        </record>
+       	<record id="survey_question_located" model="survey.question">
+            <field name="required_type">at least</field>
+            <field eval="1" name="req_ans"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+        </record>
+
+        <record id="survey_question_offical_partner" model="survey.question">
+            <field name="question">When did you become an OpenERP official partner?</field>
+            <field name="page_id" ref="survey_page_who_are_you" />
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field eval="4" name="sequence"/>
+        </record>
+        <record id="survey_question_company_size_2009" model="survey.answer">
+            <field name="answer">in 2009</field>
+            <field name="question_id" ref="survey_question_offical_partner" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_question_company_size_2008" model="survey.answer">
+            <field name="answer">in 2008</field>
+            <field name="question_id" ref="survey_question_offical_partner" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_question_company_size_2007" model="survey.answer">
+            <field name="answer">in 2007</field>
+            <field name="question_id" ref="survey_question_offical_partner" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_question_company_size_2006" model="survey.answer">
+            <field name="answer">in 2006</field>
+            <field name="question_id" ref="survey_question_offical_partner" />
+            <field name="sequence" eval="4"/>
+        </record>
+        <record id="survey_question_company_size_before_2006" model="survey.answer">
+            <field name="answer">before 2006</field>
+            <field name="question_id" ref="survey_question_offical_partner" />
+            <field name="sequence" eval="5"/>
+        </record>
+        <record id="survey_question_offical_partner" model="survey.question">
+			<field eval="True" name="is_require_answer"/>
+        </record>
+
+        <record id="survey_question_your_customers" model="survey.question">
+            <field name="question">What kind of solutions do you sell to your customers? </field>
+            <field name="page_id" ref="survey_page_who_are_you" />
+            <field name="type">multiple_choice_multiple_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field eval="5" name="sequence"/>
+        </record>
+        <record id="survey_answer_specific_devlopments" model="survey.answer">
+            <field name="answer">Integrations without specific developments</field>
+            <field name="question_id" ref="survey_question_your_customers" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_with_specific_devlopments" model="survey.answer">
+            <field name="answer">Integrations with specific developments</field>
+            <field name="question_id" ref="survey_question_your_customers" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_saas_services" model="survey.answer">
+            <field name="answer">Odoo Saas Offer</field>
+            <field name="question_id" ref="survey_question_your_customers" />
+            <field name="sequence" eval="3"/>
+        </record>
+
+
+        <record id="survey_page_Contracts" model="survey.page">
+            <field name="title">Contracts</field>
+            <field name="survey_id" ref="survey_partner_feedback" />
+            <field name="sequence" eval="2"/>
+        </record>
+
+        <record id="survey_question_partnership_contract" model="survey.question">
+            <field name="question">What do you think about the partnership contract?</field>
+            <field name="page_id" ref="survey_page_Contracts" />
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="survey_answer_Ambiguous" model="survey.answer">
+            <field name="answer">Ambiguous</field>
+            <field name="question_id" ref="survey_question_partnership_contract" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_enough" model="survey.answer">
+            <field name="answer">Not clear enough</field>
+            <field name="question_id" ref="survey_question_partnership_contract" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_Clear" model="survey.answer">
+            <field name="answer">Clear</field>
+            <field name="question_id" ref="survey_question_partnership_contract" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_answer_very_clear" model="survey.answer">
+            <field name="answer">Very Clear</field>
+            <field name="question_id" ref="survey_question_partnership_contract" />
+            <field name="sequence" eval="4"/>
+        </record>
+        <record id="survey_question_partnership_contract" model="survey.question">
+			<field eval="True" name="is_require_answer"/>
+        </record>
+
+        <record id="survey_question_contract_customers" model="survey.question">
+            <field name="question">When do you propose a maintenance contract to your customers?</field>
+            <field name="page_id" ref="survey_page_Contracts" />
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field name="comment_field_type">text</field>
+            <field name="comment_label">Why?</field>
+            <field name="in_visible_single_text">1</field>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_very_integration" model="survey.answer">
+            <field name="answer">With each integration</field>
+            <field name="question_id" ref="survey_question_contract_customers" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_sometimes" model="survey.answer">
+            <field name="answer">Sometimes</field>
+            <field name="question_id" ref="survey_question_contract_customers" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_never" model="survey.answer">
+            <field name="answer">Never... </field>
+            <field name="question_id" ref="survey_question_contract_customers" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_question_contract_customers" model="survey.question">
+			<field eval="True" name="is_require_answer"/>
+        </record>
+
+        <record id="survey_question_sell_to_your_customers" model="survey.question">
+            <field name="question">Which maintenance contract do you sell to your customers.</field>
+            <field name="page_id" ref="survey_page_Contracts" />
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_answer_maintenance_contract" model="survey.answer">
+            <field name="answer">OpenERP maintenance contract</field>
+            <field name="question_id" ref="survey_question_sell_to_your_customers" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_buy_an_openerp_one" model="survey.answer">
+            <field name="answer">Your own contract, but you buy an OpenERP one</field>
+            <field name="question_id" ref="survey_question_sell_to_your_customers" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_buying_an_openerp" model="survey.answer">
+            <field name="answer">Your own contract without buying an OpenERP one</field>
+            <field name="question_id" ref="survey_question_sell_to_your_customers" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_question_sell_to_your_customers" model="survey.question">
+			<field eval="True" name="is_require_answer"/>
+        </record>
+
+        <record id="survey_page_communication" model="survey.page">
+            <field name="title">Communication</field>
+            <field name="survey_id" ref="survey_partner_feedback" />
+            <field name="sequence" eval="3"/>
+        </record>
+
+        <record id="survey_question_launchpad_reporting" model="survey.question">
+            <field name="question">Give your opinion about Launchpad reporting :</field>
+            <field name="page_id" ref="survey_page_communication" />
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="survey_answer_find_openobject_website1" model="survey.answer">
+            <field name="answer">Is Launchpad easy to find in OpenObject website?</field>
+            <field name="question_id" ref="survey_question_launchpad_reporting" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_bug_or_blueprint" model="survey.answer">
+            <field name="answer">Is it easy to report a bug or a blueprint?</field>
+            <field name="question_id" ref="survey_question_launchpad_reporting" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_modify_a_translation" model="survey.answer">
+            <field name="answer">Is it easy to add or modify a translation?</field>
+            <field name="question_id" ref="survey_question_launchpad_reporting" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_column_not_at_all" model="survey.question.column.heading">
+            <field name="title">Not at all</field>
+            <field name="question_id" ref="survey_question_launchpad_reporting" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_No" model="survey.question.column.heading">
+            <field name="title">No</field>
+            <field name="question_id" ref="survey_question_launchpad_reporting" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_yes_but_could_better" model="survey.question.column.heading">
+            <field name="title">Yes, but could be better</field>
+            <field name="question_id" ref="survey_question_launchpad_reporting" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_Absolutely" model="survey.question.column.heading">
+            <field name="title">Absolutely</field>
+            <field name="question_id" ref="survey_question_launchpad_reporting" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+ 		<record id="survey_question_Leads" model="survey.question">
+            <field name="question">Leads</field>
+            <field name="page_id" ref="survey_page_communication" />
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+        </record>
+        <record id="survey_answer_find_openobject_website" model="survey.answer">
+            <field name="answer">Is Launchpad easy to find in OpenObject website?</field>
+            <field name="question_id" ref="survey_question_Leads" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_converted_in_customers" model="survey.answer">
+            <field name="answer">How are the leads that you find thanks to Tiny be converted in customers?</field>
+            <field name="question_id" ref="survey_question_Leads" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_column_need_new_leads" model="survey.question.column.heading">
+            <field name="title">I didn't try, I don't need new leads</field>
+            <field name="question_id" ref="survey_question_Leads" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_Hard" model="survey.question.column.heading">
+            <field name="title">Hard</field>
+            <field name="question_id" ref="survey_question_Leads" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_Difficult" model="survey.question.column.heading">
+            <field name="title">Difficult</field>
+            <field name="question_id" ref="survey_question_Leads" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_Easy" model="survey.question.column.heading">
+            <field name="title">Easy</field>
+            <field name="question_id" ref="survey_question_Leads" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_Very_Easy" model="survey.question.column.heading">
+            <field name="title">Very Easy</field>
+            <field name="question_id" ref="survey_question_Leads" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+
+        <record id="survey_question_partners_about" model="survey.question">
+            <field name="question">How is Tiny's communication with partners about...</field>
+            <field name="page_id" ref="survey_page_communication" />
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_answer_Maintenance_contracts" model="survey.answer">
+            <field name="answer">Maintenance contracts</field>
+            <field name="question_id" ref="survey_question_partners_about" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_partner_Leads" model="survey.answer">
+            <field name="answer">Leads</field>
+            <field name="question_id" ref="survey_question_partners_about" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_Training_sessions" model="survey.answer">
+            <field name="answer">Training sessions</field>
+            <field name="question_id" ref="survey_question_partners_about" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_column_very_bad" model="survey.question.column.heading">
+            <field name="title">Very Bad</field>
+            <field name="question_id" ref="survey_question_partners_about" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_Bad" model="survey.question.column.heading">
+            <field name="title">Bad</field>
+            <field name="question_id" ref="survey_question_partners_about" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_Good" model="survey.question.column.heading">
+            <field name="title">Good</field>
+            <field name="question_id" ref="survey_question_partners_about" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_Very_Good" model="survey.question.column.heading">
+            <field name="title">Very Good</field>
+            <field name="question_id" ref="survey_question_partners_about" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_question_partners_about" model="survey.question">
+            <field name="required_type">at least</field>
+            <field eval="1" name="req_ans"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+        </record>
+
+        <record id="survey_question_partners_on_which_subjects" model="survey.question">
+            <field name="question">In your opinion, how could Tiny better communicate with partners and on which subjects?</field>
+            <field name="page_id" ref="survey_page_communication" />
+            <field name="type">single_textbox</field>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field eval="4" name="sequence"/>
+        </record>
+
+    	<!--  Partner Feedback Demo data -->
+        <record model="survey" id="survey_odoo_feedback">
+	        <field name="title">Odoo Feedback</field>
+	        <field name="question_prefix">Que</field>
+	        <field name="user_id" ref="base.user_root"/>
+	        <field name="max_response_limit">20</field>
+   		</record>
+
+        <record id="survey_page_odoo_who_are_you" model="survey.page">
+            <field name="title">Who are you?</field>
+            <field name="survey_id" ref="survey_odoo_feedback" />
+            <field eval="1" name="sequence"/>
+        </record>
+
+        <record id="survey_question_odoo_company_name" model="survey.question">
+            <field name="question">What is your company's name?</field>
+            <field name="page_id" ref="survey_page_odoo_who_are_you" />
+            <field name="type">single_textbox</field>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="sequence" eval="1"/>
+        </record>
+
+        <record id="survey_question_odoo_company_sector" model="survey.question">
+            <field name="question">What is your company's sector?</field>
+            <field name="page_id" ref="survey_page_odoo_who_are_you" />
+            <field name="type">multiple_choice_multiple_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_question_Agriculture" model="survey.answer">
+            <field name="answer">Agriculture</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_question_Bank_Finance" model="survey.answer">
+            <field name="answer">Bank &amp; Finance</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_question_Engineering" model="survey.answer">
+            <field name="answer">Engineering</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_question_Chemical_Pharmaceutical" model="survey.answer">
+            <field name="answer">Chemical &amp; Pharmaceutical</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="4"/>
+        </record>
+        <record id="survey_question_HR" model="survey.answer">
+            <field name="answer">HR</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="5"/>
+        </record>
+        <record id="survey_question_Construction" model="survey.answer">
+            <field name="answer">Construction</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="6"/>
+        </record>
+        <record id="survey_question_Retail" model="survey.answer">
+            <field name="answer">Retail</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="7"/>
+        </record>
+        <record id="survey_question_Electronics" model="survey.answer">
+            <field name="answer">Electronics</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="8"/>
+        </record>
+        <record id="survey_question_Energy" model="survey.answer">
+            <field name="answer">Energy</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="9"/>
+        </record>
+        <record id="survey_question_Education" model="survey.answer">
+            <field name="answer">Education</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="10"/>
+        </record>
+        <record id="survey_question_Industry" model="survey.answer">
+            <field name="answer">Industry</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="11"/>
+        </record>
+        <record id="survey_question_Logistics" model="survey.answer">
+            <field name="answer">Logistics</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="12"/>
+        </record>
+        <record id="survey_question_Media_Entertainment" model="survey.answer">
+            <field name="answer">Media &amp; Entertainment</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="13"/>
+        </record>
+        <record id="survey_question_Public_Nonprofit" model="survey.answer">
+            <field name="answer">Public &amp; Nonprofit</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="14"/>
+        </record>
+        <record id="survey_question_Services" model="survey.answer">
+            <field name="answer">Services</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="15"/>
+        </record>
+        <record id="survey_question_Healthcare" model="survey.answer">
+            <field name="answer">Healthcare</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="16"/>
+        </record>
+        <record id="survey_question_Telecommunication" model="survey.answer">
+            <field name="answer">Telecommunication And ICT</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+           <field name="sequence" eval="17"/>
+        </record>
+        <record id="survey_question_Tourism_Catering" model="survey.answer">
+            <field name="answer">Tourism &amp; Catering</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="18"/>
+        </record>
+        <record id="survey_question_Other_sector" model="survey.answer">
+            <field name="answer">Other sector</field>
+            <field name="question_id" ref="survey_question_odoo_company_sector" />
+            <field name="sequence" eval="19"/>
+        </record>
+        <record id="survey_question_odoo_company_sector" model="survey.question">
+            <field name="required_type">at least</field>
+            <field eval="1" name="req_ans"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+         </record>
+
+         <record id="survey_question_odoo_mange_with_odoo" model="survey.question">
+            <field name="question">Which activities do you plan to manage with Odoo ?</field>
+            <field name="page_id" ref="survey_page_odoo_who_are_you" />
+            <field name="type">multiple_choice_multiple_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_question_Customer_Relationship_Management" model="survey.answer">
+            <field name="answer">Customer Relationship Management</field>
+            <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_question_Customer_Accounting_Finance" model="survey.answer">
+            <field name="answer">Accounting &amp; Finance</field>
+            <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_question_Customer_inventory_Management" model="survey.answer">
+            <field name="answer">Inventory Management</field>
+            <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_question_Customer_Manufacturing" model="survey.answer">
+            <field name="answer">Manufacturing</field>
+            <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
+            <field name="sequence" eval="4"/>
+        </record>
+        <record id="survey_question_Customer_Human_Resources" model="survey.answer">
+            <field name="answer">Human Resources</field>
+            <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
+            <field name="sequence" eval="5"/>
+        </record>
+        <record id="survey_question_Project_Management" model="survey.answer">
+            <field name="answer">Project Management</field>
+            <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
+            <field name="sequence" eval="6"/>
+        </record>
+        <record id="survey_question_Sales_Purchases" model="survey.answer">
+            <field name="answer">Sales &amp; Purchases</field>
+            <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
+            <field name="sequence" eval="7"/>
+        </record>
+        <record id="survey_question_Other_odoo_mange_with_odoo" model="survey.answer">
+            <field name="answer">Other</field>
+            <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
+            <field name="sequence" eval="8"/>
+        </record>
+        <record id="survey_question_odoo_mange_with_odoo" model="survey.question">
+            <field name="required_type">at least</field>
+            <field eval="1" name="req_ans"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+        </record>
+
+        <record id="survey_question_odoo_discover_odoo" model="survey.question">
+            <field name="question">How did you discover Odoo ?</field>
+            <field name="page_id" ref="survey_page_odoo_who_are_you" />
+            <field name="type">multiple_choice_multiple_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field name="sequence" eval="4"/>
+        </record>
+        <record id="survey_question_OpenERP_website" model="survey.answer">
+            <field name="answer">OpenERP website</field>
+            <field name="question_id" ref="survey_question_odoo_discover_odoo" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_question_Search_Engine" model="survey.answer">
+            <field name="answer">Search Engine</field>
+            <field name="question_id" ref="survey_question_odoo_discover_odoo" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_question_Word_of_mouth" model="survey.answer">
+            <field name="answer">Word of mouth</field>
+            <field name="question_id" ref="survey_question_odoo_discover_odoo" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_question_Trade_show" model="survey.answer">
+            <field name="answer">Trade show</field>
+            <field name="question_id" ref="survey_question_odoo_discover_odoo" />
+            <field name="sequence" eval="4"/>
+        </record>
+        <record id="survey_question_Press" model="survey.answer">
+            <field name="answer">Press</field>
+            <field name="question_id" ref="survey_question_odoo_discover_odoo" />
+            <field name="sequence" eval="5"/>
+        </record>
+        <record id="survey_question_Other" model="survey.answer">
+            <field name="answer">Other</field>
+            <field name="question_id" ref="survey_question_odoo_discover_odoo" />
+            <field name="sequence" eval="6"/>
+        </record>
+        <record id="survey_question_odoo_discover_odoo" model="survey.question">
+            <field name="required_type">at least</field>
+            <field eval="1" name="req_ans"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+        </record>
+
+        <record id="survey_page_odoo_Subscription_and_configuration" model="survey.page">
+            <field name="title">Subscription and configuration</field>
+            <field name="survey_id" ref="survey_odoo_feedback" />
+            <field name="sequence" eval="2"/>
+        </record>
+
+        <record id="survey_question_odoo_subscribe_to_odoo" model="survey.question">
+            <field name="question">Why did you subscribe to Odoo?</field>
+            <field name="page_id" ref="survey_page_odoo_Subscription_and_configuration" />
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_switch_to_online_offer1" model="survey.answer">
+            <field name="answer">I was already using OpenERP and wanted to switch to an online offer</field>
+            <field name="question_id" ref="survey_question_odoo_subscribe_to_odoo" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_maintaining_by_myself" model="survey.answer">
+            <field name="answer">It's easier and cheaper than maintaining by myself</field>
+            <field name="question_id" ref="survey_question_odoo_subscribe_to_odoo" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_saas_offr_my_customers" model="survey.answer">
+            <field name="answer">I am looking for a SaaS offer for my customers</field>
+            <field name="question_id" ref="survey_question_odoo_subscribe_to_odoo" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_answer_download_install_later_use" model="survey.answer">
+            <field name="answer">After having tested it, I plan to download and install it by myself for later use</field>
+            <field name="question_id" ref="survey_question_odoo_subscribe_to_odoo" />
+            <field name="sequence" eval="4"/>
+        </record>
+        <record id="survey_answer_tested_planto_use_it" model="survey.answer">
+            <field name="answer">After having tested it, I don't plan to use it</field>
+            <field name="question_id" ref="survey_question_odoo_subscribe_to_odoo" />
+            <field name="sequence" eval="5"/>
+        </record>
+
+        <record id="survey_question_odoo_configure_the_application" model="survey.question">
+            <field name="question">How much time did you spend to configure the application?</field>
+            <field name="page_id" ref="survey_page_odoo_Subscription_and_configuration" />
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_switch_to_online_offer" model="survey.answer">
+            <field name="answer">Creating users and access rights</field>
+            <field name="question_id" ref="survey_question_odoo_configure_the_application" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_adding_modules_need" model="survey.answer">
+            <field name="answer">Adding the modules I need</field>
+            <field name="question_id" ref="survey_question_odoo_configure_the_application" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_configuring_the_modules" model="survey.answer">
+            <field name="answer">Configuring the modules</field>
+            <field name="question_id" ref="survey_question_odoo_configure_the_application" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_answer_importing_my_data" model="survey.answer">
+            <field name="answer">Importing my data</field>
+            <field name="question_id" ref="survey_question_odoo_configure_the_application" />
+            <field name="sequence" eval="4"/>
+        </record>
+        <record id="survey_answer_initial_data" model="survey.answer">
+            <field name="answer">Creating the initial data</field>
+            <field name="question_id" ref="survey_question_odoo_configure_the_application" />
+            <field name="sequence" eval="5"/>
+        </record>
+        <record id="survey_column_i_didnot_try" model="survey.question.column.heading">
+            <field name="title">I didn't try</field>
+            <field name="question_id" ref="survey_question_odoo_configure_the_application" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_couple_of_weeks" model="survey.question.column.heading">
+            <field name="title">A couple of weeks</field>
+            <field name="question_id" ref="survey_question_odoo_configure_the_application" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_couple_of_days" model="survey.question.column.heading">
+            <field name="title">A couple of days</field>
+            <field name="question_id" ref="survey_question_odoo_configure_the_application" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_couple_of_hours" model="survey.question.column.heading">
+            <field name="title">A couple of hours</field>
+            <field name="question_id" ref="survey_question_odoo_configure_the_application" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_couple_of_minutes" model="survey.question.column.heading">
+            <field name="title">A couple of minutes</field>
+            <field name="question_id" ref="survey_question_odoo_configure_the_application" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+
+        <record id="survey_question_odoo_continue_using_odoo" model="survey.question">
+            <field name="question">Do you plan to continue using Odoo?</field>
+            <field name="page_id" ref="survey_page_odoo_Subscription_and_configuration" />
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field name="comment_field_type">text</field>
+            <field name="comment_label">No...Why?</field>
+            <field name="in_visible_single_text">1</field>
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_answer_yes" model="survey.answer">
+            <field name="answer">Yes</field>
+            <field name="question_id" ref="survey_question_odoo_continue_using_odoo" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_no" model="survey.answer">
+            <field name="answer">No</field>
+            <field name="question_id" ref="survey_question_odoo_continue_using_odoo" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_question_odoo_continue_using_odoo" model="survey.question">
+			<field eval="True" name="is_require_answer"/>
+        </record>
+
+        <record id="survey_page_odoo_using_odoo" model="survey.page">
+            <field name="title">Using Odoo</field>
+            <field name="survey_id" ref="survey_odoo_feedback" />
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="survey_question_odoo_would_you_prefer_use" model="survey.question">
+            <field name="question">Which interface would you prefer to use?</field>
+            <field name="page_id" ref="survey_page_odoo_using_odoo" />
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_web_interface" model="survey.answer">
+            <field name="answer">The web interface</field>
+            <field name="question_id" ref="survey_question_odoo_would_you_prefer_use" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_KDE_interface" model="survey.answer">
+            <field name="answer">The rich interface (GTK or KDE)</field>
+            <field name="question_id" ref="survey_question_odoo_would_you_prefer_use" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_both_interface" model="survey.answer">
+            <field name="answer">Both</field>
+            <field name="question_id" ref="survey_question_odoo_would_you_prefer_use" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_question_odoo_would_you_prefer_use" model="survey.question">
+			<field eval="True" name="is_require_answer"/>
+        </record>
+
+        <record id="survey_question_odoo_give_your_opinion" model="survey.question">
+            <field name="question">Give your opinion :</field>
+            <field name="page_id" ref="survey_page_odoo_using_odoo" />
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_appropriately_structured" model="survey.answer">
+            <field name="answer">Is Odoo Website appropriately structured?</field>
+            <field name="question_id" ref="survey_question_odoo_give_your_opinion" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_faq_clear_and_choicese" model="survey.answer">
+            <field name="answer">Are Odoo Website FAQ clear and concise?</field>
+            <field name="question_id" ref="survey_question_odoo_give_your_opinion" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_webclient_simple_and_useful" model="survey.answer">
+            <field name="answer">Is OpenERP Web Client simple and useful?</field>
+            <field name="question_id" ref="survey_question_odoo_give_your_opinion" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_answer_control_center_user_friendly" model="survey.answer">
+            <field name="answer">Is the Control Center user-friendly?</field>
+            <field name="question_id" ref="survey_question_odoo_give_your_opinion" />
+            <field name="sequence" eval="4"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_no_opinion" model="survey.question.column.heading">
+            <field name="title">No Opinion</field>
+            <field name="question_id" ref="survey_question_odoo_give_your_opinion" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_not_at_all" model="survey.question.column.heading">
+            <field name="title">Not at all</field>
+            <field name="question_id" ref="survey_question_odoo_give_your_opinion" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_not_enough" model="survey.question.column.heading">
+            <field name="title">Not enough</field>
+            <field name="question_id" ref="survey_question_odoo_give_your_opinion" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_yes_but_be_better" model="survey.question.column.heading">
+            <field name="title">Yes, but could be better</field>
+            <field name="question_id" ref="survey_question_odoo_give_your_opinion" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_Absolutely" model="survey.question.column.heading">
+            <field name="title">Absolutely</field>
+            <field name="question_id" ref="survey_question_odoo_give_your_opinion" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_question_odoo_give_your_opinion" model="survey.question">
+            <field name="required_type">at least</field>
+            <field eval="1" name="req_ans"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+        </record>
+
+        <record id="survey_question_odoo_you_think_about" model="survey.question">
+            <field name="question">What do you think about ... </field>
+            <field name="page_id" ref="survey_page_odoo_using_odoo" />
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_database_new_version" model="survey.answer">
+            <field name="answer">Migrating a database to a new version</field>
+            <field name="question_id" ref="survey_question_odoo_you_think_about" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_downloadin_your_backups" model="survey.answer">
+            <field name="answer">Browsing and downloading your backups</field>
+            <field name="question_id" ref="survey_question_odoo_you_think_about" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_duplicating_database" model="survey.answer">
+            <field name="answer">Duplicating a database</field>
+            <field name="question_id" ref="survey_question_odoo_you_think_about" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_answer_monthly_hours_statistics" model="survey.answer">
+            <field name="answer">Checking your monthly hours statistics</field>
+            <field name="question_id" ref="survey_question_odoo_you_think_about" />
+            <field name="sequence" eval="4"/>
+        </record>
+        <record id="survey_answer_support_ticket" model="survey.answer">
+            <field name="answer">Creating a support ticket</field>
+            <field name="question_id" ref="survey_question_odoo_you_think_about" />
+            <field name="sequence" eval="5"/>
+        </record>
+        <record id="survey_column_think_need_new_leads" model="survey.question.column.heading">
+            <field name="title">I didn't try</field>
+            <field name="question_id" ref="survey_question_odoo_you_think_about" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_think_Hard" model="survey.question.column.heading">
+            <field name="title">Hard</field>
+            <field name="question_id" ref="survey_question_odoo_you_think_about" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_think_Difficult" model="survey.question.column.heading">
+            <field name="title">Difficult</field>
+            <field name="question_id" ref="survey_question_odoo_you_think_about" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_think_Easy" model="survey.question.column.heading">
+            <field name="title">Easy</field>
+            <field name="question_id" ref="survey_question_odoo_you_think_about" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_Very_think_Easy" model="survey.question.column.heading">
+            <field name="title">Very Easy</field>
+            <field name="question_id" ref="survey_question_odoo_you_think_about" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_question_odoo_you_think_about" model="survey.question">
+            <field name="required_type">at least</field>
+            <field eval="1" name="req_ans"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+        </record>
+
+        <record id="survey_question_odoo_modules_are_missing_in_odoo" model="survey.question">
+            <field name="question">In your opinion, which modules are missing in Odoo? Give examples :</field>
+            <field name="page_id" ref="survey_page_odoo_using_odoo" />
+            <field name="type">single_textbox</field>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+            <field name="sequence" eval="2"/>
+        </record>
+
+
+        <record id="survey_page_odoo_the_offer" model="survey.page">
+            <field name="title">The offer</field>
+            <field name="survey_id" ref="survey_odoo_feedback" />
+            <field eval="4" name="sequence"/>
+        </record>
+
+        <record id="survey_question_odoo_would_you_prefer_receive_your_prepaid_bill" model="survey.question">
+            <field name="question">How often would you prefer to receive your prepaid bill?</field>
+            <field name="page_id" ref="survey_page_odoo_the_offer" />
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_Monthly" model="survey.answer">
+            <field name="answer">Monthly</field>
+            <field name="question_id" ref="survey_question_odoo_would_you_prefer_receive_your_prepaid_bill" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_annually_with_discount" model="survey.answer">
+            <field name="answer">Annually with 20% discount</field>
+            <field name="question_id" ref="survey_question_odoo_would_you_prefer_receive_your_prepaid_bill" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_with_25_discount" model="survey.answer">
+            <field name="answer">Every 2 years with 25% discount</field>
+            <field name="question_id" ref="survey_question_odoo_would_you_prefer_receive_your_prepaid_bill" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_question_odoo_would_you_prefer_receive_your_prepaid_bill" model="survey.question">
+			<field eval="True" name="is_require_answer"/>
+        </record>
+
+        <record id="survey_question_odoo_dms" model="survey.question">
+            <field name="question">Do you plan to use the document management system?</field>
+            <field name="page_id" ref="survey_page_odoo_the_offer" />
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field name="comment_field_type">text</field>
+            <field name="comment_label">Comment</field>
+            <field name="in_visible_single_text">1</field>
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_YES" model="survey.answer">
+            <field name="answer">Yes, I plan to use (GB)</field>
+            <field name="question_id" ref="survey_question_odoo_dms" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_No" model="survey.answer">
+            <field name="answer">No</field>
+            <field name="question_id" ref="survey_question_odoo_dms" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_question_odoo_dms" model="survey.question">
+			<field eval="True" name="is_require_answer"/>
+        </record>
+
+        <record id="survey_question_odoo_support_services" model="survey.question">
+            <field name="question">How satisfied are you with Odoo's support services :</field>
+            <field name="page_id" ref="survey_page_odoo_the_offer" />
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_answer_our_answer_is" model="survey.answer">
+            <field name="answer">The time between your question and our answer is</field>
+            <field name="question_id" ref="survey_question_odoo_support_services" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_pertinence_our_answer" model="survey.answer">
+            <field name="answer">The pertinence of our answers is</field>
+            <field name="question_id" ref="survey_question_odoo_support_services" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_column_offer_No_Opinion" model="survey.question.column.heading">
+            <field name="title">No Opinion</field>
+            <field name="question_id" ref="survey_question_odoo_support_services" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_offer_very_bad" model="survey.question.column.heading">
+            <field name="title">Very Bad</field>
+            <field name="question_id" ref="survey_question_odoo_support_services" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_offer_Bad" model="survey.question.column.heading">
+            <field name="title">Bad</field>
+            <field name="question_id" ref="survey_question_odoo_support_services" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_offer_Good" model="survey.question.column.heading">
+            <field name="title">Good</field>
+            <field name="question_id" ref="survey_question_odoo_support_services" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_offer_Very_Good" model="survey.question.column.heading">
+            <field name="title">Very Good</field>
+            <field name="question_id" ref="survey_question_odoo_support_services" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_question_odoo_support_services" model="survey.question">
+            <field name="required_type">at least</field>
+            <field eval="1" name="req_ans"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+        </record>
+
+        <record id="survey_question_offer_opinion_about_odoo" model="survey.question">
+            <field name="question">Give your opinion about Odoo's</field>
+            <field name="page_id" ref="survey_page_odoo_the_offer" />
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field name="in_visible_single_text">1</field>
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_pricing_criteria" model="survey.answer">
+            <field name="answer">Pricing criteria</field>
+            <field name="question_id" ref="survey_question_offer_opinion_about_odoo" />
+            <field name="sequence" eval="1"/>
+        </record>
+        <record id="survey_answer_pricing_understanding" model="survey.answer">
+            <field name="answer">Pricing understanding</field>
+            <field name="question_id" ref="survey_question_offer_opinion_about_odoo" />
+            <field name="sequence" eval="2"/>
+        </record>
+        <record id="survey_answer_pricing_available_modules" model="survey.answer">
+            <field name="answer">Range of available modules</field>
+            <field name="question_id" ref="survey_question_offer_opinion_about_odoo" />
+            <field name="sequence" eval="3"/>
+        </record>
+        <record id="survey_column_pricing_No_Opinion" model="survey.question.column.heading">
+            <field name="title">No Opinion</field>
+            <field name="question_id" ref="survey_question_offer_opinion_about_odoo" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_pricing_very_bad" model="survey.question.column.heading">
+            <field name="title">Very Bad</field>
+            <field name="question_id" ref="survey_question_offer_opinion_about_odoo" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_pricing_Bad" model="survey.question.column.heading">
+            <field name="title">Bad</field>
+            <field name="question_id" ref="survey_question_offer_opinion_about_odoo" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_pricing_Good" model="survey.question.column.heading">
+            <field name="title">Good</field>
+            <field name="question_id" ref="survey_question_offer_opinion_about_odoo" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_column_pricing_Very_Good" model="survey.question.column.heading">
+            <field name="title">Very Good</field>
+            <field name="question_id" ref="survey_question_offer_opinion_about_odoo" />
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+        </record>
+        <record id="survey_question_offer_opinion_about_odoo" model="survey.question">
+            <field name="required_type">at least</field>
+            <field eval="1" name="req_ans"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+        </record>
+
+        <record id="survey_question_offer_comments_them_here" model="survey.question">
+            <field name="question">If you have any additional comments, write them here :</field>
+            <field name="page_id" ref="survey_page_odoo_the_offer" />
+            <field name="type">comment</field>
+            <field name="in_visible_single_text">1</field>
+            <field name="sequence" eval="2"/>
+        </record>
+     </data>
+   	 <data>
+		<record id="survey_0" model="survey">
+			<field eval="&quot;&quot;&quot;OpenERP Feedback&quot;&quot;&quot;" name="title"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field name="question_prefix">Que</field>
+	        <field name="max_response_limit">20</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_page_0" model="survey.page">
+			<field eval="&quot;&quot;&quot;About your OpenERP usage&quot;&quot;&quot;" name="title"/>
+			<field name="survey_id" ref="survey_0"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_page_1" model="survey.page">
+			<field eval="&quot;&quot;&quot;These questions relates to the ergonomy and ease of use of OpenERP. Try to remind your firsts days on OpenERP and what have been your difficulties.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Ergonomy and ease of use - 1&quot;&quot;&quot;" name="title"/>
+			<field name="survey_id" ref="survey_0"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+<!--	<data>-->
+<!--		<record id="survey_page_2" model="survey.page">-->
+<!--			<field eval="&quot;&quot;&quot;Ergonomy and ease of use - 2&quot;&quot;&quot;" name="title"/>-->
+<!--			<field name="survey_id" ref="survey_0"/>-->
+<!--			<field eval="3" name="sequence"/>-->
+<!--		</record>-->
+<!--	</data>-->
+<!--	<data>-->
+<!--		<record id="survey_page_3" model="survey.page">-->
+<!--			<field eval="&quot;&quot;&quot;Ergonomy and ease of use - 3&quot;&quot;&quot;" name="title"/>-->
+<!--			<field name="survey_id" ref="survey_0"/>-->
+<!--			<field eval="4" name="sequence"/>-->
+<!--		</record>-->
+<!--	</data>-->
+	<data>
+		<record id="survey_page_4" model="survey.page">
+			<field eval="&quot;&quot;&quot;Ergonomy of the clients&quot;&quot;&quot;" name="title"/>
+			<field name="survey_id" ref="survey_0"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_page_5" model="survey.page">
+			<field eval="&quot;&quot;&quot;Features&quot;&quot;&quot;" name="title"/>
+			<field name="survey_id" ref="survey_0"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_page_6" model="survey.page">
+			<field eval="&quot;&quot;&quot;Community and contributors&quot;&quot;&quot;" name="title"/>
+			<field name="survey_id" ref="survey_0"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_page_7" model="survey.page">
+			<field eval="&quot;&quot;&quot;If you do not contribute and develop in OpenERP, skip this page.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Questions for developers&quot;&quot;&quot;" name="title"/>
+			<field name="survey_id" ref="survey_0"/>
+			<field eval="6" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_0" model="survey.question">
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+			<field eval="1" name="sequence"/>
+			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+			<field eval="&quot;&quot;&quot;What do you think about the documentation available on doc.openerp.com ?&quot;&quot;&quot;" name="question"/>
+			<field eval="0" name="is_require_answer"/>
+			<field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+			<field name="page_id" ref="survey_page_1"/>
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+			<field eval="0" name="allow_comment"/>
+            <field name="in_visible_single_text">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_1" model="survey.question">
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+			<field eval="2" name="sequence"/>
+			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+			<field eval="&quot;&quot;&quot;What do you think about the process views of OpenERP, available in the web client ?&quot;&quot;&quot;" name="question"/>
+			<field eval="0" name="is_require_answer"/>
+			<field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+			<field name="page_id" ref="survey_page_1"/>
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+			<field eval="0" name="allow_comment"/>
+            <field name="in_visible_single_text">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_2" model="survey.question">
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+			<field eval="1" name="sequence"/>
+			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+			<field eval="&quot;&quot;&quot;Are you using OpenERP on a daily basis ?&quot;&quot;&quot;" name="question"/>
+			<field eval="0" name="is_require_answer"/>
+			<field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+			<field name="page_id" ref="survey_page_0"/>
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+			<field eval="0" name="allow_comment"/>
+            <field name="in_visible_single_text">1</field>
+		</record>
+	</data>
+
+	<data>
+		<record id="survey_question_3" model="survey.question">
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+			<field eval="3" name="sequence"/>
+			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+			<field eval="&quot;&quot;&quot;Do you have suggestions on how to improve the process view ?&quot;&quot;&quot;" name="question"/>
+			<field eval="0" name="is_require_answer"/>
+			<field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+			<field name="page_id" ref="survey_page_1"/>
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+			<field eval="0" name="allow_comment"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_4" model="survey.question">
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+			<field eval="4" name="sequence"/>
+			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+			<field eval="&quot;&quot;&quot;What do you think about the structure of the menus (multiple answers allowed) ?&quot;&quot;&quot;" name="question"/>
+			<field eval="0" name="is_require_answer"/>
+			<field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+			<field name="page_id" ref="survey_page_1"/>
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+			<field eval="0" name="allow_comment"/>
+            <field name="in_visible_single_text">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_5" model="survey.question">
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+			<field eval="2" name="sequence"/>
+			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+			<field eval="&quot;&quot;&quot;If yes, which interface are you using ?&quot;&quot;&quot;" name="question"/>
+			<field eval="0" name="is_require_answer"/>
+			<field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+			<field name="page_id" ref="survey_page_0"/>
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+			<field eval="0" name="allow_comment"/>
+            <field name="in_visible_single_text">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_6" model="survey.question">
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+			<field eval="3" name="sequence"/>
+			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+			<field eval="&quot;&quot;&quot;Which modules are you using/testing?&quot;&quot;&quot;" name="question"/>
+			<field eval="0" name="is_require_answer"/>
+			<field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+			<field name="page_id" ref="survey_page_0"/>
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+			<field eval="0" name="allow_comment"/>
+            <field name="in_visible_single_text">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_7" model="survey.question">
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+			<field eval="1" name="sequence"/>
+			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+			<field eval="&quot;&quot;&quot;How do you develop your new features ?&quot;&quot;&quot;" name="question"/>
+			<field eval="0" name="is_require_answer"/>
+			<field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+			<field name="page_id" ref="survey_page_7"/>
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+			<field eval="0" name="allow_comment"/>
+            <field name="in_visible_single_text">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_8" model="survey.question">
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+			<field eval="1" name="sequence"/>
+			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+			<field eval="&quot;&quot;&quot;How do you contribute or plan to contribute to OpenERP ?&quot;&quot;&quot;" name="question"/>
+			<field eval="0" name="is_require_answer"/>
+			<field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+			<field name="page_id" ref="survey_page_6"/>
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+			<field eval="0" name="allow_comment"/>
+            <field name="in_visible_single_text">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_9" model="survey.question">
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+			<field eval="5" name="sequence"/>
+			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+			<field eval="&quot;&quot;&quot;What do you think about the groups of users?&quot;&quot;&quot;" name="question"/>
+			<field eval="0" name="is_require_answer"/>
+			<field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+			<field name="page_id" ref="survey_page_1"/>
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+			<field eval="0" name="allow_comment"/>
+            <field name="in_visible_single_text">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_10" model="survey.question">
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+			<field eval="2" name="sequence"/>
+			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+			<field eval="&quot;&quot;&quot;Do you have a proposition to help people to contribute ?&quot;&quot;&quot;" name="question"/>
+			<field eval="0" name="is_require_answer"/>
+			<field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+			<field name="page_id" ref="survey_page_6"/>
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+			<field eval="0" name="allow_comment"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_11" model="survey.question">
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+			<field eval="3" name="sequence"/>
+			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+			<field eval="&quot;&quot;&quot;Do you have a proposition to attract new contributors ?&quot;&quot;&quot;" name="question"/>
+			<field eval="0" name="is_require_answer"/>
+			<field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+			<field name="page_id" ref="survey_page_6"/>
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+			<field eval="0" name="allow_comment"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_12" model="survey.question">
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+			<field eval="6" name="sequence"/>
+			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+			<field eval="&quot;&quot;&quot;About the groups of users installed by default&quot;&quot;&quot;" name="question"/>
+			<field eval="0" name="is_require_answer"/>
+			<field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+			<field name="page_id" ref="survey_page_1"/>
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+			<field eval="0" name="allow_comment"/>
+            <field name="in_visible_single_text">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_13" model="survey.question">
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+			<field eval="7" name="sequence"/>
+			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+			<field eval="0" name="rating_allow_one_column_require"/>
+			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+			<field eval="&quot;&quot;&quot;What do you think about configuration wizards?&quot;&quot;&quot;" name="question"/>
+			<field eval="0" name="is_require_answer"/>
+			<field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
+			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+			<field name="page_id" ref="survey_page_1"/>
+			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+			<field eval="0" name="allow_comment"/>
+            <field name="in_visible_single_text">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_0" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_0"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_1" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_0"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_2" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_0"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_3" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_0"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_4" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_1"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_5" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_1"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_6" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_1"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_7" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_1"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_8" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Totally Disagree	&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_9"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_9" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_9"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_10" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_9"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_11" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_9"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_12" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_13"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_13" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_13"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_14" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_13"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_question_column_heading_15" model="survey.question.column.heading">
+			<field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
+			<field name="question_id" ref="survey_question_13"/>
+            <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_0" model="survey.answer">
+			<field eval="&quot;&quot;&quot;I participate to discussion and forums&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_8"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_1" model="survey.answer">
+			<field eval="&quot;&quot;&quot;I'd like to contribute but I don't know how ?&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_8"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_2" model="survey.answer">
+			<field eval="&quot;&quot;&quot;There is too many groups defined, security is too complex to set&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_12"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_3" model="survey.answer">
+			<field eval="&quot;&quot;&quot;There is too few groups defined, security isn't accurate enough&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_12"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_4" model="survey.answer">
+			<field eval="&quot;&quot;&quot;The number of groups is good&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_12"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_5" model="survey.answer">
+			<field eval="&quot;&quot;&quot;The GTK client&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_5"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_6" model="survey.answer">
+			<field eval="&quot;&quot;&quot;The web interface&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_5"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_7" model="survey.answer">
+			<field eval="&quot;&quot;&quot;The KDE client&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_5"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_8" model="survey.answer">
+			<field eval="&quot;&quot;&quot;At least two of them&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_5"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_9" model="survey.answer">
+			<field eval="&quot;&quot;&quot;Yes, I use a version &lt; 5.0&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_2"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_10" model="survey.answer">
+			<field eval="&quot;&quot;&quot;Yes, I use the 5.0 version, installed locally&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_2"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_11" model="survey.answer">
+			<field eval="&quot;&quot;&quot;Yes, I use the latest version on Odoo&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_2"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_12" model="survey.answer">
+			<field eval="&quot;&quot;&quot;No, I just tested it&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_2"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_13" model="survey.answer">
+			<field eval="&quot;&quot;&quot;Sales Management&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_6"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_14" model="survey.answer">
+			<field eval="&quot;&quot;&quot;Purchases Management&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_6"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_15" model="survey.answer">
+			<field eval="&quot;&quot;&quot;Financial Management&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_6"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_16" model="survey.answer">
+			<field eval="&quot;&quot;&quot;CRM / SRM&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_6"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_17" model="survey.answer">
+			<field eval="&quot;&quot;&quot;Project Management&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_6"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_18" model="survey.answer">
+			<field eval="&quot;&quot;&quot;Human Ressources&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_6"/>
+			<field eval="6" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_19" model="survey.answer">
+			<field eval="&quot;&quot;&quot;Descriptions and help tooltips are clear enough&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_13"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_20" model="survey.answer">
+			<field eval="&quot;&quot;&quot;Configuration wizard exists for each important setting&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_13"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_21" model="survey.answer">
+			<field eval="&quot;&quot;&quot;Extra modules proposed are relevant&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_13"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_22" model="survey.answer">
+			<field eval="&quot;&quot;&quot;The current menu structure is good&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_23" model="survey.answer">
+			<field eval="&quot;&quot;&quot;It can be improved&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_24" model="survey.answer">
+			<field eval="&quot;&quot;&quot;They are too much menus, it's complex to understand&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_4"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_25" model="survey.answer">
+			<field eval="&quot;&quot;&quot;I develop new features&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_8"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_26" model="survey.answer">
+			<field eval="&quot;&quot;&quot;I help to translate&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_8"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_27" model="survey.answer">
+			<field eval="&quot;&quot;&quot;I write documentations&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_8"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_28" model="survey.answer">
+			<field eval="&quot;&quot;&quot;Running the configuration wizards is a good way to spare time&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_13"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_29" model="survey.answer">
+			<field eval="&quot;&quot;&quot;I use Launchpad, like all official OpenERP projects&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_7"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_30" model="survey.answer">
+			<field eval="&quot;&quot;&quot;The security rules defined on groups are helpfull&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_9"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_31" model="survey.answer">
+			<field eval="&quot;&quot;&quot;They are covering all objects&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_9"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_32" model="survey.answer">
+			<field eval="&quot;&quot;&quot;Those security rules are standard and can be used out-of-the-box in most cases&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_9"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_33" model="survey.answer">
+			<field eval="&quot;&quot;&quot;The 'Usability/Extended View' group helps in daily work&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_9"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_34" model="survey.answer">
+			<field eval="&quot;&quot;&quot;The 'Usability/Extended View' group hides only optional fields&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_9"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_35" model="survey.answer">
+			<field eval="&quot;&quot;&quot;The groups set on menu items are relevant&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_9"/>
+			<field eval="6" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_36" model="survey.answer">
+			<field eval="&quot;&quot;&quot;It is up-to-date&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_0"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_37" model="survey.answer">
+			<field eval="&quot;&quot;&quot;It helps in the beginning&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_0"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_38" model="survey.answer">
+			<field eval="&quot;&quot;&quot;I use the contextual help in OpenERP&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_0"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_39" model="survey.answer">
+			<field eval="&quot;&quot;&quot;It is complete&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_0"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_40" model="survey.answer">
+			<field eval="&quot;&quot;&quot;It is clear&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_0"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_41" model="survey.answer">
+			<field eval="&quot;&quot;&quot;They help new users to understand OpenERP&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_1"/>
+			<field eval="1" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_42" model="survey.answer">
+			<field eval="&quot;&quot;&quot;They are clean and correct&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_1"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_43" model="survey.answer">
+			<field eval="&quot;&quot;&quot;They are useful on a daily usage&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_1"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_44" model="survey.answer">
+			<field eval="&quot;&quot;&quot;A process is defined for all enterprise flows&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_1"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_45" model="survey.answer">
+			<field eval="&quot;&quot;&quot;It's easy to find the process you need&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_1"/>
+			<field eval="5" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_46" model="survey.answer">
+			<field eval="&quot;&quot;&quot;I use another repository system (sourceforge, ...)&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_7"/>
+			<field eval="2" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_47" model="survey.answer">
+			<field eval="&quot;&quot;&quot;I host on my own website&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_7"/>
+			<field eval="3" name="sequence"/>
+		</record>
+	</data>
+	<data>
+		<record id="survey_answer_48" model="survey.answer">
+			<field eval="&quot;&quot;&quot;I don't publish my developments&quot;&quot;&quot;" name="answer"/>
+			<field name="question_id" ref="survey_question_7"/>
+			<field eval="4" name="sequence"/>
+		</record>
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/survey/survey_que_wizard.xml b/addons/survey/survey_que_wizard.xml
new file mode 100644
index 00000000000..e9b313775e6
--- /dev/null
+++ b/addons/survey/survey_que_wizard.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+		<!--
+			Survey Question Wizard 
+		 -->
+		 
+		<record id="view_survey_question_message" model="ir.ui.view">
+			<field name="name">Survey Question</field>
+			<field name="model">survey.question.wiz</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Your Messages">
+					<field name="name" nolabel="1" colspan="4" />
+				</form>
+			</field>
+		</record>
+
+		<record id="view_survey_question_message1" model="ir.ui.view">
+			<field name="name">Survey Search</field>
+			<field name="model">survey.question.wiz</field>
+			<field name="type">search</field>
+			<field name="arch" type="xml">
+				<search string="Your Messages">
+					<field name="name" nolabel="1" colspan="4" />
+				</search>
+			</field>
+		</record>
+
+		<record id="action_view_survey_question_message"
+			model="ir.actions.act_window">
+			<field name="name">Survey Question</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">survey.question.wiz</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="target">new</field>
+		</record>
+
+		<!--
+			Display Survey List 
+		 -->
+		 
+		<record id="view_survey_name" model="ir.ui.view">
+			<field name="name">Survey</field>
+			<field name="model">survey.name.wiz</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Survey">
+					<separator colspan="4" string="Select Survey" />
+					<newline />
+					<field name="survey_id" colspan="4"
+						on_change="on_change_survey(survey_id)" width="250"/>
+					<group col="1" colspan="4"
+						attrs="{'readonly': [('survey_id','=',False)]}">
+						<separator colspan="4" string="Survey Details" />
+						<field name="note" colspan="4" nolabel="1" readonly="1"/>
+						<newline />
+					</group>
+					<separator colspan="4" />
+					<label align="0.0" colspan="2" string="" />
+					<button colspan="1" icon="gtk-cancel"
+						special="cancel" string="Cancel"/>
+					<button colspan="1" icon="gtk-go-forward"
+						name="action_next" string="Start" type="object"/>
+				</form>
+			</field>
+		</record>
+
+		<record id="action_view_survey_name"
+			model="ir.actions.act_window">
+			<field name="name">Give Survey Response</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">survey.name.wiz</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/survey/survey_report.xml b/addons/survey/survey_report.xml
new file mode 100644
index 00000000000..e7a483018e8
--- /dev/null
+++ b/addons/survey/survey_report.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+
+		<report auto="False"
+				id="report_survey_form"
+				model="survey"
+				name="survey.form"
+				menu="False"
+				string="Survey Form"/>
+
+		<report auto="True" id="survey_analysis" model="survey"
+			name="survey.analysis"
+			rml=""
+			string="Survey Analysis Report"/>
+
+		<report auto="True" id="survey_browse_response" model="survey"
+			name="survey.browse.response"
+			rml=""
+			string="Browse Response"/>
+
+	</data>
+</openerp>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
new file mode 100644
index 00000000000..40d8b695136
--- /dev/null
+++ b/addons/survey/survey_view.xml
@@ -0,0 +1,1029 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+<!--        <menuitem name="Survey Management" id="main_menu_survey"
+            icon="terp-crm" sequence="1"
+            groups="group_survey_manager,group_survey_user"/>-->
+    <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
+	<menuitem name="Survey" id="main_menu_survey"
+            icon="terp-crm" sequence="3"
+            groups="group_survey_manager,group_survey_user" parent="base.menu_tools" />
+<!--        <menuitem name="Configuration" id="menu_survey_config"
+            parent="main_menu_survey" groups="group_survey_manager"/>-->
+	<menuitem name="Configuration" parent="base.menu_tools"
+         id="base.menu_lunch_survey_root" groups="group_survey_manager" sequence="6"/>
+    <menuitem name="survey" id="menu_survey_config"
+        parent="base.menu_lunch_survey_root" groups="group_survey_manager" sequence="2"/>
+        <!--
+            Survey
+        -->
+        <record model="ir.ui.view" id="survey_form">
+            <field name="name">survey_form</field>
+            <field name="model">survey</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey">
+                    <field name="title" select="1"/>
+                    <field name="responsible_id"/>
+                    <notebook colspan="4">
+                        <page string="Survey">
+                            <field name="page_ids" colspan="4" nolabel="1" mode="form,tree" context="{'line_order': page_ids}">
+                                <form string="Survey Page">
+                                    <field name="title" select="1"/>
+                                    <field name="sequence"/>
+                                    <field name="note" colspan="4" nolabel="1"/>
+                                    <field name="question_ids" colspan="4" nolabel="1" context="{'line_order': question_ids}">
+                                        <form string="Survey Question">
+                                            <field name="question" colspan="4" select="1"/>
+                                            <field name="sequence"/>
+                                            <field name="tot_resp" select="2"/>
+                                            <field name="type" on_change="on_change_type(type)"/>
+						                    <field name="in_visible_rating_weight" invisible="1"/>
+						                    <field name="in_visible_menu_choice" invisible="1"/>
+                                            <notebook colspan="4">
+						                        <page string="Answer" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+												   <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+							                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}"/>
+							                       </group>
+							                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+							                           <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+														<group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+														   <field name="no_of_rows"/>
+														</group>
+							                       </group>
+						                        </page>
+                                                <page string="Comment Field" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+                                                    <group>
+	                                                    <field name="comment_field_type"/>
+	                                                    <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+	                                                        <field name="comment_label"/>
+	                                                    </group>
+													</group>
+                                                    <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                        <field name="comment_valid_type" colspan="2"/>
+                                                        <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                            <field name="comment_minimum_no" string="Between"/>
+                                                            <field name="comment_maximum_no" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                            <field name="comment_minimum_float" string="Between"/>
+                                                            <field name="comment_maximum_float" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                            <field name="comment_minimum_date" string="Between"/>
+                                                            <field name="comment_maximum_date" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                            <separator string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                            <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                        </group>
+                                                    </group>
+                                                    <!-- group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans')]}">
+                                                        <group colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                            <field name="make_comment_field"/>
+                                                            <group colspan="4" attrs="{'invisible':[('make_comment_field','!=',True)]}">
+                                                                <separator string="When the comment field is left blank, display this error message:" colspan="4"/>
+                                                                <field name="make_comment_field_err_msg" nolabel="1"/>
+                                                            </group>
+                                                        </group>
+                                                    </group-->
+						                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+							                            <field name="comment_column"/>
+							                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+							                                <field name="column_name" colspan="2"/>
+							                            </group>
+													</group>
+                                                </page>
+                                                <page string="Validation" attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                                    <group col="6" colspan="4">
+                                                        <field name="validation_type" colspan="2"/>
+                                                        <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                                            <field name="validation_minimum_no" string="Between"/>
+                                                            <field name="validation_maximum_no" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                                            <field name="validation_minimum_float" string="Between"/>
+                                                            <field name="validation_maximum_float" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                                            <field name="validation_minimum_date" string="Between"/>
+                                                            <field name="validation_maximum_date" string="and"/>
+                                                        </group>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                                        <separator string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                        <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+                                                    </group>
+                                                </page>
+                       	                        <page string="Required Answer" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment')]}">
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'),('type','!=','single_textbox'),('type','!=','comment')]}">
+                                                        <field name="is_require_answer"/>
+                                                    </group>
+                                                    <group attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time')]}">
+                                                        <field name="required_type"/>
+                                                        <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                            <field name="req_ans" />
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                            <field name="minimum_req_ans"/>
+                                                            <field name="maximum_req_ans"/>
+                                                        </group>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                                        <separator string="When the question is not answered, display this error message:"/>
+                                                        <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                                        <group colspan="2" >
+                                                            <field name="numeric_required_sum"/>
+                                                        </group>
+                                                        <newline/>
+                                                        <separator string="When the choices do not add up correctly, display this error message"/>
+                                                        <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                                        <field name="rating_allow_one_column_require"/>
+                                                    </group>
+                                                </page>
+                                                <page string="Descriptive" attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                                    <separator string="Descriptive Text" colspan="4"/>
+                                                    <field name="descriptive_text" colspan="4" nolabel="1"/>
+                                                </page>
+                                            </notebook>
+                                        </form>
+                                        <tree string="Survey Question">
+                                            <field name="sequence" string="Seq"/>
+                                            <field name="question" colspan="4" select="1"/>
+                                            <field name="answer_choice_ids"/>
+                                        </tree>
+                                    </field>
+                                </form>
+                            </field>
+                            <group col="9" colspan="4">
+                                <field name="state"/>
+                                <button name="survey_draft"
+                                    string="Set to draft" states="cancel,close" type="object"
+                                    icon="gtk-new"/>
+                                <button name="survey_open" string="Open"
+                                    states="draft" type="object" icon="gtk-go-forward"/>
+                                <button name="survey_close"
+                                    string="Close" states="open" type="object" icon="gtk-close"/>
+                                <button name="survey_cancel"
+                                    string="Cancel" states="open" type="object" icon="gtk-cancel"/>
+								<button name="%(action_view_survey_name)d" states="open,draft,close,cancel"
+                                	string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}"/>
+								<button name="%(action_view_survey_name)d" states="open,draft,close,cancel"
+                                	string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}"/>
+								<button name="%(action_view_survey_name)d" states="open,draft,close,cancel"
+                                	string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
+                            </group>
+                        </page>
+                        <page string="Other">
+                        	<group colspan="6" col='4'>
+	                            <field name="max_response_limit" select="1"
+	                                attrs="{'readonly':[('state','in',('open','close'))]}"/>
+	                            <field name="response_user" select="2"
+	                                attrs="{'readonly':[('state','in',('open','close'))]}"/>
+	                            <field name="question_prefix"/>
+	                            <field name="send_response"/>
+	                        </group>
+	                        <!--group colspan="4" col='4'>
+	                            <field name="question_prefix"/>
+	                            <field name="send_response"/>
+							</group-->
+                            <separator colspan="4" string="Survey Details"/>
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="Users">
+                            <separator colspan="4" string="Users Details"/>
+                            <field name="users" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="History">
+                            <field name="date_open" select="1"/>
+                            <field name="date_close" select="2"/>
+                            <field name="tot_start_survey" select="1"/>
+                            <field name="tot_comp_survey" select="1"/>
+                            <field name="history" colspan="4" nolabel="1">
+                                <tree string="History">
+                                    <field name="user_id"/>
+                                    <field name="date"/>
+                                </tree>
+                                <form string="History">
+                                    <field name="user_id"/>
+                                    <field name="date"/>
+                                </form>
+                               </field>
+                           </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+
+        <record model ="ir.ui.view" id= "survey_tree">
+            <field name="name">survey_tree</field>
+            <field name="model">survey</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Survey">
+                    <field name="title" select="1"/>
+                    <field name="date_open" select="1"/>
+                    <field name="date_close" select="2"/>
+                    <field name="max_response_limit" select="2"/>
+                       <field name="tot_start_survey" select="2"/>
+                    <field name="tot_comp_survey" select="2"/>
+                    <field name="responsible_id" select="2"/>
+                    <field name="state" select="1"/>
+					<button name="%(action_view_survey_name)d" states="open,draft,close,cancel"
+                                	string="Test Survey" type="action" icon="gtk-execute" context="{'active':True,'survey_id': active_id}"/>
+					<button name="%(action_view_survey_name)d" states="open,draft,close,cancel"
+                                	string="Answer Survey" type="action" icon="gtk-new" context="{'survey_id': active_id}"/>
+					<button name="%(wizard_print_survey)d" states="open,draft,close,cancel"
+                                	string="Print Survey" type="action" icon="gtk-print" context="{'active':True,'survey_id': active_id}"/>
+					<button name="%(survey_browse_response)d" states="open,draft,close,cancel"
+                                	string="Print Answer" type="action" icon="gtk-print"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_survey_form1">
+            <field name="name">All Surveys</field>
+            <field name="res_model">survey</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="survey_tree"></field>
+        </record>
+
+
+        <menuitem name="Surveys" id="menu_survey_form"
+            action="action_survey_form1" parent="menu_survey_config"
+            groups="group_survey_manager"/>
+
+        <!--
+            Survey Pages
+        -->
+
+        <record model="ir.ui.view" id="survey_page_form">
+            <field name="name">survey_page_form</field>
+            <field name="model">survey.page</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey Page">
+                    <field name="title" colspan="4" select="1"/>
+                    <field name="survey_id" select="1"/>
+                    <field name="sequence"/>
+                    <separator string="Description" colspan="4"/>
+                    <field name="note" colspan="4" nolabel="1"/>
+                    <field name="question_ids" colspan="4" nolabel="1" context="{'line_order': question_ids}">
+                    <form string="Survey Question">
+                        <field name="question" colspan="4" select="1"/>
+                        <field name="sequence"/>
+                        <field name="tot_resp" select="2"/>
+                        <field name="type" on_change="on_change_type(type)"/>
+	                    <field name="in_visible_rating_weight" invisible="1"/>
+	                    <field name="in_visible_menu_choice" invisible="1"/>
+                        <notebook colspan="4">
+	                        <page string="Answer" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+							   <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+		                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}"/>
+		                       </group>
+		                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+		                           <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+									<group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+									   <field name="no_of_rows"/>
+									</group>
+		                       </group>
+	                        </page>
+                            <page string="Comment Field" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+                                <group>
+	                                <field name="comment_field_type"  colspan="1"/>
+	                                <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+	                                    <field colspan="2" name="comment_label"/>
+	                                </group>
+								</group>
+                                <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                    <field name="comment_valid_type" colspan="2"/>
+                                    <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                        <field name="comment_minimum_no" string="Between"/>
+                                        <field name="comment_maximum_no" string="and"/>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                        <field name="comment_minimum_float" string="Between"/>
+                                        <field name="comment_maximum_float" string="and"/>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                        <field name="comment_minimum_date" string="Between"/>
+                                        <field name="comment_maximum_date" string="and"/>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                        <separator string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                        <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                    </group>
+                                </group>
+                                <!--group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans')]}">
+                                    <group colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                        <field name="make_comment_field"/>
+                                        <group colspan="4" attrs="{'invisible':[('make_comment_field','!=',True)]}">
+                                            <separator string="When the comment field is left blank, display this error message:" colspan="4"/>
+                                            <field name="make_comment_field_err_msg" nolabel="1"/>
+                                        </group>
+                                    </group>
+                                </group-->
+	                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+		                            <field name="comment_column"/>
+		                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+		                                <field name="column_name" colspan="2"/>
+		                            </group>
+								</group>
+                            </page>
+                            <page string="Validation" attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                <group col="6" colspan="4">
+                                    <field name="validation_type" colspan="2"/>
+                                    <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                        <field name="validation_minimum_no" string="Between"/>
+                                        <field name="validation_maximum_no" string="and"/>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                        <field name="validation_minimum_float" string="Between"/>
+                                        <field name="validation_maximum_float" string="and"/>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                        <field name="validation_minimum_date" string="Between"/>
+                                        <field name="validation_maximum_date" string="and"/>
+                                    </group>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                    <separator string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                    <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+                                </group>
+                            </page>
+	                        <page string="Required Answer" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment')]}">
+                                <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'),('type','!=','single_textbox'),('type','!=','comment')]}">
+                                    <field name="is_require_answer"/>
+                                </group>
+                                <group attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time')]}">
+                                    <field name="required_type"/>
+                                    <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                        <field name="req_ans" />
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                        <field name="minimum_req_ans"/>
+                                        <field name="maximum_req_ans"/>
+                                    </group>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                    <separator string="When the question is not answered, display this error message:"/>
+                                    <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                    <group colspan="2" >
+                                        <field name="numeric_required_sum"/>
+                                    </group>
+                                    <newline/>
+                                    <separator string="When the choices do not add up correctly, display this error message"/>
+                                    <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                    <field name="rating_allow_one_column_require"/>
+                                </group>
+                            </page>
+                            <page string="Descriptive" attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                <separator string="Descriptive Text" colspan="4"/>
+                                <field name="descriptive_text" colspan="4" nolabel="1"/>
+                            </page>
+                        </notebook>
+                    </form>
+                    <tree string="Survey Question">
+                        <field name="sequence" string="Seq"/>
+                        <field name="question" colspan="4" select="1"/>
+                        <field name="answer_choice_ids"/>
+                    </tree>
+                    </field>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="survey_page_tree">
+            <field name="name">survey_page_tree</field>
+            <field name="model">survey.page</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Survey Page">
+                    <field name="sequence" string="Seq"/>
+                    <field name="title"/>
+                    <field name="question_ids" string="#Questions"/>
+                </tree>
+            </field>
+        </record>
+
+
+        <record model="ir.actions.act_window" id="action_survey_page_form">
+            <field name="name">All Survey Pages</field>
+            <field name="res_model">survey.page</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="survey_page_tree"></field>
+        </record>
+
+        <menuitem name="Survey Pages" id="menu_survey_page_form1"
+            action="action_survey_page_form" parent='menu_survey_config'
+            groups="group_survey_manager"/>
+
+
+        <record model="ir.ui.view" id="survey_page_wizard_test1">
+            <field name="name">survey_page_wizard_test</field>
+            <field name="model">survey.page</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey Pages">
+                    <field name="title" colspan="4" select="1"/>
+                    <field name="sequence"/>
+                    <separator string="Description" colspan="4"/>
+                    <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"/>
+					</group>
+				</form>
+			</field>
+		</record>
+
+        <!--
+            Survey Question
+        -->
+
+        <record model="ir.ui.view" id="survey_question_form">
+            <field name="name">survey_question_form</field>
+            <field name="model">survey.question</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey Question">
+                    <field name="question" colspan="4" select="1"/>
+                    <field name="page_id" select="1"/>
+                    <field name="sequence"/>
+                    <field name="tot_resp" select="2"/>
+                    <field name="type" on_change="on_change_type(type)"/>
+                    <field name="in_visible_rating_weight" invisible="1"/>
+                    <field name="in_visible_menu_choice" invisible="1"/>
+                    <notebook colspan="4">
+                        <page string="Answer" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+						   <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+	                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}"/>
+	                       </group>
+	                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+	                           <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+								<group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+								   <field name="no_of_rows"/>
+								</group>
+	                       </group>
+                        </page>
+                        <page string="Comment Field" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+							<group>
+								<field name="comment_field_type"/>
+	                            <group attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+	                                <field name="comment_label" />
+	                            </group>
+							</group>
+                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                <field name="comment_valid_type" colspan="2"/>
+                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                    <field name="comment_minimum_no" string="Between"/>
+                                    <field name="comment_maximum_no" string="and"/>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                    <field name="comment_minimum_float" string="Between"/>
+                                    <field name="comment_maximum_float" string="and"/>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                    <field name="comment_minimum_date" string="Between"/>
+                                    <field name="comment_maximum_date" string="and"/>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                    <separator string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                </group>
+                            </group>
+                            <!--group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans')]}">
+                                <group colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                    <field name="make_comment_field"/>
+                                    <group colspan="4" attrs="{'invisible':[('make_comment_field','!=',True)]}">
+                                        <separator string="When the comment field is left blank, display this error message:" colspan="4"/>
+                                        <field name="make_comment_field_err_msg" nolabel="1"/>
+                                    </group>
+                                </group>
+                            </group-->
+                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+	                            <field name="comment_column"/>
+	                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+	                                <field name="column_name" colspan="2"/>
+	                            </group>
+							</group>
+                        </page>
+                        <page string="Validation" attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                            <group col="6" colspan="4">
+                                <field name="validation_type" colspan="2"/>
+                                <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                    <field name="validation_minimum_no" string="Between"/>
+                                    <field name="validation_maximum_no" string="and"/>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                    <field name="validation_minimum_float" string="Between"/>
+                                    <field name="validation_maximum_float" string="and"/>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                    <field name="validation_minimum_date" string="Between"/>
+                                    <field name="validation_maximum_date" string="and"/>
+                                </group>
+                            </group>
+                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                <separator string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+                            </group>
+                        </page>
+                        <page string="Required Answer" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment')]}">
+                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'),('type','!=','single_textbox'),('type','!=','comment')]}">
+                                <field name="is_require_answer"/>
+                            </group>
+                            <group attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time')]}">
+                                <field name="required_type"/>
+                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                    <field name="req_ans" />
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                    <field name="minimum_req_ans"/>
+                                    <field name="maximum_req_ans"/>
+                                </group>
+                            </group>
+                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                <separator string="When the question is not answered, display this error message:"/>
+                                <field name="req_error_msg" colspan="4" nolabel="1"/>
+                            </group>
+                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                <group colspan="2" >
+                                    <field name="numeric_required_sum"/>
+                                </group>
+                                <newline/>
+                                <separator string="When the choices do not add up correctly, display this error message"/>
+                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                            </group>
+                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                <field name="rating_allow_one_column_require"/>
+                            </group>
+                        </page>
+                        <page string="Descriptive" attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                            <separator string="Descriptive Text" colspan="4"/>
+                            <field name="descriptive_text" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="survey_question_tree">
+            <field name="name">survey_question_tree</field>
+            <field name="model">survey.question</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Survey Question">
+                    <field name="question" colspan="4" select="1"/>
+                    <field name="sequence" string="Seq"/>
+                    <field name="page_id" select="1"/>
+                    <field name="survey" select="1"/>
+                    <field name="type" select="2" />
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="survey_question_wizard_test">
+            <field name="name">survey_question_wizard_test</field>
+            <field name="model">survey.question</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey Question">
+                    <field name="question" colspan="4" select="1"/>
+                    <field name="sequence"/>
+                    <field name="tot_resp" select="2"/>
+                    <field name="type" on_change="on_change_type(type)"/>
+                    <field name="in_visible_rating_weight" invisible="1"/>
+                    <field name="in_visible_menu_choice" invisible="1"/>
+                    <notebook colspan="4">
+                        <page string="Answer" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+                          	<field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}"/>
+	                       <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+	                           <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+	                       </group>
+                        </page>
+                        <page string="Comment Field" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+                            <group>
+	                            <field name="comment_field_type" colspan="1"/>
+	                            <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+	                                <field colspan="2" name="comment_label" />
+	                            </group>
+							</group>
+                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                <field name="comment_valid_type" colspan="2"/>
+                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                    <field name="comment_minimum_no" string="Between"/>
+                                    <field name="comment_maximum_no" string="and"/>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                    <field name="comment_minimum_float" string="Between"/>
+                                    <field name="comment_maximum_float" string="and"/>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                    <field name="comment_minimum_date" string="Between"/>
+                                    <field name="comment_maximum_date" string="and"/>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                    <separator string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                </group>
+                            </group>
+                            <!--group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans')]}">
+                                <group colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                    <field name="make_comment_field"/>
+                                    <group colspan="4" attrs="{'invisible':[('make_comment_field','!=',True)]}">
+                                        <separator string="When the comment field is left blank, display this error message:" colspan="4"/>
+                                        <field name="make_comment_field_err_msg" nolabel="1"/>
+                                    </group>
+                                </group>
+                            </group-->
+                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+	                            <field name="comment_column"/>
+	                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+	                                <field name="column_name" colspan="2"/>
+	                            </group>
+							</group>
+                        </page>
+                        <page string="Validation" attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                            <group col="6" colspan="4">
+                                <field name="validation_type" colspan="2"/>
+                                <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                    <field name="validation_minimum_no" string="Between"/>
+                                    <field name="validation_maximum_no" string="and"/>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                    <field name="validation_minimum_float" string="Between"/>
+                                    <field name="validation_maximum_float" string="and"/>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                    <field name="validation_minimum_date" string="Between"/>
+                                    <field name="validation_maximum_date" string="and"/>
+                                </group>
+                            </group>
+                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                <separator string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+                            </group>
+                        </page>
+                        <page string="Required Answer" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment')]}">
+                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'),('type','!=','single_textbox'),('type','!=','comment')]}">
+                                <field name="is_require_answer"/>
+                            </group>
+                            <group attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time')]}">
+                                <field name="required_type"/>
+                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                    <field name="req_ans" />
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                    <field name="minimum_req_ans"/>
+                                    <field name="maximum_req_ans"/>
+                                </group>
+                            </group>
+                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                <separator string="When the question is not answered, display this error message:"/>
+                                <field name="req_error_msg" colspan="4" nolabel="1"/>
+                            </group>
+                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                <group colspan="2" >
+                                    <field name="numeric_required_sum"/>
+                                </group>
+                                <newline/>
+                                <separator string="When the choices do not add up correctly, display this error message"/>
+                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                            </group>
+                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                <field name="rating_allow_one_column_require"/>
+                            </group>
+                        </page>
+                        <page string="Descriptive" attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                            <separator string="Descriptive Text" colspan="4"/>
+                            <field name="descriptive_text" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                  	<group colspan="4">
+                  		<label string="" colspan="3"/>
+						<button name="survey_save"  string="Ok" type="object" icon="gtk-ok"/>
+					</group>
+                </form>
+            </field>
+        </record>
+
+        <!--
+            Survey Answer
+        -->
+
+        <record model ="ir.ui.view" id="survey_answer_form">
+            <field name="name">survey_answer_form</field>
+            <field name="model">survey.answer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey Answer">
+                    <field name="answer" colspan="4" select="1"/>
+                    <field name="sequence"/>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id= "survey_answer_tree">
+            <field name="name">survey_answer_tree</field>
+            <field name="model">survey.answer</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Survey Answer">
+                    <field name="sequence" string="Seq"/>
+                    <field name="answer" select="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <!--
+            Survey Response Line
+        -->
+
+        <record model ="ir.ui.view" id= "survey_response_line_form">
+            <field name="name">survey_response_line_form</field>
+            <field name="model">survey.response.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey Response">
+                	<field name="question_id"/>
+                    <field name="date_create" select="1"/>
+                    <notebook colspan="4">
+                        <page string="Response">
+                            <field name="response_answer_ids" colspan="4" nolabel="1"/>
+                            <group col="5" colspan="4">
+                                <field name="state"/>
+                                <button name="response_draft"
+                                    string="Set to draft" states="done,skip" type="object"
+                                    icon="gtk-new"/>
+                                <button name="response_done" string="Done"
+                                    states="draft" type="object" icon="gtk-go-forward"/>
+                                <button name="response_skip" string="Skip"
+                                    states="draft" type="object" icon="gtk-close"/>
+                            </group>
+                        </page>
+                        <page string="Single Textboxes">
+                            <field name="single_text" colspan="4"/>
+                        </page>
+                        <page string="Comment">
+                            <separator string="Description" colspan="4"/>
+                            <field name="comment" nolabel="1" colspan="4"/>
+                        </page>
+                        <page string="Table Answer">
+                            <field name="response_table_ids" colspan="4" nolabel="1">
+                            <form string="Table">
+                            	<field name="column_id"/>
+                            	<field name="name"/>
+                            	<field name="value"/>
+                            </form>
+                            <tree string="Table">
+                            	<field name="column_id"/>
+                            	<field name="name"/>
+                            	<field name="value"/>
+                            </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="survey_response_line_tree">
+            <field name="name">survey_response_line_tree</field>
+            <field name="model">survey.response.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Survey Response Line">
+                	<field name="page_id"/>
+                    <field name="question_id"/>
+                    <field name="date_create" select="1"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <!--
+            Survey Response
+        -->
+
+        <record model="ir.ui.view" id="survey_response_form">
+            <field name="name">survey_response_form</field>
+            <field name="model">survey.response</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey Response Answer">
+					<field name="survey_id" select="1"/>
+                    <field name="date_create" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="response_type" select="1"/>
+                    <field name="question_ids" nolabel="1" colspan="4" />
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="survey_response_tree">
+            <field name="name">survey_response_tree</field>
+            <field name="model">survey.response</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Survey Response Answer">
+                	<field name="survey_id" select="1"/>
+                    <field name="date_create" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="response_type" select="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_survey_request_form">
+            <field name="name">Survey Response</field>
+            <field name="res_model">survey.response</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="survey_response_tree"></field>
+        </record>
+
+        <menuitem name="Survey Response" id="menu_survey_response_tree"
+            action="action_survey_request_form" parent='menu_survey_config'
+            groups="group_survey_manager"/>
+
+
+        <!--
+            Survey Response Answer
+        -->
+
+        <record model="ir.ui.view" id="survey_response_answer_form">
+            <field name="name">survey_response_answer_form</field>
+            <field name="model">survey.response.answer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey Response Answer">
+                    <group colspan="4">
+                        <field name="answer_id"/>
+                        <field name="answer" />
+                    </group>
+                    <field name="value_choice"/>
+                    <label string="(Use Only Question Type is matrix_of_drop_down_menus)" align="0.0"/>
+                    <field name="comment_field"/>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="survey_response_answer_tree">
+            <field name="name">survey_response_answer_tree</field>
+            <field name="model">survey.response.answer</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree editable="top" string="Survey Response Answer">
+                    <field name="answer_id"/>
+                    <field name="answer" />
+                    <field name="value_choice" />
+                    <field name="comment_field"/>
+                </tree>
+            </field>
+        </record>
+
+        <!--
+            Survey Question Column Heading
+    -->
+
+        <record model="ir.ui.view" id="survey_question_column_heading_form">
+            <field name="name">survey_question_column_heading_form</field>
+            <field name="model">survey.question.column.heading</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Column Heading">
+                    <field name="title"/>
+                    <field name="in_visible_rating_weight" invisible="1"/>
+                    <field name="in_visible_menu_choice" invisible="1"/>
+                    <group colspan="4" attrs="{'invisible':[('in_visible_rating_weight','!=',False)]}">
+                        <field name="rating_weight"/>
+                        <label align="0.0" string="Use if question type is rating_scale" />
+                    </group>
+                    <group colspan="4" attrs="{'invisible':[('in_visible_menu_choice','!=',False)]}">
+                        <separator string="Menu Choices (each choice on separate lines)" colspan="4"/>
+                        <field name="menu_choice" nolabel="1" colspan="4"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="survey_question_column_heading_tree">
+            <field name="name">survey_question_column_heading_tree</field>
+            <field name="model">survey.question.column.heading</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Column Heading">
+                    <field name="title"/>
+                </tree>
+            </field>
+        </record>
+
+        <!--
+            res.users
+        -->
+
+        <record id="view_res_user_form" model="ir.ui.view">
+            <field name="name">view.res.users.form</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <notebook>
+                    <page string="Survey">
+                        <field name="survey_id" nolabel="1"/>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+
+        <!--
+            Survey Request
+        -->
+
+        <record model="ir.ui.view" id="survey_request_form">
+            <field name="name">survey_request_form</field>
+            <field name="model">survey.request</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey Request">
+                    <field name="date_deadline"/>
+                    <field name="survey_id" widget="selection"/>
+                    <field name="user_id" on_change="on_change_user(user_id)"/>
+                    <field name="email"/>
+					<field name="answer_ids" nolabel="1" colspan="4"/>
+                    <group colspan="4" col="5">
+                    	<field name="state"/>
+                        <button name="survey_req_waiting_answer" string="Set to Watting Answer" states="cancel,done" type="object" icon="gtk-new"/>
+                        <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
+                        <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="survey_request_tree">
+            <field name="name">survey_request_tree</field>
+            <field name="model">survey.request</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Survey Request">
+                    <field name="date_deadline"/>
+                    <field name="survey_id" widget="selection"/>
+                    <field name="email" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+
+        <act_window domain="[('survey_id', '=', active_id)]"
+            id="act_survey_pages"
+            name="Survey Pages"
+            res_model="survey.page"
+            src_model="survey"/>
+
+        <act_window domain="[('survey', '=', active_id)]"
+            id="act_survey_question"
+            name="All Questions"
+            res_model="survey.question"
+            src_model="survey"/>
+
+
+        <act_window domain="[('page_id', '=', active_id)]"
+            id="act_survey_page_question"
+            name="Survey Questions"
+            res_model="survey.question"
+            src_model="survey.page"/>
+
+        <act_window domain="[('question_id', '=', active_id)]"
+            id="act_survey_answer"
+            name="Survey Answers"
+            res_model="survey.answer"
+            src_model="survey.question"/>
+
+        <act_window domain="[('survey_id', '=', active_id)]"
+            id="act_survey_response"
+            name="Survey Response"
+            res_model="survey.response"
+            src_model="survey"/>
+
+		<menuitem name="Give Survey Response" id="menu_run_survey_form"
+			action="action_view_survey_name" parent="main_menu_survey"
+			groups="group_survey_manager,group_survey_user" icon="STOCK_INDEX"/>
+
+    </data>
+</openerp>
diff --git a/addons/survey/survey_wizard.xml b/addons/survey/survey_wizard.xml
new file mode 100644
index 00000000000..2bc7b7d1910
--- /dev/null
+++ b/addons/survey/survey_wizard.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+
+		<wizard string="Send Invitation" id="wizard_send_invitation"
+			model="survey" name="wizard.send.invitation"/>
+
+		<wizard string="Print Survey" id="wizard_print_survey"
+			model="survey" name="wizard.print.survey"/>
+
+	</data>
+</openerp>
diff --git a/addons/survey/wizard/__init__.py b/addons/survey/wizard/__init__.py
new file mode 100755
index 00000000000..6c3c899f29b
--- /dev/null
+++ b/addons/survey/wizard/__init__.py
@@ -0,0 +1,26 @@
+# -*- 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_survey
+import wizard_print_survey
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/survey/wizard/wizard_print_survey.py b/addons/survey/wizard/wizard_print_survey.py
new file mode 100644
index 00000000000..ec63726e3ef
--- /dev/null
+++ b/addons/survey/wizard/wizard_print_survey.py
@@ -0,0 +1,72 @@
+# -*- 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 time
+import pooler
+from random import choice
+import string
+import tools
+from tools.translate import _
+
+_survey_form = '''<?xml version="1.0"?>
+<form string="Print Survey">
+    <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"/>
+</form>'''
+
+_survey_fields = {
+    'orientation':{
+        'string':"Orientation",
+        'type':'selection',
+        'selection':[('vertical','Portrait(Vertical)'),
+                     ('horizontal','Landscape(Horizontal)')],
+        'default': lambda *a:'vertical'},
+    'paper_size':{
+        'string':"Paper Size",
+        'type':'selection',
+        'selection':[('letter','Letter (8.5" x 11")'),
+                     ('legal','Legal (8.5" x 14")'),
+                     ('a4','A4 (210mm x 297mm)')],
+        'default': lambda *a:'letter'},
+    'survey_title': {'string':'Include Survey Title', 'type':'boolean', 'default':lambda *a: 0},
+    'page_number': {'string':'Include Page Numbers', 'type':'boolean', 'default':lambda *a: 0},
+    'without_pagebreak': {'string':'Print Without Page Breaks', 'type':'boolean', 'default':lambda *a: 0},
+    }
+
+class print_survey_wizard(wizard.interface):
+    states = {
+        'init' : {
+            'actions' : [],
+            'result' : {'type' : 'form', 'arch' :_survey_form, 'fields' :_survey_fields,\
+                             'state' : [('end', 'Cancel', 'gtk-cancel'), ('print', 'Print', 'gtk-print')]}
+                },
+        'print': {
+            'actions': [],
+            'result': {'type':'print', 'report':'survey.form', 'state':'end'}
+        }
+    }
+print_survey_wizard('wizard.print.survey')
diff --git a/addons/survey/wizard/wizard_survey.py b/addons/survey/wizard/wizard_survey.py
new file mode 100755
index 00000000000..b623c8ecd27
--- /dev/null
+++ b/addons/survey/wizard/wizard_survey.py
@@ -0,0 +1,219 @@
+# -*- 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 time
+import pooler
+from random import choice
+import string
+import tools
+from tools.translate import _
+import tools
+import os
+import datetime
+import netsvc
+import socket
+
+_survey_form = '''<?xml version="1.0"?>
+<form string="Send Invitation">
+    <separator string="Select Partner" colspan="4"/>
+    <field name="partner_ids" nolabel="1"  colspan="4"/> /> 
+    <separator colspan="4" string="Send mail for new user"/>
+    <group cols="2" colspan="4">
+        <field name="send_mail" nolabel="1"/>
+        <field name="mail_subject"/>
+        <newline/>
+        <separator colspan="4" string="Send reminder for existing user"/>
+        <field name="send_mail_existing" nolabel="1"/>
+        <field name="mail_subject_existing"/>    
+        <newline/>
+    </group>
+    <separator colspan="4"/>
+    <group cols="2" colspan="4">
+        <field name="mail_from" colspan="4"/>
+    </group>
+    <newline/>
+    <separator string="Message" colspan="4"/>
+    <field name="mail" nolabel="1" colspan="4"/>
+</form>'''
+
+
+_survey_fields = {
+    'partner_ids': {'string':'Partner', 'type':'many2many', 'relation':'res.partner'}, 
+    'send_mail': {'string':'Send mail for new user', 'type':'boolean', 'default':lambda *a: 1}, 
+    'send_mail_existing': {'string':'Send reminder for existing user', 'type':'boolean', 'default':lambda *a: 1}, 
+    'mail_subject': {'string':'Subject', 'type':'char', 'default':lambda *a: "New user account.", "size":256}, 
+    'mail_subject_existing': {'string':'Subject', 'type':'char', 'default':lambda *a: "User account info.", "size":256}, 
+    'mail_from': {'string':'From', 'type':'char', "size":256, 'required':True, 'default':lambda *a: tools.config['email_from']  },
+    'mail': {'string':'Body', 'type':'text'}, 
+    }
+
+second_form = '''<?xml version="1.0"?>
+<form string="User creation">
+    <separator string="Results :" colspan="4"/>
+    <field name="note" colspan="4" nolabel="1" width="300"/>
+</form>'''
+second_fields = {
+    'note' : {'string':'Log', 'type':'text', 'readonly':1}
+    }
+def genpasswd():
+    chars = string.letters + string.digits
+    return ''.join([choice(chars) for i in range(6)])
+
+def check_survey(self, cr, uid, data, context):
+    pool= pooler.get_pool(cr.dbname)
+    survey_obj = pool.get('survey')
+    msg = ""
+    name = ""
+    for sur in survey_obj.browse(cr, uid, data['ids']):
+        name += "\t --> " + sur.title + "\n"
+        if sur.state != 'open':
+            msg +=  sur.title + "\n"
+    if msg:
+        raise  wizard.except_wizard(_('Attention!'), _('%sSurvey is not in open state') % msg)
+    data['form']['mail'] = '''Hello %(name)s, \n\n We are inviting you for following survey. \
+                \n  ''' + name + '''\n Your login ID: %(login)s, Your password: %(passwd)s
+    \n link :- http://'''+ str(socket.gethostname()) + ''':8080 \n\n Thanks,''' 
+    return data['form']
+
+def send_mail(self, cr, uid, data, context):
+    partner_ids = data['form']['partner_ids'][0][2]
+    pool= pooler.get_pool(cr.dbname)
+    user_ref= pool.get('res.users')
+    survey_ref= pool.get('survey')
+    group_id= pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / User')])
+    act_id = pool.get('ir.actions.act_window')
+    act_id = act_id.search(cr, uid, [('name', '=', 'Give Survey Response'), \
+                                     ('res_model', '=' , 'survey.name.wiz'), ('view_type', '=', 'form')])
+    out="login,password\n"
+    skipped= 0
+    existing= ""
+    created= ""
+    error= ""
+    res_user = ""
+    user_exists = False
+    attachments = []
+    for id in survey_ref.browse(cr, uid, data['ids']):
+        report = create_report(cr, uid, [id.id], 'report.survey.form', id.title)
+        file = open("/tmp/" + id.title +".pdf")
+        file_data = ""
+        while 1:
+            line = file.readline()
+            file_data += line
+            if not line:
+                break
+        attachments.append((id.title +".pdf",file_data))
+
+    for partner in pool.get('res.partner').browse(cr, uid, partner_ids):
+        for addr in partner.address:
+            if not addr.email:
+                skipped+= 1
+                continue
+            user = user_ref.search(cr, uid, [('login', "=", addr.email)])
+            if user:
+                user = user_ref.browse(cr, uid, user[0])
+                user_ref.write(cr, uid, user.id, {'survey_id':[[6, 0, data['ids']]]})
+                mail= data['form']['mail']%{'login':addr.email, 'passwd':user.password, \
+                                            'name' : addr.name}
+                if data['form']['send_mail_existing']:
+                    tools.email_send(data['form']['mail_from'], [addr.email] , \
+                                     data['form']['mail_subject_existing'] , mail)
+                    existing+= "- %s (Login: %s,  Password: %s)\n" % (user.name, addr.email, \
+                                                                      user.password)
+                continue
+            user_id =user_ref.search(cr, uid, [('address_id', '=', addr.id)])
+            if user_id:
+                for user_email in user_ref.browse(cr, uid, user_id):
+                    mail= data['form']['mail']%{'login':user_email.login, \
+                                                    'passwd':user_email.password, 'name' : addr.name}
+                    if data['form']['send_mail_existing']:
+                        tools.email_send(data['form']['mail_from'], [addr.email],\
+                                              data['form']['mail_subject_existing'], mail)
+                        res_user+= "- %s (Login: %s,  Password: %s)\n" % \
+                             (user_email.name, user_email.login, user_email.password)
+                continue
+            passwd= genpasswd()
+            out+= addr.email + ',' + passwd + '\n'
+            mail= data['form']['mail'] % {'login' : addr.email, 'passwd' : passwd, 'name' : addr.name}
+            if data['form']['send_mail']:
+                
+                ans = tools.email_send(data['form']['mail_from'], [addr.email], \
+                                       data['form']['mail_subject'], mail,attach = attachments)
+
+                if ans:
+                    user = user_ref.create(cr, uid, {'name' : addr.name or 'Unknown', 
+                                        'login' : addr.email, 
+                                        'password' : passwd, 
+                                        'address_id' : addr.id, 
+                                        'groups_id' : [[6, 0, group_id]], 
+                                        'action_id' : act_id[0], 
+                                        'survey_id' :[[6, 0, data['ids']]]
+                                       })
+                    created+= "- %s (Login: %s,  Password: %s)\n" % (addr.name or 'Unknown',\
+                                                                      addr.email, passwd)
+                else:
+                    error+= "- %s (Login: %s,  Password: %s)\n" % (addr.name or 'Unknown',\
+                                                                    addr.email, passwd)
+    note= ""
+    if created:
+        note += 'Created users:\n%s\n\n' % (created)
+    if existing:
+        note +='Already existing users:\n%s\n\n' % (existing)
+    if skipped:
+        note += "%d contacts where ignored (an email address is missing).\n\n" % (skipped)
+    if error:
+        note += 'E-Mail not send successfully:\n====================\n%s\n' % (error)
+    if res_user:
+        note += 'E-mail ID used the following user:\n====================\n%s\n' % (res_user)
+    return {'note': note}
+
+
+def create_report(cr, uid, res_ids, report_name=False, file_name=False):
+    if not report_name or not res_ids:
+        return (False, Exception('Report name and Resources ids are required !!!'))
+    try:
+        ret_file_name = '/tmp/'+file_name+'.pdf'
+        service = netsvc.LocalService(report_name);
+        (result, format) = service.create(cr, uid, res_ids, {}, {})
+        fp = open(ret_file_name, 'wb+');
+        fp.write(result);
+        fp.close();
+    except Exception,e:
+        print 'Exception in create report:',e
+        return (False, str(e))
+    return (True, ret_file_name)
+
+class send_mail_wizard(wizard.interface):
+    states = {
+        'init' : {
+            'actions' : [check_survey], 
+            'result' : {'type' : 'form', 'arch' :_survey_form, 'fields' :_survey_fields,\
+                             'state' : [('end', 'Cancel', 'gtk-cancel'), ('send', 'Send', 'gtk-go-forward')]}
+                }, 
+        'send' : {'actions' : [send_mail], 
+               'result' : {'type' : 'form', 
+                          'arch' : second_form, 
+                          'fields' : second_fields, 
+                          'state' : [('end', '_Ok')]}
+               }, 
+    }
+send_mail_wizard('wizard.send.invitation')
diff --git a/addons/thunderbird/i18n/cs.po b/addons/thunderbird/i18n/cs.po
new file mode 100644
index 00000000000..6bf154a05f2
--- /dev/null
+++ b/addons/thunderbird/i18n/cs.po
@@ -0,0 +1,86 @@
+# Czech translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 06:05+0000\n"
+"PO-Revision-Date: 2010-01-25 11:49+0000\n"
+"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
+"Language-Team: Czech <cs@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-01-26 04:52+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,copy_to:0
+msgid "Copy To"
+msgstr "Kopírovat do"
+
+#. module: thunderbird
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,description:0
+msgid "Description"
+msgstr "Popis"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,reference:0
+msgid "Reference"
+msgstr "Reference"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_tinythunderbird_partner
+msgid "Thunderbid mails"
+msgstr "Maily Thunderbid"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,attachments:0
+msgid "Attached Files"
+msgstr "Přiložené soubory"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,res_user_id:0
+msgid "User"
+msgstr "Uživatel"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,receiver:0
+msgid "Receiver"
+msgstr "Příjemce"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,title:0
+msgid "Subject"
+msgstr "Předmět"
+
+#. module: thunderbird
+#: code:addons/thunderbird/partner/partner.py:0
+#, python-format
+msgid "Archive"
+msgstr "Archiv"
+
+#. module: thunderbird
+#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
+msgid "Thunderbird Interface"
+msgstr "Rozhraní Thunderbird"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,sender:0
+msgid "Sender"
+msgstr "Odesílatel"
diff --git a/addons/warning/__init__.py b/addons/warning/__init__.py
index bd79d5fbedc..85715787ec4 100644
--- a/addons/warning/__init__.py
+++ b/addons/warning/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/warning/__terp__.py b/addons/warning/__terp__.py
index e6f57e71ea9..13db9c5da80 100644
--- a/addons/warning/__terp__.py
+++ b/addons/warning/__terp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/warning/i18n/it.po b/addons/warning/i18n/it.po
index 6d94d870fea..40936487374 100644
--- a/addons/warning/i18n/it.po
+++ b/addons/warning/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: 2009-11-17 10:54+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-11 19:33+0000\n"
+"Last-Translator: Stefano Prenna <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: 2009-12-16 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-01-12 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
@@ -84,7 +84,7 @@ msgstr "Fattura"
 #. module: warning
 #: model:ir.module.module,shortdesc:warning.module_meta_information
 msgid "Module for Warnings form onchange Event"
-msgstr ""
+msgstr "Modulo per il formulario Avvisi onchange Event"
 
 #. module: warning
 #: view:product.product:0
@@ -128,6 +128,9 @@ msgid ""
 "Selecting \"Blocking Message\" will throw an exception with the message and "
 "block the flow. The Message has to be written in the next field."
 msgstr ""
+"Scegliendo l'opzione \"Avvisi\" si notificherà all'utente con il messaggio, "
+"Scegliendo \"Messaggio bloccante\" lancerà una eccezione con il messaggio e "
+"bloccherà il flusso. Il messaggio deve essere scritto nel campo successivo."
 
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
@@ -137,7 +140,7 @@ msgstr "Messaggio per Fattura"
 #. module: warning
 #: model:ir.module.module,description:warning.module_meta_information
 msgid "Module for Warnings form onchange Event."
-msgstr ""
+msgstr "Modulo per il formulario Avvisi onchange Event"
 
 #. module: warning
 #: view:res.partner:0
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index 68cd3143d7d..466283702c6 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/wiki/__init__.py b/addons/wiki/__init__.py
index 77f166ea8b8..f52d0c2eb50 100644
--- a/addons/wiki/__init__.py
+++ b/addons/wiki/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py
index 3093134e47a..ebb858927f3 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__terp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,13 +24,13 @@
     'version': '1.0',
     'category': 'Generic Modules/Others',
     'description': """
-    The base module to manage documents(wiki) 
-    
+    The base module to manage documents(wiki)
+
     keep track for the wiki groups, pages, and history
     """,
     'author': 'Tiny & Axelor',
     'website': 'http://openerp.com',
-    'depends': ['base'],
+    'depends': ['base','document'],
     'init_xml': [],
     'update_xml': [
         'wiki_view.xml',
@@ -39,7 +39,7 @@
         'wizard/wizard_view.xml',
         'security/ir.model.access.csv'
     ],
-    'demo_xml': ['data/wiki_faq.xml'],
+    'demo_xml': [],
     'installable': True,
     'active': False,
     'certificate': '0086363630317',
diff --git a/addons/wiki/i18n/cs.po b/addons/wiki/i18n/cs.po
index 1be745aca4c..c57498e52ad 100644
--- a/addons/wiki/i18n/cs.po
+++ b/addons/wiki/i18n/cs.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-12-22 16:17+0000\n"
-"Last-Translator: Kuvaly <kuvaly@seznam.cz>\n"
+"PO-Revision-Date: 2010-01-25 11:32+0000\n"
+"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-24 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-01-26 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -281,7 +281,7 @@ msgstr "Wiki"
 #. module: wiki
 #: field:wiki.wiki,write_date:0
 msgid "Modification Date"
-msgstr ""
+msgstr "Datum změny"
 
 #. module: wiki
 #: model:ir.actions.wizard,name:wiki.wizard_make_index
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index eeb96a93557..10aae9ed92b 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <menuitem name="Document Management" icon="terp-stock" id="menu_document2"/>
-        <menuitem name="Wiki Configuration" id="menu_document_configuration" parent="menu_document2"/>
-        <menuitem parent="menu_document2" name="Wiki" id="menu_document"/>
-
+       <!-- <menuitem name="Document Management" icon="terp-stock" id="menu_document2"/>-->
+       <menuitem name="Knowledge Management" icon="terp-stock" id="menu_document2"/>
+        <!--<menuitem name="Wiki Configuration" id="menu_document_configuration" parent="menu_document2"/>-->
+        <menuitem name="Wiki" id="menu_document_configuration" parent="document.menu_document_configuration"/>
+        <!--<menuitem parent="menu_document2" name="Wiki" id="menu_document"/>-->
+        <menuitem parent="menu_document2" name="Collaborative Content" id="menu_document"/>
         <wizard
             id="wizard_group_menu_create"
             string="Create Menu"
             menu="True"
             name="wiki.create.menu"/>
-            
+
         <wizard
             id="wizard_open_page"
             string="Open Page"
             menu="True"
             name="wiki.wiki.page.open"/>
-            
+
         <record model="ir.ui.view" id="wiki_group_tree">
             <field name="name">wiki.groups.tree</field>
             <field name="model">wiki.groups</field>
@@ -63,7 +65,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem
+     <!--   <menuitem
+            parent="menu_document_configuration"
+            id="menu_action_wiki_groups"
+            action="action_wiki_groups"/>-->
+      <menuitem name="Wiki Groups"
             parent="menu_document_configuration"
             id="menu_action_wiki_groups"
             action="action_wiki_groups"/>
@@ -73,10 +79,10 @@
             <field name="res_model">wiki.groups</field>
             <field name="view_type">tree</field>
         </record>
-        <menuitem
+       <!-- <menuitem
             parent="menu_document"
             id="menu_action_wiki_groups_browse"
-            action="action_wiki_groups_browse"/>
+            action="action_wiki_groups_browse"/>-->
 
         <record id="view_wiki_tree_childs" model="ir.ui.view">
             <field name="name">wiki.wiki.tree.childs</field>
@@ -121,7 +127,7 @@
                         <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" select="2" invisible="not context.get('section',False)"/>
-                        <field name="parent_id"/>                        
+                        <field name="parent_id"/>
                     </group>
                     <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
                     <separator colspan="4" string="Modifications"/>
@@ -163,7 +169,7 @@
             <field name="context">{'section':'1'}</field>
             <field name="search_view_id" ref="view_wiki_filter"/>
         </record>
-        <menuitem parent="menu_document" id="menu_action_wiki_wiki" string="Search Pages" action="action_wiki"/>
+        <menuitem parent="menu_document" id="menu_action_wiki_wiki" name="Wiki Pages" action="action_wiki"/>
 
         <!--  Pages Waiting Review -->
         <record model="ir.actions.act_window" id="action_wiki_review">
@@ -176,7 +182,7 @@
             <field name="domain">[('review','=',True)]</field>
             <field name="filter" eval="True"/>
         </record>
-         
+
         <record model="ir.ui.view" id="view_wiki_history_tree">
             <field name="name">wiki.wiki.history.tree</field>
             <field name="model">wiki.wiki.history</field>
@@ -190,7 +196,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="wiki_history_form">
             <field name="name">wiki.wiki.history.form</field>
             <field name="model">wiki.wiki.history</field>
@@ -212,10 +218,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem
+       <!-- <menuitem
             parent="menu_document_configuration"
             id="menu_action_history"
-            action="action_history"/>
+            action="action_history"/>-->
 
         <act_window domain="[('wiki_id', '=', active_id)]"
             id="act_wiki_wiki_history"
@@ -242,7 +248,7 @@
             <field eval="'ir.actions.wizard,%d'%wizard_open_page" name="value"/>
             <field eval="True" name="object"/>
         </record>
-        
+
         <!--record id="ir_open_account_account" model="ir.values">
             <field eval="'tree_but_open'" name="key2"/>
             <field eval="'wiki.groups'" name="model"/>
diff --git a/addons/wiki/wizard/__init__.py b/addons/wiki/wizard/__init__.py
index 0351b0a8f24..1777b053bca 100644
--- a/addons/wiki/wizard/__init__.py
+++ b/addons/wiki/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/wiki/wizard/create_menu.py b/addons/wiki/wizard/create_menu.py
index 485b614736a..e31a9daa664 100644
--- a/addons/wiki/wizard/create_menu.py
+++ b/addons/wiki/wizard/create_menu.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/wiki/wizard/make_index.py b/addons/wiki/wizard/make_index.py
index b64e6117824..06d787c2a68 100644
--- a/addons/wiki/wizard/make_index.py
+++ b/addons/wiki/wizard/make_index.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/wiki/wizard/open_help.py b/addons/wiki/wizard/open_help.py
index 160497d4dd9..6be88349a81 100644
--- a/addons/wiki/wizard/open_help.py
+++ b/addons/wiki/wizard/open_help.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/addons/wiki/wizard/open_page.py b/addons/wiki/wizard/open_page.py
index c070fbf9c95..df015f5c5a0 100644
--- a/addons/wiki/wizard/open_page.py
+++ b/addons/wiki/wizard/open_page.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/wiki/wizard/show_diff.py b/addons/wiki/wizard/show_diff.py
index 73c856a8e80..376ed9885e4 100644
--- a/addons/wiki/wizard/show_diff.py
+++ b/addons/wiki/wizard/show_diff.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
diff --git a/addons/wiki_faq/__init__.py b/addons/wiki_faq/__init__.py
new file mode 100644
index 00000000000..938f045b9fd
--- /dev/null
+++ b/addons/wiki_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_faq/__terp__.py b/addons/wiki_faq/__terp__.py
new file mode 100644
index 00000000000..3d06108cb5b
--- /dev/null
+++ b/addons/wiki_faq/__terp__.py
@@ -0,0 +1,37 @@
+# -*- 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': 'Document Management - Wiki - FAQ',
+    'version': '1.0',
+    'category': 'Generic Modules/Others',
+    'description': """FAQ Template
+    """,
+    'author': 'Tiny',
+    'website': 'http://openerp.com',
+    'depends': ['wiki'],
+    'init_xml': [],
+    'update_xml': ['wiki_faq.xml'],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/data/wiki_faq.xml b/addons/wiki_faq/wiki_faq.xml
similarity index 94%
rename from addons/wiki/data/wiki_faq.xml
rename to addons/wiki_faq/wiki_faq.xml
index eabd591d232..0bf1616fdc2 100644
--- a/addons/wiki/data/wiki_faq.xml
+++ b/addons/wiki_faq/wiki_faq.xml
@@ -3,11 +3,10 @@
     <data noupdate="1">
         <record id="wiki_groups_faq" model="wiki.groups">
             <field name="name">Internal FAQ</field>
+            <field name="method">list</field>
             <field eval="2" name="section"/>
             <field name="template">== Question ==
 
-...
-
 == Answer ==
 
 == External Links ==
@@ -23,8 +22,7 @@
             <field name="review">1</field>
             <field name="section">2</field>
             <field name="summary">Initial Page</field>
-            <field name="text_area">
-== Question ==
+            <field name="text_area">== Question ==
 
 What's the Bug Tracker ?
 
@@ -61,8 +59,7 @@ Integration Benefits:
             <field name="toc">1</field>
             <field name="section">1</field>
             <field name="summary">Initial Page</field>
-            <field name="text_area">
-== Question ==
+            <field name="text_area">== Question ==
 
 What's the Document Management System ?
 
diff --git a/addons/wiki_quality_manual/__init__.py b/addons/wiki_quality_manual/__init__.py
new file mode 100644
index 00000000000..938f045b9fd
--- /dev/null
+++ b/addons/wiki_quality_manual/__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_quality_manual/__terp__.py b/addons/wiki_quality_manual/__terp__.py
new file mode 100644
index 00000000000..9729c4c4910
--- /dev/null
+++ b/addons/wiki_quality_manual/__terp__.py
@@ -0,0 +1,37 @@
+# -*- 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': 'Document Management - Wiki - Quality Manual',
+    'version': '1.0',
+    'category': 'Generic Modules/Others',
+    'description': """Quality Manual Template
+    """,
+    'author': 'Tiny',
+    'website': 'http://openerp.com',
+    'depends': ['wiki'],
+    'init_xml': [],
+    'update_xml': ['wiki_quality_manual.xml'],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki_quality_manual/wiki_quality_manual.xml b/addons/wiki_quality_manual/wiki_quality_manual.xml
new file mode 100644
index 00000000000..e8601867e4a
--- /dev/null
+++ b/addons/wiki_quality_manual/wiki_quality_manual.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+      <record id="wiki_quality_manual" model="wiki.wiki">
+        <field name="name">Quality Manual</field>
+        <field name="tags">quality, faq, manual</field>
+        <field name="minor_edit">0</field>
+        <field name="toc">1</field>
+        <field name="review">1</field>
+        <field name="section">2</field>
+        <field name="summary">Base template</field>
+        <field name="text_area">
+=General=
+
+==Index and revision status==
+
+==Purpose==
+
+=Background=
+
+==Activities==
+
+==History==
+
+=Definitions and Abbreviations=
+
+==Definitions and terminology==
+
+==Abbreviations==
+
+=Management Requirements=
+
+==Organization==
+
+==Management System==
+
+==Document Control==
+
+==Review of Contracts==
+
+==Subcontracting==
+
+==Purchasing==
+
+==Service to the customer==
+
+==Complaints==
+
+==Control of non-conforming work==
+
+==Improvement==
+
+==Corrective actions==
+
+==Preventive actions==
+
+==Control of quality records==
+
+==Internal audits==
+
+==Management Reviews==
+
+=Technical Requirements=
+
+==General==
+
+==Personnel==
+
+==Accomodation==
+
+==Test methods and validation==
+
+==Equipment==
+
+==Measurement traceability==
+
+==Sampling==
+
+==Test items==
+
+==Quality control==
+
+==Reports / calibration certificates==
+
+=References=
+
+=Acknowledgements=
+        </field>
+      </record>
+      <record id="wiki_group_quality_manual" model="wiki.groups">
+        <field name="name">Quality Manual</field>
+        <field name="section">2</field>
+        <field name="home" ref="wiki_quality_manual"/>
+      </record>
+    </data>
+    <data>
+      <record id="wiki_quality_manual" model="wiki.wiki">
+        <field name="group_id" ref="wiki_group_quality_manual"/>
+      </record>
+    </data>
+</openerp>